Compare commits
67 Commits
libvirt-0_
...
libvirt-0_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aeda455930 | ||
|
|
288291b795 | ||
|
|
7c2073faca | ||
|
|
5b528ba717 | ||
|
|
4f731a7250 | ||
|
|
f1ac0031f5 | ||
|
|
e45b9c9030 | ||
|
|
3cf75c269d | ||
|
|
585033f372 | ||
|
|
897506e66a | ||
|
|
e4bf8ffa42 | ||
|
|
20367a58a6 | ||
|
|
aa037364ed | ||
|
|
c034c1a3b2 | ||
|
|
da05e02884 | ||
|
|
e1b7b518ac | ||
|
|
581b5f5022 | ||
|
|
c476c8b683 | ||
|
|
b93eafc59f | ||
|
|
2105d62ca8 | ||
|
|
743adffffe | ||
|
|
11e3b51c0d | ||
|
|
66df925739 | ||
|
|
b20a5c6d3b | ||
|
|
7f58f3aa54 | ||
|
|
6577b14441 | ||
|
|
2e7812764f | ||
|
|
854b878580 | ||
|
|
89c28e4013 | ||
|
|
db269c2d21 | ||
|
|
98e4f7ee9f | ||
|
|
0c4afc5ee9 | ||
|
|
593255292e | ||
|
|
ccafc8ecb4 | ||
|
|
a38fb9cbc1 | ||
|
|
6359121866 | ||
|
|
b20d669e88 | ||
|
|
a3e1cc37ed | ||
|
|
a6eca3382d | ||
|
|
c6c5072e90 | ||
|
|
705fd20a0e | ||
|
|
e0e9927d93 | ||
|
|
bae7a0fb84 | ||
|
|
36aee593bc | ||
|
|
dc0cb0e91a | ||
|
|
84d66312fe | ||
|
|
4f644ce267 | ||
|
|
cdd5b3d62d | ||
|
|
53f63aa62d | ||
|
|
748df35c5f | ||
|
|
a6e23d00fa | ||
|
|
c6d11b43c9 | ||
|
|
83091ff0dd | ||
|
|
4465a63872 | ||
|
|
3f397d9786 | ||
|
|
750aec5507 | ||
|
|
d7c1d3bbc0 | ||
|
|
fa0f21c263 | ||
|
|
afdaf5d354 | ||
|
|
26bba5aea9 | ||
|
|
1a4185bdcc | ||
|
|
6a73119e65 | ||
|
|
1e2f9fce0a | ||
|
|
f5edf79c95 | ||
|
|
b59e64bf44 | ||
|
|
a09fc2658a | ||
|
|
a008fcf27e |
@@ -5,3 +5,9 @@ x86_64
|
||||
libvirt-*.tar.gz
|
||||
libvirt-0.6.0.tar.gz
|
||||
libvirt-0.6.1.tar.gz
|
||||
libvirt-0.6.2.tar.gz
|
||||
libvirt-0.6.3.tar.gz
|
||||
libvirt-0.6.4.tar.gz
|
||||
libvirt-0.6.5.tar.gz
|
||||
libvirt-0.7.0.tar.gz
|
||||
libvirt-0.7.1.tar.gz
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
From: Daniel P. Berrange <berrange@redhat.com>
|
||||
Date: Mon, 16 Mar 2009 10:35:21 +0000 (+0000)
|
||||
Subject: Fix dispatch of FD events when one or more handles are marked deleted
|
||||
X-Git-Url: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff_plain;h=10baf3deb8588f5902b6f2eb362fb408707e3d95
|
||||
|
||||
Fix dispatch of FD events when one or more handles are marked deleted
|
||||
---
|
||||
|
||||
diff --git a/qemud/event.c b/qemud/event.c
|
||||
index c9ea563..0887008 100644
|
||||
--- a/qemud/event.c
|
||||
+++ b/qemud/event.c
|
||||
@@ -409,25 +409,26 @@ static int virEventDispatchTimeouts(void) {
|
||||
* Returns 0 upon success, -1 if an error occurred
|
||||
*/
|
||||
static int virEventDispatchHandles(int nfds, struct pollfd *fds) {
|
||||
- int i;
|
||||
+ int i, n;
|
||||
|
||||
- for (i = 0 ; i < nfds ; i++) {
|
||||
+ for (i = 0, n = 0 ; i < eventLoop.handlesCount && n < nfds ; i++) {
|
||||
if (eventLoop.handles[i].deleted) {
|
||||
EVENT_DEBUG("Skip deleted %d", eventLoop.handles[i].fd);
|
||||
continue;
|
||||
}
|
||||
|
||||
- if (fds[i].revents) {
|
||||
+ if (fds[n].revents) {
|
||||
virEventHandleCallback cb = eventLoop.handles[i].cb;
|
||||
void *opaque = eventLoop.handles[i].opaque;
|
||||
- int hEvents = virPollEventToEventHandleType(fds[i].revents);
|
||||
- EVENT_DEBUG("Dispatch %d %d %p", fds[i].fd,
|
||||
- fds[i].revents, eventLoop.handles[i].opaque);
|
||||
+ int hEvents = virPollEventToEventHandleType(fds[n].revents);
|
||||
+ EVENT_DEBUG("Dispatch %d %d %p", fds[n].fd,
|
||||
+ fds[n].revents, eventLoop.handles[i].opaque);
|
||||
virEventUnlock();
|
||||
(cb)(eventLoop.handles[i].watch,
|
||||
- fds[i].fd, hEvents, opaque);
|
||||
+ fds[n].fd, hEvents, opaque);
|
||||
virEventLock();
|
||||
}
|
||||
+ n++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -1,78 +0,0 @@
|
||||
From: Daniel Veillard <veillard@redhat.com>
|
||||
Date: Mon, 16 Mar 2009 10:41:37 +0000 (+0000)
|
||||
Subject: Avoid some potential FILE * leaks
|
||||
X-Git-Url: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff_plain;h=39429bab2d55807698d9aed0112200ae532799b8
|
||||
|
||||
Avoid some potential FILE * leaks
|
||||
* qemud/qemud.c src/cgroup.c src/uml_driver.c src/util.c: close
|
||||
some potential FILE * leaks
|
||||
Daniel
|
||||
---
|
||||
|
||||
diff --git a/qemud/qemud.c b/qemud/qemud.c
|
||||
index fd315fc..4f04355 100644
|
||||
--- a/qemud/qemud.c
|
||||
+++ b/qemud/qemud.c
|
||||
@@ -488,7 +488,7 @@ static int qemudWritePidFile(const char *pidFile) {
|
||||
if (fprintf(fh, "%lu\n", (unsigned long)getpid()) < 0) {
|
||||
VIR_ERROR(_("Failed to write to pid file '%s' : %s"),
|
||||
pidFile, virStrerror(errno, ebuf, sizeof ebuf));
|
||||
- close(fd);
|
||||
+ fclose(fh);
|
||||
return -1;
|
||||
}
|
||||
|
||||
diff --git a/src/cgroup.c b/src/cgroup.c
|
||||
index 5af44bd..d1d44a2 100644
|
||||
--- a/src/cgroup.c
|
||||
+++ b/src/cgroup.c
|
||||
@@ -57,7 +57,7 @@ void virCgroupFree(virCgroupPtr *group)
|
||||
|
||||
static virCgroupPtr virCgroupGetMount(const char *controller)
|
||||
{
|
||||
- FILE *mounts;
|
||||
+ FILE *mounts = NULL;
|
||||
struct mntent entry;
|
||||
char buf[CGROUP_MAX_VAL];
|
||||
virCgroupPtr root = NULL;
|
||||
@@ -90,6 +90,8 @@ static virCgroupPtr virCgroupGetMount(const char *controller)
|
||||
|
||||
return root;
|
||||
err:
|
||||
+ if (mounts != NULL)
|
||||
+ fclose(mounts);
|
||||
virCgroupFree(&root);
|
||||
|
||||
return NULL;
|
||||
diff --git a/src/uml_driver.c b/src/uml_driver.c
|
||||
index 1dc7ccd..f7400f9 100644
|
||||
--- a/src/uml_driver.c
|
||||
+++ b/src/uml_driver.c
|
||||
@@ -547,6 +547,7 @@ reopen:
|
||||
|
||||
if (fscanf(file, "%d", &vm->pid) != 1) {
|
||||
errno = EINVAL;
|
||||
+ fclose(file);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
@@ -1040,6 +1041,7 @@ static int umlGetProcessInfo(unsigned long long *cpuTime, int pid) {
|
||||
|
||||
if (fscanf(pidinfo, "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu", &usertime, &systime) != 2) {
|
||||
umlDebug("not enough arg");
|
||||
+ fclose(pidinfo);
|
||||
return -1;
|
||||
}
|
||||
|
||||
diff --git a/src/util.c b/src/util.c
|
||||
index 9b74757..66ad9a4 100644
|
||||
--- a/src/util.c
|
||||
+++ b/src/util.c
|
||||
@@ -1058,6 +1058,7 @@ int virFileReadPid(const char *dir,
|
||||
|
||||
if (fscanf(file, "%d", pid) != 1) {
|
||||
rc = EINVAL;
|
||||
+ fclose(file);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
Index: src/remote_internal.c
|
||||
===================================================================
|
||||
RCS file: /data/cvs/libxen/src/remote_internal.c,v
|
||||
retrieving revision 1.141
|
||||
diff -u -u -p -r1.141 remote_internal.c
|
||||
--- src/remote_internal.c 3 Mar 2009 19:33:34 -0000 1.141
|
||||
+++ src/remote_internal.c 16 Mar 2009 16:57:17 -0000
|
||||
@@ -332,7 +332,7 @@ doRemoteOpen (virConnectPtr conn,
|
||||
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
|
||||
int flags)
|
||||
{
|
||||
- int wakeupFD[2];
|
||||
+ int wakeupFD[2] = { -1, -1 };
|
||||
char *transport_str = NULL;
|
||||
|
||||
if (conn->uri) {
|
||||
@@ -885,6 +885,11 @@ doRemoteOpen (virConnectPtr conn,
|
||||
#endif
|
||||
}
|
||||
|
||||
+ if (wakeupFD[0] >= 0) {
|
||||
+ close(wakeupFD[0]);
|
||||
+ close(wakeupFD[1]);
|
||||
+ }
|
||||
+
|
||||
VIR_FREE(priv->hostname);
|
||||
goto cleanup;
|
||||
}
|
||||
@@ -1350,6 +1355,11 @@ doRemoteClose (virConnectPtr conn, struc
|
||||
} while (reap != -1 && reap != priv->pid);
|
||||
}
|
||||
#endif
|
||||
+ if (priv->wakeupReadFD >= 0) {
|
||||
+ close(priv->wakeupReadFD);
|
||||
+ close(priv->wakeupSendFD);
|
||||
+ }
|
||||
+
|
||||
|
||||
/* Free hostname copy */
|
||||
free (priv->hostname);
|
||||
@@ -1,22 +0,0 @@
|
||||
From: Daniel P. Berrange <berrange@redhat.com>
|
||||
Date: Mon, 16 Mar 2009 10:33:01 +0000 (+0000)
|
||||
Subject: Fix handling of cpumaps arg to virDomainGetVcpus RPC dispatcher
|
||||
X-Git-Url: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff_plain;h=2d75d954f52a740470f85ceece4eb995d79968ca
|
||||
|
||||
Fix handling of cpumaps arg to virDomainGetVcpus RPC dispatcher
|
||||
---
|
||||
|
||||
diff --git a/qemud/remote.c b/qemud/remote.c
|
||||
index 8eaa7d6..44a274a 100644
|
||||
--- a/qemud/remote.c
|
||||
+++ b/qemud/remote.c
|
||||
@@ -1475,7 +1475,8 @@ remoteDispatchDomainGetVcpus (struct qemud_server *server ATTRIBUTE_UNUSED,
|
||||
/* Allocate buffers to take the results. */
|
||||
if (VIR_ALLOC_N(info, args->maxinfo) < 0)
|
||||
goto oom;
|
||||
- if (VIR_ALLOC_N(cpumaps, args->maxinfo) < 0)
|
||||
+ if (args->maplen > 0 &&
|
||||
+ VIR_ALLOC_N(cpumaps, args->maxinfo * args->maplen) < 0)
|
||||
goto oom;
|
||||
|
||||
info_len = virDomainGetVcpus (dom,
|
||||
@@ -1,188 +0,0 @@
|
||||
From: Daniel Veillard <veillard@redhat.com>
|
||||
Date: Thu, 12 Mar 2009 20:15:32 +0000 (+0000)
|
||||
Subject: * src/storage_conf.c: fix storage pool mode parsing, and refactoring
|
||||
X-Git-Url: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff_plain;h=bc962f5d7c6e2c2cfc233ea6deea95dba2b7c6eb
|
||||
|
||||
* src/storage_conf.c: fix storage pool mode parsing, and refactoring
|
||||
patch by Ryota Ozaki
|
||||
Daniel
|
||||
---
|
||||
|
||||
diff --git a/src/storage_conf.c b/src/storage_conf.c
|
||||
index 9c13e07..1c9a4e5 100644
|
||||
--- a/src/storage_conf.c
|
||||
+++ b/src/storage_conf.c
|
||||
@@ -371,15 +371,33 @@ virStoragePoolDefParseAuthChap(virConnectPtr conn,
|
||||
|
||||
|
||||
static int
|
||||
-virStoragePoolDefParsePerms(virConnectPtr conn,
|
||||
- xmlXPathContextPtr ctxt,
|
||||
- virStoragePermsPtr perms) {
|
||||
+virStorageDefParsePerms(virConnectPtr conn,
|
||||
+ xmlXPathContextPtr ctxt,
|
||||
+ virStoragePermsPtr perms,
|
||||
+ const char *permxpath,
|
||||
+ int defaultmode) {
|
||||
char *mode;
|
||||
long v;
|
||||
+ int ret = -1;
|
||||
+ xmlNodePtr relnode;
|
||||
+ xmlNodePtr node;
|
||||
|
||||
- mode = virXPathString(conn, "string(/pool/permissions/mode)", ctxt);
|
||||
+ node = virXPathNode(conn, permxpath, ctxt);
|
||||
+ if (node == NULL) {
|
||||
+ /* Set default values if there is not <permissions> element */
|
||||
+ perms->mode = defaultmode;
|
||||
+ perms->uid = getuid();
|
||||
+ perms->gid = getgid();
|
||||
+ perms->label = NULL;
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ relnode = ctxt->node;
|
||||
+ ctxt->node = node;
|
||||
+
|
||||
+ mode = virXPathString(conn, "string(./mode)", ctxt);
|
||||
if (!mode) {
|
||||
- perms->mode = 0700;
|
||||
+ perms->mode = defaultmode;
|
||||
} else {
|
||||
char *end = NULL;
|
||||
perms->mode = strtol(mode, &end, 8);
|
||||
@@ -387,36 +405,39 @@ virStoragePoolDefParsePerms(virConnectPtr conn,
|
||||
if (*end || perms->mode < 0 || perms->mode > 0777) {
|
||||
virStorageReportError(conn, VIR_ERR_XML_ERROR,
|
||||
"%s", _("malformed octal mode"));
|
||||
- return -1;
|
||||
+ goto error;
|
||||
}
|
||||
}
|
||||
|
||||
- if (virXPathNode(conn, "/pool/permissions/owner", ctxt) == NULL) {
|
||||
+ if (virXPathNode(conn, "./owner", ctxt) == NULL) {
|
||||
perms->uid = getuid();
|
||||
} else {
|
||||
- if (virXPathLong(conn, "number(/pool/permissions/owner)", ctxt, &v) < 0) {
|
||||
+ if (virXPathLong(conn, "number(./owner)", ctxt, &v) < 0) {
|
||||
virStorageReportError(conn, VIR_ERR_XML_ERROR,
|
||||
"%s", _("malformed owner element"));
|
||||
- return -1;
|
||||
+ goto error;
|
||||
}
|
||||
perms->uid = (int)v;
|
||||
}
|
||||
|
||||
- if (virXPathNode(conn, "/pool/permissions/group", ctxt) == NULL) {
|
||||
+ if (virXPathNode(conn, "./group", ctxt) == NULL) {
|
||||
perms->gid = getgid();
|
||||
} else {
|
||||
- if (virXPathLong(conn, "number(/pool/permissions/group)", ctxt, &v) < 0) {
|
||||
+ if (virXPathLong(conn, "number(./group)", ctxt, &v) < 0) {
|
||||
virStorageReportError(conn, VIR_ERR_XML_ERROR,
|
||||
"%s", _("malformed group element"));
|
||||
- return -1;
|
||||
+ goto error;
|
||||
}
|
||||
perms->gid = (int)v;
|
||||
}
|
||||
|
||||
/* NB, we're ignoring missing labels here - they'll simply inherit */
|
||||
- perms->label = virXPathString(conn, "string(/pool/permissions/label)", ctxt);
|
||||
+ perms->label = virXPathString(conn, "string(./label)", ctxt);
|
||||
|
||||
- return 0;
|
||||
+ ret = 0;
|
||||
+error:
|
||||
+ ctxt->node = relnode;
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -579,7 +600,8 @@ virStoragePoolDefParseDoc(virConnectPtr conn,
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
- if (virStoragePoolDefParsePerms(conn, ctxt, &ret->target.perms) < 0)
|
||||
+ if (virStorageDefParsePerms(conn, ctxt, &ret->target.perms,
|
||||
+ "/pool/target/permissions", 0700) < 0)
|
||||
goto cleanup;
|
||||
|
||||
return ret;
|
||||
@@ -801,55 +823,6 @@ virStoragePoolDefFormat(virConnectPtr conn,
|
||||
|
||||
|
||||
static int
|
||||
-virStorageVolDefParsePerms(virConnectPtr conn,
|
||||
- xmlXPathContextPtr ctxt,
|
||||
- virStoragePermsPtr perms) {
|
||||
- char *mode;
|
||||
- long v;
|
||||
-
|
||||
- mode = virXPathString(conn, "string(/volume/permissions/mode)", ctxt);
|
||||
- if (!mode) {
|
||||
- perms->mode = 0600;
|
||||
- } else {
|
||||
- char *end = NULL;
|
||||
- perms->mode = strtol(mode, &end, 8);
|
||||
- VIR_FREE(mode);
|
||||
- if (*end || perms->mode < 0 || perms->mode > 0777) {
|
||||
- virStorageReportError(conn, VIR_ERR_XML_ERROR,
|
||||
- "%s", _("malformed octal mode"));
|
||||
- return -1;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (virXPathNode(conn, "/volume/permissions/owner", ctxt) == NULL) {
|
||||
- perms->uid = getuid();
|
||||
- } else {
|
||||
- if (virXPathLong(conn, "number(/volume/permissions/owner)", ctxt, &v) < 0) {
|
||||
- virStorageReportError(conn, VIR_ERR_XML_ERROR,
|
||||
- "%s", _("missing owner element"));
|
||||
- return -1;
|
||||
- }
|
||||
- perms->uid = (int)v;
|
||||
- }
|
||||
- if (virXPathNode(conn, "/volume/permissions/group", ctxt) == NULL) {
|
||||
- perms->gid = getgid();
|
||||
- } else {
|
||||
- if (virXPathLong(conn, "number(/volume/permissions/group)", ctxt, &v) < 0) {
|
||||
- virStorageReportError(conn, VIR_ERR_XML_ERROR,
|
||||
- "%s", _("missing group element"));
|
||||
- return -1;
|
||||
- }
|
||||
- perms->gid = (int)v;
|
||||
- }
|
||||
-
|
||||
- /* NB, we're ignoring missing labels here - they'll simply inherit */
|
||||
- perms->label = virXPathString(conn, "string(/volume/permissions/label)", ctxt);
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-
|
||||
-static int
|
||||
virStorageSize(virConnectPtr conn,
|
||||
const char *unit,
|
||||
const char *val,
|
||||
@@ -997,7 +970,8 @@ virStorageVolDefParseDoc(virConnectPtr conn,
|
||||
VIR_FREE(format);
|
||||
}
|
||||
|
||||
- if (virStorageVolDefParsePerms(conn, ctxt, &ret->target.perms) < 0)
|
||||
+ if (virStorageDefParsePerms(conn, ctxt, &ret->target.perms,
|
||||
+ "/volume/target/permissions", 0600) < 0)
|
||||
goto cleanup;
|
||||
|
||||
|
||||
@@ -1019,7 +993,8 @@ virStorageVolDefParseDoc(virConnectPtr conn,
|
||||
VIR_FREE(format);
|
||||
}
|
||||
|
||||
- if (virStorageVolDefParsePerms(conn, ctxt, &ret->backingStore.perms) < 0)
|
||||
+ if (virStorageDefParsePerms(conn, ctxt, &ret->backingStore.perms,
|
||||
+ "/volume/backingStore/permissions", 0600) < 0)
|
||||
goto cleanup;
|
||||
|
||||
return ret;
|
||||
@@ -1,20 +0,0 @@
|
||||
From: Daniel P. Berrange <berrange@redhat.com>
|
||||
Date: Mon, 16 Mar 2009 10:31:38 +0000 (+0000)
|
||||
Subject: Don't free storage volume in cleanup path, since it may still be referenced
|
||||
X-Git-Url: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff_plain;h=d8f08ca049b6d3bc7a5124a3957e967539ad080d
|
||||
|
||||
Don't free storage volume in cleanup path, since it may still be referenced
|
||||
---
|
||||
|
||||
diff --git a/src/storage_driver.c b/src/storage_driver.c
|
||||
index f1320c5..b261843 100644
|
||||
--- a/src/storage_driver.c
|
||||
+++ b/src/storage_driver.c
|
||||
@@ -1296,7 +1296,6 @@ storageVolumeDelete(virStorageVolPtr obj,
|
||||
ret = 0;
|
||||
|
||||
cleanup:
|
||||
- virStorageVolDefFree(vol);
|
||||
if (pool)
|
||||
virStoragePoolObjUnlock(pool);
|
||||
return ret;
|
||||
@@ -1,36 +0,0 @@
|
||||
From: Daniel P. Berrange <berrange@redhat.com>
|
||||
Date: Mon, 16 Mar 2009 11:44:46 +0000 (+0000)
|
||||
Subject: Avoid deadlock setting vcpus in QEMU driver
|
||||
X-Git-Url: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff_plain;h=4d7ecd146ce4de847256ae0887963719f214f62f
|
||||
|
||||
Avoid deadlock setting vcpus in QEMU driver
|
||||
---
|
||||
|
||||
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
|
||||
index dad7098..51442d6 100644
|
||||
--- a/src/qemu_driver.c
|
||||
+++ b/src/qemu_driver.c
|
||||
@@ -2725,6 +2725,7 @@ static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) {
|
||||
virDomainObjPtr vm;
|
||||
int max;
|
||||
int ret = -1;
|
||||
+ const char *type;
|
||||
|
||||
qemuDriverLock(driver);
|
||||
vm = virDomainFindByUUID(&driver->domains, dom->uuid);
|
||||
@@ -2745,7 +2746,14 @@ static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) {
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
- if ((max = qemudDomainGetMaxVcpus(dom)) < 0) {
|
||||
+ if (!(type = virDomainVirtTypeToString(vm->def->virtType))) {
|
||||
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
|
||||
+ _("unknown virt type in domain definition '%d'"),
|
||||
+ vm->def->virtType);
|
||||
+ goto cleanup;
|
||||
+ }
|
||||
+
|
||||
+ if ((max = qemudGetMaxVCPUs(dom->conn, type)) < 0) {
|
||||
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("could not determine max vcpus for the domain"));
|
||||
goto cleanup;
|
||||
@@ -1,277 +0,0 @@
|
||||
diff -r 961d4b1ca1d3 qemud/libvirtd_qemu.aug
|
||||
--- a/qemud/libvirtd_qemu.aug Wed Mar 04 13:17:44 2009 +0000
|
||||
+++ b/qemud/libvirtd_qemu.aug Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -27,6 +27,8 @@ module Libvirtd_qemu =
|
||||
| str_entry "vnc_tls_x509_cert_dir"
|
||||
| bool_entry "vnc_tls_x509_verify"
|
||||
| str_entry "vnc_password"
|
||||
+ | bool_entry "vnc_sasl"
|
||||
+ | str_entry "vnc_sasl_dir"
|
||||
|
||||
(* Each enty in the config is one of the following three ... *)
|
||||
let entry = vnc_entry
|
||||
diff -r 961d4b1ca1d3 qemud/test_libvirtd_qemu.aug
|
||||
--- a/qemud/test_libvirtd_qemu.aug Wed Mar 04 13:17:44 2009 +0000
|
||||
+++ b/qemud/test_libvirtd_qemu.aug Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -60,6 +60,25 @@ vnc_tls_x509_verify = 1
|
||||
# example here before you set this
|
||||
#
|
||||
vnc_password = \"XYZ12345\"
|
||||
+
|
||||
+
|
||||
+# Enable use of SASL encryption on the VNC server. This requires
|
||||
+# a VNC client which supports the SASL protocol extension.
|
||||
+# Examples include vinagre, virt-viewer and virt-manager
|
||||
+# itself. UltraVNC, RealVNC, TightVNC do not support this
|
||||
+#
|
||||
+# It is necessary to configure /etc/sasl2/qemu.conf to choose
|
||||
+# the desired SASL plugin (eg, GSSPI for Kerberos)
|
||||
+#
|
||||
+vnc_sasl = 1
|
||||
+
|
||||
+
|
||||
+# The default SASL configuration file is located in /etc/sasl2/
|
||||
+# When running libvirtd unprivileged, it may be desirable to
|
||||
+# override the configs in this location. Set this parameter to
|
||||
+# point to the directory, and create a qemu.conf in that location
|
||||
+#
|
||||
+vnc_sasl_dir = \"/some/directory/sasl2\"
|
||||
"
|
||||
|
||||
test Libvirtd_qemu.lns get conf =
|
||||
@@ -123,3 +142,22 @@ vnc_password = \"XYZ12345\"
|
||||
{ "#comment" = "example here before you set this" }
|
||||
{ "#comment" = "" }
|
||||
{ "vnc_password" = "XYZ12345" }
|
||||
+{ "#empty" }
|
||||
+{ "#empty" }
|
||||
+{ "#comment" = "Enable use of SASL encryption on the VNC server. This requires" }
|
||||
+{ "#comment" = "a VNC client which supports the SASL protocol extension." }
|
||||
+{ "#comment" = "Examples include vinagre, virt-viewer and virt-manager" }
|
||||
+{ "#comment" = "itself. UltraVNC, RealVNC, TightVNC do not support this" }
|
||||
+{ "#comment" = "" }
|
||||
+{ "#comment" = "It is necessary to configure /etc/sasl2/qemu.conf to choose" }
|
||||
+{ "#comment" = "the desired SASL plugin (eg, GSSPI for Kerberos)" }
|
||||
+{ "#comment" = "" }
|
||||
+{ "vnc_sasl" = "1" }
|
||||
+{ "#empty" }
|
||||
+{ "#empty" }
|
||||
+{ "#comment" = "The default SASL configuration file is located in /etc/sasl2/" }
|
||||
+{ "#comment" = "When running libvirtd unprivileged, it may be desirable to" }
|
||||
+{ "#comment" = "override the configs in this location. Set this parameter to" }
|
||||
+{ "#comment" = "point to the directory, and create a qemu.conf in that location" }
|
||||
+{ "#comment" = "" }
|
||||
+{ "vnc_sasl_dir" = "/some/directory/sasl2" }
|
||||
diff -r 961d4b1ca1d3 src/qemu.conf
|
||||
--- a/src/qemu.conf Wed Mar 04 13:17:44 2009 +0000
|
||||
+++ b/src/qemu.conf Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -60,6 +60,27 @@
|
||||
# vnc_password = "XYZ12345"
|
||||
|
||||
|
||||
+# Enable use of SASL encryption on the VNC server. This requires
|
||||
+# a VNC client which supports the SASL protocol extension.
|
||||
+# Examples include vinagre, virt-viewer and virt-manager
|
||||
+# itself. UltraVNC, RealVNC, TightVNC do not support this
|
||||
+#
|
||||
+# It is necessary to configure /etc/sasl2/qemu.conf to choose
|
||||
+# the desired SASL plugin (eg, GSSPI for Kerberos)
|
||||
+#
|
||||
+# vnc_sasl = 1
|
||||
+
|
||||
+
|
||||
+# The default SASL configuration file is located in /etc/sasl2/
|
||||
+# When running libvirtd unprivileged, it may be desirable to
|
||||
+# override the configs in this location. Set this parameter to
|
||||
+# point to the directory, and create a qemu.conf in that location
|
||||
+#
|
||||
+# vnc_sasl_dir = "/some/directory/sasl2"
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
# The default security driver is SELinux. If SELinux is disabled
|
||||
# on the host, then the security driver will automatically disable
|
||||
# itself. If you wish to disable QEMU SELinux security driver while
|
||||
diff -r 961d4b1ca1d3 src/qemu_conf.c
|
||||
--- a/src/qemu_conf.c Wed Mar 04 13:17:44 2009 +0000
|
||||
+++ b/src/qemu_conf.c Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -161,6 +161,21 @@ int qemudLoadDriverConfig(struct qemud_d
|
||||
}
|
||||
}
|
||||
|
||||
+ p = virConfGetValue (conf, "vnc_sasl");
|
||||
+ CHECK_TYPE ("vnc_sasl", VIR_CONF_LONG);
|
||||
+ if (p) driver->vncSASL = p->l;
|
||||
+
|
||||
+ p = virConfGetValue (conf, "vnc_sasl_dir");
|
||||
+ CHECK_TYPE ("vnc_sasl_dir", VIR_CONF_STRING);
|
||||
+ if (p && p->str) {
|
||||
+ VIR_FREE(driver->vncSASLdir);
|
||||
+ if (!(driver->vncSASLdir = strdup(p->str))) {
|
||||
+ virReportOOMError(NULL);
|
||||
+ virConfFree(conf);
|
||||
+ return -1;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
virConfFree (conf);
|
||||
return 0;
|
||||
}
|
||||
@@ -838,15 +853,20 @@ int qemudBuildCommandLine(virConnectPtr
|
||||
goto no_memory; \
|
||||
} while (0)
|
||||
|
||||
+#define ADD_ENV_PAIR(envname, val) \
|
||||
+ do { \
|
||||
+ char *envval; \
|
||||
+ ADD_ENV_SPACE; \
|
||||
+ if (virAsprintf(&envval, "%s=%s", envname, val) < 0) \
|
||||
+ goto no_memory; \
|
||||
+ qenv[qenvc++] = envval; \
|
||||
+ } while (0)
|
||||
+
|
||||
#define ADD_ENV_COPY(envname) \
|
||||
do { \
|
||||
char *val = getenv(envname); \
|
||||
- char *envval; \
|
||||
- ADD_ENV_SPACE; \
|
||||
if (val != NULL) { \
|
||||
- if (virAsprintf(&envval, "%s=%s", envname, val) < 0) \
|
||||
- goto no_memory; \
|
||||
- qenv[qenvc++] = envval; \
|
||||
+ ADD_ENV_PAIR(envname, val); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
@@ -1295,6 +1315,15 @@ int qemudBuildCommandLine(virConnectPtr
|
||||
driver->vncTLSx509certdir);
|
||||
}
|
||||
}
|
||||
+
|
||||
+ if (driver->vncSASL) {
|
||||
+ virBufferAddLit(&opt, ",sasl");
|
||||
+
|
||||
+ if (driver->vncSASLdir)
|
||||
+ ADD_ENV_PAIR("SASL_CONF_DIR", driver->vncSASLdir);
|
||||
+
|
||||
+ /* TODO: Support ACLs later */
|
||||
+ }
|
||||
} else {
|
||||
virBufferVSprintf(&opt, "%d",
|
||||
vm->def->graphics->data.vnc.port - 5900);
|
||||
diff -r 961d4b1ca1d3 src/qemu_conf.h
|
||||
--- a/src/qemu_conf.h Wed Mar 04 13:17:44 2009 +0000
|
||||
+++ b/src/qemu_conf.h Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -73,9 +73,11 @@ struct qemud_driver {
|
||||
char *stateDir;
|
||||
unsigned int vncTLS : 1;
|
||||
unsigned int vncTLSx509verify : 1;
|
||||
+ unsigned int vncSASL : 1;
|
||||
char *vncTLSx509certdir;
|
||||
char *vncListen;
|
||||
char *vncPassword;
|
||||
+ char *vncSASLdir;
|
||||
|
||||
virCapsPtr caps;
|
||||
|
||||
diff -r 961d4b1ca1d3 src/qemu_driver.c
|
||||
--- a/src/qemu_driver.c Wed Mar 04 13:17:44 2009 +0000
|
||||
+++ b/src/qemu_driver.c Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -620,6 +620,7 @@ qemudShutdown(void) {
|
||||
VIR_FREE(qemu_driver->vncTLSx509certdir);
|
||||
VIR_FREE(qemu_driver->vncListen);
|
||||
VIR_FREE(qemu_driver->vncPassword);
|
||||
+ VIR_FREE(qemu_driver->vncSASLdir);
|
||||
|
||||
/* Free domain callback list */
|
||||
virDomainEventCallbackListFree(qemu_driver->domainEventCallbacks);
|
||||
diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,sasl
|
||||
diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -0,0 +1,24 @@
|
||||
+<domain type='qemu'>
|
||||
+ <name>QEMUGuest1</name>
|
||||
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
||||
+ <memory>219200</memory>
|
||||
+ <currentMemory>219200</currentMemory>
|
||||
+ <vcpu>1</vcpu>
|
||||
+ <os>
|
||||
+ <type arch='i686' machine='pc'>hvm</type>
|
||||
+ <boot dev='hd'/>
|
||||
+ </os>
|
||||
+ <clock offset='utc'/>
|
||||
+ <on_poweroff>destroy</on_poweroff>
|
||||
+ <on_reboot>restart</on_reboot>
|
||||
+ <on_crash>destroy</on_crash>
|
||||
+ <devices>
|
||||
+ <emulator>/usr/bin/qemu</emulator>
|
||||
+ <disk type='block' device='disk'>
|
||||
+ <source dev='/dev/HostVG/QEMUGuest1'/>
|
||||
+ <target dev='hda' bus='ide'/>
|
||||
+ </disk>
|
||||
+ <input type='mouse' bus='ps2'/>
|
||||
+ <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>
|
||||
+ </devices>
|
||||
+</domain>
|
||||
diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,tls,x509verify=/etc/pki/tls/qemu,sasl
|
||||
diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -0,0 +1,24 @@
|
||||
+<domain type='qemu'>
|
||||
+ <name>QEMUGuest1</name>
|
||||
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
||||
+ <memory>219200</memory>
|
||||
+ <currentMemory>219200</currentMemory>
|
||||
+ <vcpu>1</vcpu>
|
||||
+ <os>
|
||||
+ <type arch='i686' machine='pc'>hvm</type>
|
||||
+ <boot dev='hd'/>
|
||||
+ </os>
|
||||
+ <clock offset='utc'/>
|
||||
+ <on_poweroff>destroy</on_poweroff>
|
||||
+ <on_reboot>restart</on_reboot>
|
||||
+ <on_crash>destroy</on_crash>
|
||||
+ <devices>
|
||||
+ <emulator>/usr/bin/qemu</emulator>
|
||||
+ <disk type='block' device='disk'>
|
||||
+ <source dev='/dev/HostVG/QEMUGuest1'/>
|
||||
+ <target dev='hda' bus='ide'/>
|
||||
+ </disk>
|
||||
+ <input type='mouse' bus='ps2'/>
|
||||
+ <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>
|
||||
+ </devices>
|
||||
+</domain>
|
||||
diff -r 961d4b1ca1d3 tests/qemuxml2argvtest.c
|
||||
--- a/tests/qemuxml2argvtest.c Wed Mar 04 13:17:44 2009 +0000
|
||||
+++ b/tests/qemuxml2argvtest.c Thu Mar 05 14:22:50 2009 +0000
|
||||
@@ -213,6 +213,19 @@ mymain(int argc, char **argv)
|
||||
QEMUD_CMD_FLAG_DRIVE_CACHE_V2);
|
||||
DO_TEST("disk-usb", 0);
|
||||
DO_TEST("graphics-vnc", 0);
|
||||
+
|
||||
+ driver.vncSASL = 1;
|
||||
+ driver.vncSASLdir = strdup("/root/.sasl2");
|
||||
+ DO_TEST("graphics-vnc-sasl", 0);
|
||||
+ driver.vncTLS = 1;
|
||||
+ driver.vncTLSx509verify = 1;
|
||||
+ driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu");
|
||||
+ DO_TEST("graphics-vnc-tls", 0);
|
||||
+ driver.vncSASL = driver.vncTLSx509verify = driver.vncTLS = 0;
|
||||
+ free(driver.vncSASLdir);
|
||||
+ free(driver.vncTLSx509certdir);
|
||||
+ driver.vncSASLdir = driver.vncTLSx509certdir = NULL;
|
||||
+
|
||||
DO_TEST("graphics-sdl", 0);
|
||||
DO_TEST("graphics-sdl-fullscreen", 0);
|
||||
DO_TEST("input-usbmouse", 0);
|
||||
@@ -1,29 +0,0 @@
|
||||
Index: src/xs_internal.c
|
||||
===================================================================
|
||||
RCS file: /data/cvs/libxen/src/xs_internal.c,v
|
||||
retrieving revision 1.88
|
||||
diff -u -u -r1.88 xs_internal.c
|
||||
--- src/xs_internal.c 5 Feb 2009 18:14:00 -0000 1.88
|
||||
+++ src/xs_internal.c 11 Mar 2009 13:23:17 -0000
|
||||
@@ -1215,7 +1215,7 @@
|
||||
static void
|
||||
xenStoreWatchEvent(int watch ATTRIBUTE_UNUSED,
|
||||
int fd ATTRIBUTE_UNUSED,
|
||||
- int events ATTRIBUTE_UNUSED,
|
||||
+ int events,
|
||||
void *data)
|
||||
{
|
||||
char **event;
|
||||
@@ -1226,8 +1226,12 @@
|
||||
|
||||
virConnectPtr conn = data;
|
||||
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
|
||||
+
|
||||
if(!priv) return;
|
||||
|
||||
+ /* only set a watch on read and write events */
|
||||
+ if (events & (VIR_EVENT_HANDLE_ERROR | VIR_EVENT_HANDLE_HANGUP)) return;
|
||||
+
|
||||
xenUnifiedLock(priv);
|
||||
|
||||
if(!priv->xshandle)
|
||||
@@ -1,26 +0,0 @@
|
||||
From: Daniel P. Berrange <berrange@redhat.com>
|
||||
Date: Tue, 10 Mar 2009 10:32:24 +0000 (+0000)
|
||||
Subject: Fix Xen block detach with newer Xend (Cole RobinSon / Tomohiro Takahashi)
|
||||
X-Git-Url: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff_plain;h=33813a932d58c17441203d0e581eba91369a71e0
|
||||
|
||||
Fix Xen block detach with newer Xend (Cole RobinSon / Tomohiro Takahashi)
|
||||
---
|
||||
|
||||
diff --git a/src/xend_internal.c b/src/xend_internal.c
|
||||
index f9f2cb3..772f3f4 100644
|
||||
--- a/src/xend_internal.c
|
||||
+++ b/src/xend_internal.c
|
||||
@@ -5566,7 +5566,12 @@ virDomainXMLDevID(virDomainPtr domain,
|
||||
char *xref;
|
||||
|
||||
if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
|
||||
- strcpy(class, "vbd");
|
||||
+ if (dev->data.disk->driverName &&
|
||||
+ STREQ(dev->data.disk->driverName, "tap"))
|
||||
+ strcpy(class, "tap");
|
||||
+ else
|
||||
+ strcpy(class, "vbd");
|
||||
+
|
||||
if (dev->data.disk->dst == NULL)
|
||||
return -1;
|
||||
xenUnifiedLock(priv);
|
||||
@@ -1,24 +0,0 @@
|
||||
Index: src/xend_internal.c
|
||||
===================================================================
|
||||
RCS file: /data/cvs/libxen/src/xend_internal.c,v
|
||||
retrieving revision 1.251
|
||||
diff -u -r1.251 xend_internal.c
|
||||
--- src/xend_internal.c 13 Feb 2009 18:23:23 -0000 1.251
|
||||
+++ src/xend_internal.c 10 Mar 2009 10:00:28 -0000
|
||||
@@ -904,7 +904,15 @@
|
||||
count++;
|
||||
}
|
||||
|
||||
- if (VIR_ALLOC_N(ptr, count + 1 + extra) < 0)
|
||||
+ /*
|
||||
+ * We can'tuse the normal allocation routines as we are mixing
|
||||
+ * an array of char * at the beginning followed by an array of char
|
||||
+ * ret points to the NULL terminated array of char *
|
||||
+ * ptr points to the current string after that array but in the same
|
||||
+ * allocated block
|
||||
+ */
|
||||
+ if (virAlloc((void *)&ptr,
|
||||
+ (count + 1) * sizeof(char *) + extra * sizeof(char)) < 0)
|
||||
goto error;
|
||||
|
||||
ret = (char **) ptr;
|
||||
51
libvirt-0.6.4-svirt-sound.patch
Normal file
51
libvirt-0.6.4-svirt-sound.patch
Normal file
@@ -0,0 +1,51 @@
|
||||
From 127a39777e9809053bb98a9082e27c73543ccfa2 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel P. Berrange <berrange@redhat.com>
|
||||
Date: Mon, 17 Aug 2009 08:32:08 +0100
|
||||
Subject: [PATCH] Disable sound cards when running sVirt
|
||||
|
||||
Temporary hack till PulseAudio autostart problems are sorted out when
|
||||
SELinux enforcing (bz 486112)
|
||||
|
||||
Fedora-patch: libvirt-0.6.4-svirt-sound.patch
|
||||
---
|
||||
src/qemu_conf.c | 17 ++++++++++++++++-
|
||||
1 files changed, 16 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
|
||||
index f92bcef..f3b4ef0 100644
|
||||
--- a/src/qemu_conf.c
|
||||
+++ b/src/qemu_conf.c
|
||||
@@ -1510,6 +1510,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
|
||||
char uuid[VIR_UUID_STRING_BUFLEN];
|
||||
char domid[50];
|
||||
const char *cpu = NULL;
|
||||
+ int skipSound = 0;
|
||||
+
|
||||
+ if (driver->securityDriver &&
|
||||
+ driver->securityDriver->name &&
|
||||
+ STREQ(driver->securityDriver->name, "selinux") &&
|
||||
+ getuid() == 0) {
|
||||
+ static int soundWarned = 0;
|
||||
+ skipSound = 1;
|
||||
+ if (def->nsounds &&
|
||||
+ !soundWarned) {
|
||||
+ soundWarned = 1;
|
||||
+ VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
|
||||
+ }
|
||||
+ }
|
||||
|
||||
uname_normalize(&ut);
|
||||
|
||||
@@ -2181,7 +2195,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
|
||||
}
|
||||
|
||||
/* Add sound hardware */
|
||||
- if (def->nsounds) {
|
||||
+ if (def->nsounds &&
|
||||
+ !skipSound) {
|
||||
int size = 100;
|
||||
char *modstr;
|
||||
if (VIR_ALLOC_N(modstr, size+1) < 0)
|
||||
--
|
||||
1.6.2.5
|
||||
|
||||
32
libvirt-fix-drv-supports-feature-bogus-error.patch
Normal file
32
libvirt-fix-drv-supports-feature-bogus-error.patch
Normal file
@@ -0,0 +1,32 @@
|
||||
From 2f6e857ac7d6ed5cd417e684147dd9c98775ab3d Mon Sep 17 00:00:00 2001
|
||||
From: Chris Lalancette <clalance@redhat.com>
|
||||
Date: Mon, 21 Sep 2009 14:53:31 +0200
|
||||
Subject: [PATCH] Don't do virSetConnError when virDrvSupportsFeature is successful.
|
||||
|
||||
Signed-off-by: Chris Lalancette <clalance@redhat.com>
|
||||
Fedora-patch: libvirt-fix-drv-supports-feature-bogus-error.patch
|
||||
---
|
||||
src/libvirt.c | 7 +++++--
|
||||
1 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/libvirt.c b/src/libvirt.c
|
||||
index 4a11688..fa59dc7 100644
|
||||
--- a/src/libvirt.c
|
||||
+++ b/src/libvirt.c
|
||||
@@ -1349,8 +1349,11 @@ virDrvSupportsFeature (virConnectPtr conn, int feature)
|
||||
}
|
||||
|
||||
ret = VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature);
|
||||
- /* Copy to connection error object for back compatability */
|
||||
- virSetConnError(conn);
|
||||
+
|
||||
+ if (ret < 0)
|
||||
+ /* Copy to connection error object for back compatability */
|
||||
+ virSetConnError(conn);
|
||||
+
|
||||
return ret;
|
||||
}
|
||||
|
||||
--
|
||||
1.6.2.5
|
||||
|
||||
46
libvirt-fix-net-hotunplug-double-free.patch
Normal file
46
libvirt-fix-net-hotunplug-double-free.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
From d09ff3c35c29d14760d5ea03559042cc024e09ab Mon Sep 17 00:00:00 2001
|
||||
From: Mark McLoughlin <markmc@redhat.com>
|
||||
Date: Thu, 17 Sep 2009 15:31:08 +0100
|
||||
Subject: [PATCH] Fix net/disk hot-unplug segfault
|
||||
|
||||
When we hot-unplug the last device, we're currently double-freeing
|
||||
the device definition.
|
||||
|
||||
Reported by Michal Nowak here:
|
||||
|
||||
https://bugzilla.redhat.com/523953
|
||||
|
||||
* src/qemu_driver.c: fix double free
|
||||
|
||||
(cherry-picked from commit 8881ae1bf8783006777429403cc543c33187175d)
|
||||
|
||||
Fedora-patch: libvirt-fix-net-hotunplug-double-free.patch
|
||||
---
|
||||
src/qemu_driver.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
|
||||
index a65334f..de31581 100644
|
||||
--- a/src/qemu_driver.c
|
||||
+++ b/src/qemu_driver.c
|
||||
@@ -5998,7 +5998,7 @@ try_command:
|
||||
/* ignore, harmless */
|
||||
}
|
||||
} else {
|
||||
- VIR_FREE(vm->def->disks[0]);
|
||||
+ VIR_FREE(vm->def->disks);
|
||||
vm->def->ndisks = 0;
|
||||
}
|
||||
virDomainDiskDefFree(detach);
|
||||
@@ -6100,7 +6100,7 @@ qemudDomainDetachNetDevice(virConnectPtr conn,
|
||||
/* ignore, harmless */
|
||||
}
|
||||
} else {
|
||||
- VIR_FREE(vm->def->nets[0]);
|
||||
+ VIR_FREE(vm->def->nets);
|
||||
vm->def->nnets = 0;
|
||||
}
|
||||
virDomainNetDefFree(detach);
|
||||
--
|
||||
1.6.2.5
|
||||
|
||||
50
libvirt-fix-pci-hostdev-hotunplug-leak.patch
Normal file
50
libvirt-fix-pci-hostdev-hotunplug-leak.patch
Normal file
@@ -0,0 +1,50 @@
|
||||
From d04ac8624f5fabe7587982796f2e2161220b0fcc Mon Sep 17 00:00:00 2001
|
||||
From: Mark McLoughlin <markmc@redhat.com>
|
||||
Date: Thu, 17 Sep 2009 15:32:45 +0100
|
||||
Subject: [PATCH] Fix leak in PCI hostdev hot-unplug
|
||||
|
||||
* src/qemu_driver.c: sync the hostdev hot-unplug code with the disk/net
|
||||
code.
|
||||
|
||||
(cherry-picked from commit a70da51ff76ed860bfc0cdee2e1d556da997c557)
|
||||
|
||||
Fedora-patch: libvirt-fix-pci-hostdev-hotunplug-leak.patch
|
||||
---
|
||||
src/qemu_driver.c | 20 +++++++++++++-------
|
||||
1 files changed, 13 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
|
||||
index de31581..2ddcdc0 100644
|
||||
--- a/src/qemu_driver.c
|
||||
+++ b/src/qemu_driver.c
|
||||
@@ -6206,14 +6206,20 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
|
||||
pciFreeDevice(conn, pci);
|
||||
}
|
||||
|
||||
- if (i != --vm->def->nhostdevs)
|
||||
- memmove(&vm->def->hostdevs[i],
|
||||
- &vm->def->hostdevs[i+1],
|
||||
- sizeof(*vm->def->hostdevs) * (vm->def->nhostdevs-i));
|
||||
- if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
|
||||
- virReportOOMError(conn);
|
||||
- ret = -1;
|
||||
+ if (vm->def->nhostdevs > 1) {
|
||||
+ memmove(vm->def->hostdevs + i,
|
||||
+ vm->def->hostdevs + i + 1,
|
||||
+ sizeof(*vm->def->hostdevs) *
|
||||
+ (vm->def->nhostdevs - (i + 1)));
|
||||
+ vm->def->nhostdevs--;
|
||||
+ if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
|
||||
+ /* ignore, harmless */
|
||||
+ }
|
||||
+ } else {
|
||||
+ VIR_FREE(vm->def->hostdevs);
|
||||
+ vm->def->nhostdevs = 0;
|
||||
}
|
||||
+ virDomainHostdevDefFree(detach);
|
||||
|
||||
return ret;
|
||||
}
|
||||
--
|
||||
1.6.2.5
|
||||
|
||||
53
libvirt-fix-qemu-raw-format-save.patch
Normal file
53
libvirt-fix-qemu-raw-format-save.patch
Normal file
@@ -0,0 +1,53 @@
|
||||
From e50c91fdcea5d81e3eb2051c05f4e51a16c3e692 Mon Sep 17 00:00:00 2001
|
||||
From: Charles Duffy <Charles_Duffy@dell.com>
|
||||
Date: Fri, 18 Sep 2009 11:32:35 -0500
|
||||
Subject: [PATCH] Prevent attempt to call cat -c during virDomainSave to raw
|
||||
|
||||
Fedora-patch: libvirt-fix-qemu-raw-format-save.patch
|
||||
---
|
||||
src/qemu_driver.c | 28 ++++++++++++++++++----------
|
||||
1 files changed, 18 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
|
||||
index 2ddcdc0..7c7b985 100644
|
||||
--- a/src/qemu_driver.c
|
||||
+++ b/src/qemu_driver.c
|
||||
@@ -3905,17 +3905,25 @@ static int qemudDomainSave(virDomainPtr dom,
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
- const char *prog = qemudSaveCompressionTypeToString(header.compressed);
|
||||
- if (prog == NULL) {
|
||||
- qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
|
||||
- _("Invalid compress format %d"), header.compressed);
|
||||
- goto cleanup;
|
||||
- }
|
||||
+ {
|
||||
+ const char *prog = qemudSaveCompressionTypeToString(header.compressed);
|
||||
+ const char *args;
|
||||
|
||||
- if (STREQ (prog, "raw"))
|
||||
- prog = "cat";
|
||||
- internalret = virAsprintf(&command, "migrate \"exec:"
|
||||
- "%s -c >> '%s' 2>/dev/null\"", prog, safe_path);
|
||||
+ if (prog == NULL) {
|
||||
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
|
||||
+ _("Invalid compress format %d"), header.compressed);
|
||||
+ goto cleanup;
|
||||
+ }
|
||||
+
|
||||
+ if (STREQ (prog, "raw")) {
|
||||
+ prog = "cat";
|
||||
+ args = "";
|
||||
+ } else {
|
||||
+ args = "-c";
|
||||
+ }
|
||||
+ internalret = virAsprintf(&command, "migrate \"exec:"
|
||||
+ "%s %s >> '%s' 2>/dev/null\"", prog, args, safe_path);
|
||||
+ }
|
||||
|
||||
if (internalret < 0) {
|
||||
virReportOOMError(dom->conn);
|
||||
--
|
||||
1.6.2.5
|
||||
|
||||
41
libvirt-fix-usb-device-passthrough.patch
Normal file
41
libvirt-fix-usb-device-passthrough.patch
Normal file
@@ -0,0 +1,41 @@
|
||||
From 16f20706f8d2f113bb6a49f56e415c16d438183e Mon Sep 17 00:00:00 2001
|
||||
From: Mark McLoughlin <markmc@redhat.com>
|
||||
Date: Wed, 30 Sep 2009 18:37:03 +0100
|
||||
Subject: [PATCH] Fix USB device re-labelling
|
||||
|
||||
A simple misplaced break out of a switch results in:
|
||||
|
||||
libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./vendor': No such file or directory
|
||||
libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./device': No such file or directory
|
||||
libvir: error : this function is not supported by the hypervisor: Failed to read product/vendor ID for 0000:00:54c.
|
||||
|
||||
when trying to passthrough a USB host device to qemu.
|
||||
|
||||
* src/security_selinux.c: fix a switch/break thinko
|
||||
|
||||
Fedora-patch: libvirt-fix-usb-device-passthrough.patch
|
||||
---
|
||||
src/security_selinux.c | 3 +--
|
||||
1 files changed, 1 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/security_selinux.c b/src/security_selinux.c
|
||||
index bc295b1..b4dc153 100644
|
||||
--- a/src/security_selinux.c
|
||||
+++ b/src/security_selinux.c
|
||||
@@ -464,12 +464,11 @@ SELinuxSetSecurityHostdevLabel(virConnectPtr conn,
|
||||
|
||||
ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm);
|
||||
usbFreeDevice(conn, usb);
|
||||
-
|
||||
- break;
|
||||
} else {
|
||||
/* XXX deal with product/vendor better */
|
||||
ret = 0;
|
||||
}
|
||||
+ break;
|
||||
}
|
||||
|
||||
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: {
|
||||
--
|
||||
1.6.4.4
|
||||
|
||||
775
libvirt.spec
775
libvirt.spec
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user