- Devel - libvirt List Archives

[libvirt] [PATCH] Update how to compile with -Werror
by Doug Goldstein 26 Sep '12

26 Sep '12

--enable-compile-warnings=error has been renamed to --enable-werror so update the HACKING and the hacking.html to reflect that. --- docs/hacking.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index a97dc22..c3f859c 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -76,7 +76,7 @@ <li><p>Run the automated tests on your code before submitting any changes. In particular, configure with compile warnings set to -Werror:</p> <pre> - ./configure --enable-compile-warnings=error + ./configure --enable-werror </pre> <p> and run the tests: -- 1.7.8.6

5 7

[libvirt] Add a few more getters/setters to VNC/SPICE configuration
by Christophe Fergeau 26 Sep '12

26 Sep '12

Hey, This patch series implements a few more getters/setters for GVirConfigDomainGraphicsVnc and GVirConfigDomainGraphicsSpice. They will be useful in GNOME Boxes as the same is currently achieved through XPath use. Christophe

3 14

[libvirt] [PATCHv2] qemu: Avoid holding the driver lock in trivial snapshot API's
by Peter Krempa 25 Sep '12

25 Sep '12

In most of the snapshot API's there's no need to hold the driver lock the whole time. This patch adds helper functions that get the domain object in functions that don't require the driver lock and simplifies call paths from snapshot-related API's. --- Diff to v1: - remove touching domain configuration locking to handle NULL gracefully and apropriate tweaks not to break code src/qemu/qemu_driver.c | 267 +++++++++++++++---------------------------------- 1 file changed, 79 insertions(+), 188 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6848924..af14197 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -187,6 +187,60 @@ struct qemuAutostartData { virConnectPtr conn; }; + +/* Looks up the domain obj and unlocks the driver */ +static virDomainObjPtr +qemuDomObjFromDomain(virDomainPtr domain) +{ + struct qemud_driver *driver = domain->conn->privateData; + virDomainObjPtr vm; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, domain->uuid); + qemuDriverUnlock(driver); + if (!vm) { + virUUIDFormat(domain->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + } + + return vm; +} + + +/* Looks up domain obj from snapshot and unlocks the driver */ +static virDomainObjPtr +qemuDomObjFromSnapshot(virDomainSnapshotPtr snapshot) +{ + return qemuDomObjFromDomain(snapshot->domain); +} + + +/* Looks up snapshot obj from VM and name */ +static virDomainSnapshotObjPtr +qemuSnapObjFromName(virDomainObjPtr vm, + const char *name) +{ + virDomainSnapshotObjPtr snap = NULL; + snap = virDomainSnapshotFindByName(vm->snapshots, name); + if (!snap) + virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, + _("no domain snapshot with matching name '%s'"), + name); + + return snap; +} + + +/* Looks up snapshot obj from VM and snapshotPtr */ +static virDomainSnapshotObjPtr +qemuSnapObjFromSnapshot(virDomainObjPtr vm, + virDomainSnapshotPtr snapshot) +{ + return qemuSnapObjFromName(vm, snapshot->name); +} + static void qemuAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) @@ -11305,22 +11359,14 @@ static int qemuDomainSnapshotListNames(virDomainPtr domain, char **names, int nameslen, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm = NULL; int n = -1; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } n = virDomainSnapshotObjListGetNames(vm->snapshots, NULL, names, nameslen, flags); @@ -11328,36 +11374,26 @@ static int qemuDomainSnapshotListNames(virDomainPtr domain, char **names, cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return n; } static int qemuDomainSnapshotNum(virDomainPtr domain, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm = NULL; int n = -1; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } n = virDomainSnapshotObjListNum(vm->snapshots, NULL, flags); cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return n; } @@ -11365,29 +11401,20 @@ static int qemuDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm = NULL; int n = -1; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } n = virDomainListSnapshots(vm->snapshots, NULL, domain, snaps, flags); cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return n; } @@ -11397,7 +11424,6 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, int nameslen, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; @@ -11405,23 +11431,11 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(snapshot->domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } n = virDomainSnapshotObjListGetNames(vm->snapshots, snap, names, nameslen, flags); @@ -11429,7 +11443,6 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return n; } @@ -11437,7 +11450,6 @@ static int qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; @@ -11445,30 +11457,17 @@ qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(snapshot->domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } n = virDomainSnapshotObjListNum(vm->snapshots, snap, flags); cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return n; } @@ -11477,7 +11476,6 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, virDomainSnapshotPtr **snaps, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; @@ -11485,23 +11483,11 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(snapshot->domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } n = virDomainListSnapshots(vm->snapshots, snap, snapshot->domain, snaps, flags); @@ -11509,7 +11495,6 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return n; } @@ -11517,64 +11502,41 @@ static virDomainSnapshotPtr qemuDomainSnapshotLookupByName(virDomainPtr domain, const char *name, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm; virDomainSnapshotObjPtr snap = NULL; virDomainSnapshotPtr snapshot = NULL; virCheckFlags(0, NULL); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no snapshot with matching name '%s'"), name); + if (!(snap = qemuSnapObjFromName(vm, name))) goto cleanup; - } snapshot = virGetDomainSnapshot(domain, snap->def->name); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return snapshot; } static int qemuDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm; int ret = -1; virCheckFlags(0, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } ret = (vm->current_snapshot != NULL); cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return ret; } @@ -11582,30 +11544,17 @@ static virDomainSnapshotPtr qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm; virDomainSnapshotObjPtr snap = NULL; virDomainSnapshotPtr parent = NULL; virCheckFlags(0, NULL); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(snapshot->domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } if (!snap->def->parent) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, @@ -11619,28 +11568,19 @@ qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return parent; } static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm; virDomainSnapshotPtr snapshot = NULL; virCheckFlags(0, NULL); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } if (!vm->current_snapshot) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, "%s", @@ -11653,14 +11593,12 @@ static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return snapshot; } static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; char *xml = NULL; virDomainSnapshotObjPtr snap = NULL; @@ -11668,29 +11606,19 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, virCheckFlags(VIR_DOMAIN_XML_SECURE, NULL); - qemuDriverLock(driver); - virUUIDFormat(snapshot->domain->uuid, uuidstr); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } + + virUUIDFormat(snapshot->domain->uuid, uuidstr); xml = virDomainSnapshotDefFormat(uuidstr, snap->def, flags, 0); cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return xml; } @@ -11698,30 +11626,17 @@ static int qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; int ret = -1; virDomainSnapshotObjPtr snap = NULL; - char uuidstr[VIR_UUID_STRING_BUFLEN]; virCheckFlags(0, -1); - qemuDriverLock(driver); - virUUIDFormat(snapshot->domain->uuid, uuidstr); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } ret = (vm->current_snapshot && STREQ(snapshot->name, vm->current_snapshot->def->name)); @@ -11729,7 +11644,6 @@ qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return ret; } @@ -11738,30 +11652,17 @@ static int qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; int ret = -1; virDomainSnapshotObjPtr snap = NULL; - char uuidstr[VIR_UUID_STRING_BUFLEN]; virCheckFlags(0, -1); - qemuDriverLock(driver); - virUUIDFormat(snapshot->domain->uuid, uuidstr); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } /* XXX Someday, we should recognize internal snapshots in qcow2 * images that are not tied to a libvirt snapshot; if we ever do @@ -11771,7 +11672,6 @@ qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return ret; } @@ -12439,9 +12339,7 @@ qemuDomainOpenConsole(virDomainPtr dom, virStreamPtr st, unsigned int flags) { - struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm = NULL; - char uuidstr[VIR_UUID_STRING_BUFLEN]; int ret = -1; int i; virDomainChrDefPtr chr = NULL; @@ -12450,15 +12348,8 @@ qemuDomainOpenConsole(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_CONSOLE_SAFE | VIR_DOMAIN_CONSOLE_FORCE, -1); - qemuDriverLock(driver); - virUUIDFormat(dom->uuid, uuidstr); - vm = virDomainFindByUUID(&driver->domains, dom->uuid); - qemuDriverUnlock(driver); - if (!vm) { - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; - } if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, -- 1.7.12

2 2

[libvirt] [libvirt-glib] Don't call g_set_error with a NULL format string
by Christophe Fergeau 25 Sep '12

25 Sep '12

From: Jovanka Gulicoska <jovanka.gulicoska(a)gmail.com> The format string passed to g_set_error cannot be NULL or a runtime warning will be printed. --- libvirt-gobject/libvirt-gobject-stream.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 3b98023..fa1a32c 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -319,7 +319,8 @@ gssize gvir_stream_receive(GVirStream *self, got = virStreamRecv(self->priv->handle, buffer, size); if (got == -2) { /* blocking */ - g_set_error(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK, NULL); + g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK, + "virStreamRecv call would block"); } else if (got < 0) { g_set_error(error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "Got virStreamRecv error in %s", G_STRFUNC); @@ -435,7 +436,8 @@ gssize gvir_stream_send(GVirStream *self, got = virStreamSend(self->priv->handle, buffer, size); if (got == -2) { /* blocking */ - g_set_error(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK, NULL); + g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK, + "virStreamSend call would block"); } else if (got < 0) { g_set_error(error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, "Got virStreamRecv error in %s", G_STRFUNC); -- 1.7.11.4

2 2

[libvirt] [PATCH v1 0/2] Fix environment-setting code.
by Richard W.M. Jones 25 Sep '12

25 Sep '12

[This patch is for discussion only: I have not proven that it fixes the bug] https://bugzilla.redhat.com/show_bug.cgi?id=859596 When libvirtd runs any command, it uses a simple strategy to set the environment for that command: (a) It creates a new, empty environment array. (b) It copies in a few known-good environment variables, including TMPDIR. (c) It appends environment variables specified by the user, eg. ones specified in <qemu:env>. Unfortunately this means if you try to set TMPDIR via a <qemu:env> XML directive, then it is appended to the list of environment variables which already includes TMPDIR. The qemu subprocess picks an environment variable (probably) first from the list, which is the TMPDIR that libvirtd had originally, not the TMPDIR that was specified by the user. This [possibly, not proven] leads to bug 859596, where we see qemu trying to create temporary files in a directory that no longer exists. The follow-up patches change libvirtd so that environment variables in the virCommandPtr array are replaced if they exist already. Rich.

2 11

[libvirt] [PATCH V1 0/2] Add support for IP layer 4 protocol filtering
by Stefan Berger 25 Sep '12

25 Sep '12

The 1st patch in this series extends the list of IP layer 4 protocol name-to-identifier translations. The 2nd patch closes a gap in the possibility to filter layer 4 protocols' layer 2 and 3 headers. This patch makes the 'iptables --protocol <protocol>' parameter accessible using an ipl4 XML node. Stefan

1 3

[libvirt] [PATCH v2 0/2] security: support for names on DAC labels
by Marcelo Cerri 25 Sep '12

25 Sep '12

This patch series extends label parsing for DAC security driver and updates the related documentation. Marcelo Cerri (2): security: also parse user/group names instead of just IDs for DAC labels doc: update description about security labels on formatdomain.html docs/formatdomain.html.in | 14 ++++++++-- src/security/security_dac.c | 62 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 66 insertions(+), 10 deletions(-) -- 1.7.12

2 5

[libvirt] [PATCH] storage: Add timeout for iscsi volume's stable path discovery
by Osier Yang 25 Sep '12

25 Sep '12

It might need some time till the LUN's stable path shows up on initiator host, and although the time window is not foreseeable, as a better than nothing fix, this patch adds timeout for the stable path discovery process. --- src/storage/storage_backend.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 1d32232..e159bd2 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1347,6 +1347,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, struct dirent *dent; char *stablepath; int opentries = 0; + int retry = 0; /* Short circuit if pool has no target, or if its /dev */ if (pool->def->target.path == NULL || @@ -1355,7 +1356,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, goto ret_strdup; /* Skip whole thing for a pool which isn't in /dev - * so we don't mess will filesystem/dir based pools + * so we don't mess filesystem/dir based pools */ if (!STRPREFIX(pool->def->target.path, "/dev")) goto ret_strdup; @@ -1384,8 +1385,12 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, /* The pool is pointing somewhere like /dev/disk/by-path * or /dev/disk/by-id, so we need to check all symlinks in * the target directory and figure out which one points - * to this device node + * to this device node. + * + * And it might need some time till the stabe path shows + * up, so add timeout to retry here. */ + retry: while ((dent = readdir(dh)) != NULL) { if (dent->d_name[0] == '.') continue; @@ -1406,6 +1411,11 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, VIR_FREE(stablepath); } + if (++retry < 100) { + usleep(100 * 1000); + goto retry; + } + closedir(dh); ret_strdup: -- 1.7.7.3

2 2

[libvirt] [libvirt-designer][PATCH 0/6] Another functional extension
by Michal Privoznik 25 Sep '12

25 Sep '12

and couple of fixes for clean RPM build. Michal Privoznik (6): Implement resources setting Create basic documentation domain.c: Document @error on public APIs spec: Remove unused rules Create manpage for virtxml spec: Cleanup for rpmlint .gitignore | 17 ++++ Makefile.am | 2 +- configure.ac | 1 + docs/Makefile.am | 42 ++++++++++ docs/libvirt-designer-docs.xml | 27 ++++++ examples/Makefile.am | 11 +++ examples/virtxml.c | 23 +++++ examples/virtxml.pod | 121 ++++++++++++++++++++++++++++ libvirt-designer.spec.in | 31 ++----- libvirt-designer/libvirt-designer-domain.c | 95 ++++++++++++++++++++++ libvirt-designer/libvirt-designer-domain.h | 10 +++ libvirt-designer/libvirt-designer.sym | 2 + 12 files changed, 358 insertions(+), 24 deletions(-) create mode 100644 docs/Makefile.am create mode 100644 docs/libvirt-designer-docs.xml create mode 100644 examples/virtxml.pod -- 1.7.8.6

3 15

[libvirt] RFC: Check if the host device is assignable earlier
by Osier Yang 25 Sep '12

25 Sep '12

Hi, I think we already got enough bugs which are about "try to assign a host device, then it fails for not assignable", clearly this "try and then fails" approach is not nice. The reason for not assignable can be various. E.g. * IOMMU or AMD-V is not enabled/supported * platform doesn't support interrupt remapping There is no checking for above reasons now, an assignment will get error till the qemu process started. It's nice if checking it much earlier, and list whether the host supports device assignment as a property of capabilities? * The device can't be unbind/reset * Is being used by some other guests * Permission issues * Other reasons? It will also be nice if one could known what devices are assignable (list all assignable devices? this needs to enumerate and try to unbind/reset/restore the devices, which is not desireable, as it could breaks work on host, such as NIC). Or whether a device is assignable (this shouldn't cause any problem when doing checking, because it's the requested operation, one knowns what he does). Assuming a new API to determine whether a host device is assignable for qemu driver, the workflow for the implementation should be: * If the device is being used (Examine activePciHostdevs, or activeUsbHostdevs) * If there is permission issues * Other possible reasons should be checked before trying to unbind and reset. * If the device can be unbind/reset It's basicly a rough thought, any idea is welcomed. Regards, Osier

2 2

[libvirt] [PATCH] node_memory: Improve the docs
by Osier Yang 25 Sep '12

25 Sep '12

To declare that it's not recommended to use the tuning API while the outside tuning program (such as ksmtuned under Linux) is running. --- src/libvirt.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 0cbcfbf..43591c0 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -6794,6 +6794,12 @@ error: * @flags: extra flags; not used yet, so callers should always pass 0 * * Change all or a subset of the node memory tunables. + * + * Note that it's not recommended to use this function while the + * outside tuning program is running (such as ksmtuned under Linux), + * as they could change the tunables in parallel, which could cause + * conflicts. + * * This function may require privileged access to the hypervisor. * * Returns 0 in case of success, -1 in case of failure. -- 1.7.7.3

2 2

[libvirt] [PATCHv4] interface: add udev based backend for virInterface
by Doug Goldstein 25 Sep '12

25 Sep '12

Add a read-only udev based backend for virInterface. Useful for distros that do not have netcf support yet. Multiple libvirt based utilities use a HAL based fallback when virInterface is not available which is less than ideal. This implements: * virConnectNumOfInterfaces() * virConnectListInterfaces() * virConnectNumOfDefinedInterfaces() * virConnectListDefinedInterfaces() * virConnectInterfaceLookupByName() * virConnectInterfaceLookupByMACString() --- Change from v3: * fix make syntax-check issues * check strdup() and handle that case * simplify configure check Change from v2: * rebase from master Change from v1: * rebase from master configure.ac | 18 +- po/POTFILES.in | 1 + src/Makefile.am | 12 +- src/interface/interface_backend_udev.c | 430 ++++++++++++++++++++++++++++++++ tools/virsh.c | 2 + 5 files changed, 450 insertions(+), 13 deletions(-) create mode 100644 src/interface/interface_backend_udev.c diff --git a/configure.ac b/configure.ac index 3e9073d..a3d9ab1 100644 --- a/configure.ac +++ b/configure.ac @@ -2798,18 +2798,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi -dnl The interface driver depends on the netcf library -if test "$with_interface:$with_netcf" = "check:yes" ; then - with_interface=yes -fi - -if test "$with_interface:$with_netcf" = "check:no" ; then - with_interface=no -fi - -if test "$with_interface:$with_netcf" = "yes:no" ; then - AC_MSG_ERROR([Requested the Interface driver without netcf support]) -fi +dnl The interface driver depends on the netcf library or udev library +case $with_interface:$with_netcf:$with_udev in + check:*yes*) with_interface=yes ;; + check:no:no) with_interface=no ;; + yes:no:no) AC_MSG_ERROR([Requested the Interface driver without netcf or udev support]) ;; +esac if test "$with_interface" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_INTERFACE], [1], diff --git a/po/POTFILES.in b/po/POTFILES.in index 12a2b25..0999260 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -41,6 +41,7 @@ src/hyperv/hyperv_driver.c src/hyperv/hyperv_util.c src/hyperv/hyperv_wmi.c src/interface/interface_backend_netcf.c +src/interface/interface_backend_udev.c src/internal.h src/libvirt.c src/libvirt-qemu.c diff --git a/src/Makefile.am b/src/Makefile.am index 4ae741b..53f1fbf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -557,11 +557,16 @@ INTERFACE_DRIVER_SOURCES = if WITH_INTERFACE INTERFACE_DRIVER_SOURCES += \ interface/interface_driver.h -endif if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c +else +if HAVE_UDEV +INTERFACE_DRIVER_SOURCES += \ + interface/interface_backend_udev.c +endif +endif endif SECRET_DRIVER_SOURCES = \ @@ -1044,6 +1049,11 @@ libvirt_driver_interface_la_LIBADD = if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) +else +if HAVE_UDEV +libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) +libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) +endif endif if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c new file mode 100644 index 0000000..a823d2d --- /dev/null +++ b/src/interface/interface_backend_udev.c @@ -0,0 +1,430 @@ +/* + * interface_backend_udev.c: udev backend for virInterface + * + * Copyright (C) 2012 Doug Goldstein <cardoe(a)cardoe.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. + */ +#include <config.h> + +#include <libudev.h> + +#include "virterror_internal.h" +#include "datatypes.h" +#include "interface_driver.h" +#include "interface_conf.h" +#include "memory.h" + +#define VIR_FROM_THIS VIR_FROM_INTERFACE + +struct udev_iface_driver { + struct udev *udev; +}; + +enum udev_status { UDEV_IFACE_ACTIVE, UDEV_IFACE_INACTIVE, UDEV_IFACE_ALL }; + +static struct udev_enumerate * +udevIfaceGetDevices(struct udev *udev, enum udev_status status) +{ + struct udev_enumerate *enumerate; + + /* Check input params for sanity */ + if (!udev) + return NULL; + + /* Create a new enumeration to create a list */ + enumerate = udev_enumerate_new(udev); + + if (!enumerate) + return NULL; + + /* Enumerate all network subsystem devices */ + udev_enumerate_add_match_subsystem(enumerate, "net"); + + /* Ignore devices that are part of a bridge */ + udev_enumerate_add_nomatch_sysattr(enumerate, "brport/state", NULL); + + /* State of the device */ + switch (status) { + case UDEV_IFACE_ACTIVE: + udev_enumerate_add_match_sysattr(enumerate, "operstate", "up"); + break; + + case UDEV_IFACE_INACTIVE: + udev_enumerate_add_match_sysattr(enumerate, "operstate", "down"); + break; + + case UDEV_IFACE_ALL: + break; + } + + /* We don't want to see the TUN devices that QEMU creates for other gets + * running on this machine. By saying nomatch NULL, we just are getting + * devices without the tun_flags sysattr. + */ + udev_enumerate_add_nomatch_sysattr(enumerate, "tun_flags", NULL); + + return enumerate; +} + +static virDrvOpenStatus +udevIfaceOpenInterface(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) +{ + struct udev_iface_driver *driverState = NULL; + + virCheckFlags(0, VIR_DRV_OPEN_ERROR); + + if (VIR_ALLOC(driverState) < 0) { + virReportOOMError(); + goto err; + } + + driverState->udev = udev_new(); + if (!driverState->udev) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create udev context")); + goto err; + } + + conn->interfacePrivateData = driverState; + + return VIR_DRV_OPEN_SUCCESS; + +err: + VIR_FREE(driverState); + + return VIR_DRV_OPEN_ERROR; +} + +static int +udevIfaceCloseInterface(virConnectPtr conn) +{ + struct udev_iface_driver *driverState; + + if (conn->interfacePrivateData != NULL) { + driverState = conn->interfacePrivateData; + + udev_unref(driverState->udev); + + VIR_FREE(driverState); + } + + conn->interfacePrivateData = NULL; + return 0; +} + +static int +udevIfaceNumOfInterfaces(virConnectPtr conn) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_enumerate *enumerate = NULL; + struct udev_list_entry *devices; + struct udev_list_entry *dev_entry; + int count = 0; + + enumerate = udevIfaceGetDevices(udev, UDEV_IFACE_ACTIVE); + + if (!enumerate) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to get number of active interfaces on host")); + return -1; + } + + /* Do the scan to load up the enumeration */ + udev_enumerate_scan_devices(enumerate); + + /* Get a list we can walk */ + devices = udev_enumerate_get_list_entry(enumerate); + + /* For each item so we can count */ + udev_list_entry_foreach(dev_entry, devices) { + count++; + } + + udev_enumerate_unref(enumerate); + + udev_unref(udev); + + return count; +} + +static int +udevIfaceListInterfaces(virConnectPtr conn, char **const names, int names_len) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_enumerate *enumerate = NULL; + struct udev_list_entry *devices; + struct udev_list_entry *dev_entry; + int count = 0; + + enumerate = udevIfaceGetDevices(udev, UDEV_IFACE_ACTIVE); + + if (!enumerate) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to get list of active interfaces on host")); + return -1; + } + + /* Do the scan to load up the enumeration */ + udev_enumerate_scan_devices(enumerate); + + /* Get a list we can walk */ + devices = udev_enumerate_get_list_entry(enumerate); + + /* For each item so we can count */ + udev_list_entry_foreach(dev_entry, devices) { + struct udev_device *dev; + const char *path; + + /* Ensure we won't exceed the size of our array */ + if (count > names_len) + break; + + path = udev_list_entry_get_name(dev_entry); + dev = udev_device_new_from_syspath(udev, path); + names[count] = strdup(udev_device_get_sysname(dev)); + udev_device_unref(dev); + + /* If strdup() failed, we are out of memory */ + if (!names[count]) { + virReportOOMError(); + goto err; + } + + count++; + } + + udev_enumerate_unref(enumerate); + udev_unref(udev); + + return count; + +err: + udev_enumerate_unref(enumerate); + udev_unref(udev); + + for (names_len = 0; names_len < count; names_len++) + VIR_FREE(names[names_len]); + + return -1; +} + +static int +udevIfaceNumOfDefinedInterfaces(virConnectPtr conn) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_enumerate *enumerate = NULL; + struct udev_list_entry *devices; + struct udev_list_entry *dev_entry; + int count = 0; + + enumerate = udevIfaceGetDevices(udev, UDEV_IFACE_INACTIVE); + + if (!enumerate) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to get number of defined interfaces on host")); + return -1; + } + + /* Do the scan to load up the enumeration */ + udev_enumerate_scan_devices(enumerate); + + /* Get a list we can walk */ + devices = udev_enumerate_get_list_entry(enumerate); + + /* For each item so we can count */ + udev_list_entry_foreach(dev_entry, devices) { + count++; + } + + udev_enumerate_unref(enumerate); + + udev_unref(udev); + + return count; +} + +static int +udevIfaceListDefinedInterfaces(virConnectPtr conn, + char **const names, + int names_len) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_enumerate *enumerate = NULL; + struct udev_list_entry *devices; + struct udev_list_entry *dev_entry; + int count = 0; + + enumerate = udevIfaceGetDevices(udev, UDEV_IFACE_INACTIVE); + + if (!enumerate) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to get list of defined interfaces on host")); + return -1; + } + + /* Do the scan to load up the enumeration */ + udev_enumerate_scan_devices(enumerate); + + /* Get a list we can walk */ + devices = udev_enumerate_get_list_entry(enumerate); + + /* For each item so we can count */ + udev_list_entry_foreach(dev_entry, devices) { + struct udev_device *dev; + const char *path; + + /* Ensure we won't exceed the size of our array */ + if (count > names_len) + break; + + path = udev_list_entry_get_name(dev_entry); + dev = udev_device_new_from_syspath(udev, path); + names[count] = strdup(udev_device_get_sysname(dev)); + udev_device_unref(dev); + + /* If strdup() failed, we are out of memory */ + if (!names[count]) { + virReportOOMError(); + goto err; + } + + count++; + } + + udev_enumerate_unref(enumerate); + udev_unref(udev); + + return count; + +err: + udev_enumerate_unref(enumerate); + udev_unref(udev); + + for (names_len = 0; names_len < count; names_len++) + VIR_FREE(names[names_len]); + + return -1; +} + +static virInterfacePtr +udevIfaceLookupByName(virConnectPtr conn, const char *name) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_device *dev; + const char *macaddr; + virInterfacePtr ret; + + /* get a device reference based on the device name */ + dev = udev_device_new_from_subsystem_sysname(udev, "net", name); + if (!dev) { + virReportError(VIR_ERR_NO_INTERFACE, + _("couldn't find interface named '%s'"), + name); + return NULL; + } + + macaddr = udev_device_get_sysattr_value(dev, "address"); + ret = virGetInterface(conn, name, macaddr); + udev_device_unref(dev); + + udev_unref(udev); + + return ret; +} + +static virInterfacePtr +udevIfaceLookupByMACString(virConnectPtr conn, const char *macstr) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_enumerate *enumerate = NULL; + struct udev_list_entry *dev_entry; + struct udev_device *dev; + const char *name; + virInterfacePtr ret; + + enumerate = udevIfaceGetDevices(udev, UDEV_IFACE_ALL); + + if (!enumerate) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to lookup interface with MAC address '%s'"), + macstr); + return NULL; + } + + /* Match on MAC */ + udev_enumerate_add_match_sysattr(enumerate, "address", macstr); + + /* Do the scan to load up the enumeration */ + udev_enumerate_scan_devices(enumerate); + + /* Get a list we can walk */ + dev_entry = udev_enumerate_get_list_entry(enumerate); + + /* Check that we got something back */ + if (!dev_entry) { + virReportError(VIR_ERR_NO_INTERFACE, + _("couldn't find interface with MAC address '%s'"), + macstr); + return NULL; + } + + /* Check that we didn't get multiple items back */ + if (udev_list_entry_get_next(dev_entry)) { + virReportError(VIR_ERR_MULTIPLE_INTERFACES, + _("the MAC address '%s' matches multiple interfaces"), + macstr); + return NULL; + } + + dev = udev_device_new_from_syspath(udev, udev_list_entry_get_name(dev_entry)); + name = udev_device_get_sysname(dev); + ret = virGetInterface(conn, name, macstr); + udev_device_unref(dev); + + udev_enumerate_unref(enumerate); + + udev_unref(udev); + + return ret; +} + +static virInterfaceDriver udevIfaceDriver = { + "Interface", + .open = udevIfaceOpenInterface, /* 0.10.3 */ + .close = udevIfaceCloseInterface, /* 0.10.3 */ + .numOfInterfaces = udevIfaceNumOfInterfaces, /* 0.10.3 */ + .listInterfaces = udevIfaceListInterfaces, /* 0.10.3 */ + .numOfDefinedInterfaces = udevIfaceNumOfDefinedInterfaces, /* 0.10.3 */ + .listDefinedInterfaces = udevIfaceListDefinedInterfaces, /* 0.10.3 */ + .interfaceLookupByName = udevIfaceLookupByName, /* 0.10.3 */ + .interfaceLookupByMACString = udevIfaceLookupByMACString, /* 0.10.3 */ +}; + +int +interfaceRegister(void) { + if (virRegisterInterfaceDriver(&udevIfaceDriver) < 0) + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to register udev interface driver")); + return 0; +} diff --git a/tools/virsh.c b/tools/virsh.c index b32ee8b..f0ec625 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2708,6 +2708,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); +# elif defined(HAVE_UDEV) + vshPrint(ctl, " udev"); # endif #endif #ifdef WITH_NWFILTER -- 1.7.8.6

1 0

[libvirt] [PATCH] qemu: Avoid holding the driver lock in trivial snapshot API's
by Peter Krempa 25 Sep '12

25 Sep '12

In most of the snapshot API's there's no need to hold the driver lock the whole time. This patch adds helper functions that get the domain object in functions that don't require the driver lock and simplifies call paths from snapshot-related API's. --- src/conf/domain_conf.c | 3 +- src/qemu/qemu_driver.c | 306 +++++++++++++++---------------------------------- 2 files changed, 94 insertions(+), 215 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4aa08d0..2e1c86b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14372,7 +14372,8 @@ void virDomainObjLock(virDomainObjPtr obj) void virDomainObjUnlock(virDomainObjPtr obj) { - virMutexUnlock(&obj->lock); + if (obj) + virMutexUnlock(&obj->lock); } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6848924..e237cb5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -187,6 +187,60 @@ struct qemuAutostartData { virConnectPtr conn; }; + +/* Looks up the domain obj and unlocks the driver */ +static virDomainObjPtr +qemuDomObjFromDomain(virDomainPtr domain) +{ + struct qemud_driver *driver = domain->conn->privateData; + virDomainObjPtr vm; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, domain->uuid); + qemuDriverUnlock(driver); + if (!vm) { + virUUIDFormat(domain->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + } + + return vm; +} + + +/* Looks up domain obj from snapshot and unlocks the driver */ +static virDomainObjPtr +qemuDomObjFromSnapshot(virDomainSnapshotPtr snapshot) +{ + return qemuDomObjFromDomain(snapshot->domain); +} + + +/* Looks up snapshot obj from VM and name */ +static virDomainSnapshotObjPtr +qemuSnapObjFromName(virDomainObjPtr vm, + const char *name) +{ + virDomainSnapshotObjPtr snap = NULL; + snap = virDomainSnapshotFindByName(vm->snapshots, name); + if (!snap) + virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, + _("no domain snapshot with matching name '%s'"), + name); + + return snap; +} + + +/* Looks up snapshot obj from VM and snapshotPtr */ +static virDomainSnapshotObjPtr +qemuSnapObjFromSnapshot(virDomainObjPtr vm, + virDomainSnapshotPtr snapshot) +{ + return qemuSnapObjFromName(vm, snapshot->name); +} + static void qemuAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) @@ -11305,59 +11359,39 @@ static int qemuDomainSnapshotListNames(virDomainPtr domain, char **names, int nameslen, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm = NULL; int n = -1; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } n = virDomainSnapshotObjListGetNames(vm->snapshots, NULL, names, nameslen, flags); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return n; } static int qemuDomainSnapshotNum(virDomainPtr domain, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm = NULL; int n = -1; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } n = virDomainSnapshotObjListNum(vm->snapshots, NULL, flags); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return n; } @@ -11365,29 +11399,19 @@ static int qemuDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm = NULL; int n = -1; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } n = virDomainListSnapshots(vm->snapshots, NULL, domain, snaps, flags); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return n; } @@ -11397,7 +11421,6 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, int nameslen, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; @@ -11405,31 +11428,17 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(snapshot->domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } n = virDomainSnapshotObjListGetNames(vm->snapshots, snap, names, nameslen, flags); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return n; } @@ -11437,7 +11446,6 @@ static int qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; @@ -11445,30 +11453,16 @@ qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(snapshot->domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } n = virDomainSnapshotObjListNum(vm->snapshots, snap, flags); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return n; } @@ -11477,7 +11471,6 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, virDomainSnapshotPtr **snaps, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; @@ -11485,31 +11478,17 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(snapshot->domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } n = virDomainListSnapshots(vm->snapshots, snap, snapshot->domain, snaps, flags); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return n; } @@ -11517,64 +11496,40 @@ static virDomainSnapshotPtr qemuDomainSnapshotLookupByName(virDomainPtr domain, const char *name, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm; virDomainSnapshotObjPtr snap = NULL; virDomainSnapshotPtr snapshot = NULL; virCheckFlags(0, NULL); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no snapshot with matching name '%s'"), name); + if (!(snap = qemuSnapObjFromName(vm, name))) goto cleanup; - } snapshot = virGetDomainSnapshot(domain, snap->def->name); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return snapshot; } static int qemuDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm; int ret = -1; virCheckFlags(0, -1); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } ret = (vm->current_snapshot != NULL); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return ret; } @@ -11582,30 +11537,17 @@ static virDomainSnapshotPtr qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm; virDomainSnapshotObjPtr snap = NULL; virDomainSnapshotPtr parent = NULL; virCheckFlags(0, NULL); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(snapshot->domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } if (!snap->def->parent) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, @@ -11617,30 +11559,20 @@ qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, parent = virGetDomainSnapshot(snapshot->domain, snap->def->parent); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return parent; } static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, unsigned int flags) { - struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm; virDomainSnapshotPtr snapshot = NULL; virCheckFlags(0, NULL); - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } if (!vm->current_snapshot) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, "%s", @@ -11651,16 +11583,13 @@ static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, snapshot = virGetDomainSnapshot(domain, vm->current_snapshot->def->name); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return snapshot; } static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; char *xml = NULL; virDomainSnapshotObjPtr snap = NULL; @@ -11668,29 +11597,18 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, virCheckFlags(VIR_DOMAIN_XML_SECURE, NULL); - qemuDriverLock(driver); - virUUIDFormat(snapshot->domain->uuid, uuidstr); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } + + virUUIDFormat(snapshot->domain->uuid, uuidstr); xml = virDomainSnapshotDefFormat(uuidstr, snap->def, flags, 0); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return xml; } @@ -11698,38 +11616,23 @@ static int qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; int ret = -1; virDomainSnapshotObjPtr snap = NULL; - char uuidstr[VIR_UUID_STRING_BUFLEN]; virCheckFlags(0, -1); - qemuDriverLock(driver); - virUUIDFormat(snapshot->domain->uuid, uuidstr); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } ret = (vm->current_snapshot && STREQ(snapshot->name, vm->current_snapshot->def->name)); cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return ret; } @@ -11738,30 +11641,17 @@ static int qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, unsigned int flags) { - struct qemud_driver *driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; int ret = -1; virDomainSnapshotObjPtr snap = NULL; - char uuidstr[VIR_UUID_STRING_BUFLEN]; virCheckFlags(0, -1); - qemuDriverLock(driver); - virUUIDFormat(snapshot->domain->uuid, uuidstr); - vm = virDomainFindByUUID(&driver->domains, snapshot->domain->uuid); - if (!vm) { - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - } - snap = virDomainSnapshotFindByName(vm->snapshots, snapshot->name); - if (!snap) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - snapshot->name); + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) goto cleanup; - } /* XXX Someday, we should recognize internal snapshots in qcow2 * images that are not tied to a libvirt snapshot; if we ever do @@ -11769,9 +11659,7 @@ qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, ret = 1; cleanup: - if (vm) - virDomainObjUnlock(vm); - qemuDriverUnlock(driver); + virDomainObjUnlock(vm); return ret; } @@ -12439,9 +12327,7 @@ qemuDomainOpenConsole(virDomainPtr dom, virStreamPtr st, unsigned int flags) { - struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm = NULL; - char uuidstr[VIR_UUID_STRING_BUFLEN]; int ret = -1; int i; virDomainChrDefPtr chr = NULL; @@ -12450,15 +12336,8 @@ qemuDomainOpenConsole(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_CONSOLE_SAFE | VIR_DOMAIN_CONSOLE_FORCE, -1); - qemuDriverLock(driver); - virUUIDFormat(dom->uuid, uuidstr); - vm = virDomainFindByUUID(&driver->domains, dom->uuid); - qemuDriverUnlock(driver); - if (!vm) { - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; - } if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -12516,8 +12395,7 @@ qemuDomainOpenConsole(virDomainPtr dom, } cleanup: - if (vm) - virDomainObjUnlock(vm); + virDomainObjUnlock(vm); return ret; } -- 1.7.12

3 3

[libvirt] Release of libvirt-0.10.2
by Daniel Veillard 25 Sep '12

25 Sep '12

Since there was no negative feedback since rc2, I have rolled the release a bit earlier this morning, it is tagged in git and available as usual at: ftp://libvirt.org/libvirt/ Quite a bit of new APIs and some other features, this also includes a fairly large amount of bug fixes and improvements (250+ commits in 4 weeks so quite an active month !): Features: - network: define new API virNetworkUpdate (Laine Stump) - add support for QEmu sandbox support (Ján Tomko) - blockjob: add virDomainBlockCommit (Eric Blake) - node_memory: Define the APIs to get/set memory parameters (Osier Yang) - list: Define new API virConnectListAllSecrets (Osier Yang) - list: Define new API virConnectListAllNWFilters (Osier Yang) - list: Define new API virConnectListAllNodeDevices (Osier Yang) - parallels: add support of containers to the driver (Dmitry Guryanov) - list: Define new API virConnectListAllInterfaces (Osier Yang) - list: Define new API virConnectListAllNetworks (Osier Yang) - list: Define new API virStoragePoolListAllVolumes (Osier Yang) - Add PMSUSPENDED life cycle event (Jiri Denemark) - list: Define new API virStorageListAllStoragePools (Osier Yang) - Add per-guest S3/S4 state configuration (Martin Kletzander) - qemu: Support for Block Device IO Limits (Viktor Mihajlovski) Documentation: - locking: Remove README file in favor of internals/locking.html (Jiri Denemark) - fix typo in filesystem docs (Eric Blake) - include article about libvirt+audit in relatedlinks.html (Marcelo Cerri) - virsh: Clarify behavior of domain list filtering. (Peter Krempa) - update usb redirection filter infomation on formatdomain.html (Guannan Ren) - mention another iaas app built on libvirt (Eric Blake) - page.xsl: fix FAQ link in subdirectories (Ján Tomko) - hacking.html.in: fix table of contents (Ján Tomko) - point out git send-email location, be more stern about make check (Laine Stump) - examples: Fix event detail printing in python test (Jiri Denemark) - virsh: Improve the document for pool-list (Osier Yang) - conf: describe security_driver behavior (Martin Kletzander) - correct dompmwakeup description (Martin Kletzander) Portability: - build: fix nodeinfo build on non-Linux platforms (Eric Blake) - virBitmap: fix build without HAVE_NUMACTL (Ján Tomko) - build: Fix build failure on non-linux platform (Osier Yang) - build: fix missing include (Dwight Engen) - Look in Debian's multiarch libs too (Guido Günther) - build: don't fail if libnl-3 is not found (Eric Blake) - build: Fix typo which causes build failure (Osier Yang) - build: force libnl1 if netcf also used libnl1 (Eric Blake) - build: fix build on older gcc (Eric Blake) - Fix location of SELinux mount during RPM builds (Daniel P. Berrange) - nwfilter: drop use of awk (Eric Blake) - build: improved handling of <execinfo.h>, BSD <net/if.h> (Eric Blake) - Define DYNLIB_NAME on OpenBSD. (Jasper Lievisse Adriaanse) - build: avoid test failure when sasl was not compiled in (Eric Blake) - build: avoid check-symfile on non-Linux (Eric Blake) - build: require netcf-0.2.2 when installing on Fedora18+ (Laine Stump) - build: don't fail when xsltproc is missing (Eric Blake) - build: avoid warnings from gcc 4.2.1 (Eric Blake) - Remove explicit dependency on ceph RPM (Daniel P. Berrange) - Pass a correct pointer type to localtime_r(3). (Paul Eggert) - build: use correct libraries for clock_gettime (Eric Blake) - Include an extra header needed for OpenBSD. (Jasper Lievisse Adriaanse) - Fix mingw64 build by using intptr_t for int->void* casts (Daniel P. Berrange) Bug Fixes: - network: don't "refresh" iptables rules on rule-less networks (Laine Stump) - qemu: Fix failure path in disk hotplug (Jiri Denemark) - Ensure existing selinux mount is removed before mounting new one in LXC (Daniel P. Berrange) - Fix crash accessing a NULL URI when looking up auth credentials (Daniel P. Berrange) - Ensure autogen.sh exists if bootstrap fails (Daniel P. Berrange) - security: Don't ignore errors when parsing DAC security labels (Peter Krempa) - qemu: Transition domain to PAUSED after 'stop' command (Michal Privoznik) - network: fix element size / length in memmove (Laine Stump) - network: fix incorrect VIR_NETWORK_UPDATE_COMMAND_* values (Laine Stump) - virsh: Fix resource leaks when editing files. (Peter Krempa) - util: don't print free'd dmidecode path (Eric Blake) - rpc: Fix name of member in remote_protocol-structs (Peter Krempa) - qemu: Avoid deadlock on HandleAgentEOF (Michal Privoznik) - conf: avoid freeing network object with undestroyed mutex (Laine Stump) - Add missing 'goto error' in QEMU command line building (Daniel P. Berrange) - Fix initialization of virCommandPtr when creating QEMU argv (Daniel P. Berrange) - Fix 3 broken test cases which were mistakenly raising errors (Daniel P. Berrange) - qemu: fix uninitialized variable in qemuParseCommandLine (Ján Tomko) - security: Fix libvirtd crash possibility (Martin Kletzander) - snapshot: fix rollback failure in transaction mode (Guannan Ren) - conf: avoid libvirt crash with empty address guestfwd channel (Alex Jia) - Wait to receive QMP greeting before sending any monitor commands (Daniel P. Berrange) - parallels: fix parallelsDomainDefineXML for domains with VNC and autoport (Dmitry Guryanov) - parallels: fix parallelsDoCmdRun in case of command failure (Dmitry Guryanov) - Backcompt for console devices in virDomainDeviceInfoIterate (Li Zhang) - fix bug in qemuSetupCgroupForEmulator (Hu Tao) - python: Initialize new_params in virDomainSetSchedulerParameters (Federico Simoncelli) - Don't invoke the auth callback if all credentials were in config file (Daniel P. Berrange) - Call virResetLastError in all virConnectOpen* functions (Daniel P. Berrange) - Check against python None type when filling in auth parameters (Daniel P. Berrange) - Fix crash passing an empty list to python openAuth() API (Daniel P. Berrange) - Fix unwanted closing of libvirt client connection (Christophe Fergeau) - Fix RPM spec conditional when %{rhel} is not defined (Daniel P. Berrange) - events: Fix domain event race on client disconnect (Christophe Fergeau) - Don't assume use of /sys/fs/cgroup (Daniel P. Berrange) - remove dnsmasq command line parameter "--filterwin2k" (Gene Czarcinski) - network: prevent infinite hang if ovs-vswitchd isn't running (Laine Stump) - qemu: don't pin all the cpus (Martin Kletzander) - build: use re-entrant functions in virsh (Eric Blake) - qemu: Do not require auth scheme in graphics events (Jiri Denemark) - qemu: Fix reboot with guest agent (Jiri Denemark) - qemu: Don't update graphic definitions on password change failure (Peter Krempa) - python: don't mask libvirt errors (Eric Blake) - command: shell-quote when logging commands (Eric Blake) - qemu: fix remote port searching (Martin Kletzander) - schemas: Fix wwn pattern (Osier Yang) Improvements: - Don't install legacy initscripts at same time as systemd ones (Daniel P. Berrange) - network: log error for unknown virNetworkUpdate command codes (Laine Stump) - network: make virNetworkObjUpdate error detection/recovery better (Laine Stump) - Drop unused return value of virLogOutputFunc (Miloslav Trmač) - Add <seclabel> to character devices. (Richard W.M. Jones) - Make virSecurityDeviceLabelDefParseXML into generic device <seclabel> parser. (Richard W.M. Jones) - Improve some debugging log messages in LXC mount setup (Daniel P. Berrange) - network: backend for virNetworkUpdate of portgroups (Laine Stump) - network: backend for virNetworkUpdate of dhcp range (Laine Stump) - virsh: new net-update command (Laine Stump) - tests: Add tests for dump-core option (Martin Kletzander) - qemu: add support for dump-guest-core option (Martin Kletzander) - Add support for limiting guest coredump (Martin Kletzander) - QEMU Tests for reboot-timeout (Martin Kletzander) - qemu: Add support for reboot-timeout (Martin Kletzander) - Add support for reboot-timeout (Martin Kletzander) - simplify xenXMDomainPinVcpu function (liguang) - Cleanup of domain_conf sentinels (Martin Kletzander) - qemu: Cleanup boot parameter building (Martin Kletzander) - virsh: Move daemon to misc since its not a network (Doug Goldstein) - build: define WITH_INTERFACE for the driver (Doug Goldstein) - virsh: Rename QEmu to QEMU to match upstream (Doug Goldstein) - bitmap: fix problems in previous commit (Eric Blake) - build: avoid non-portable byte-swapping (Eric Blake) - Fix minor details not only in apic eoi (Martin Kletzander) - secret: Fix error for private secrets (Martin Kletzander) - virNetDevBandwidthClear: Improve error handling (Martin Kletzander) - syntax-check: fix run.in (Martin Kletzander) - Add a ./run script for running programs from the local directory. (Richard W.M. Jones) - daemon: Fix error message when libvirtd is missing. (Richard W.M. Jones) - gitignore: Ignore .gdb_history file. (Richard W.M. Jones) - Fix the augea test for qemu libvirtd options (Daniel Veillard) - network: implement backend of virNetworkUpdate(IP_DHCP_HOST) (Laine Stump) - network: restart radvd/dnsmasq if needed when libvirtd is restarted (Laine Stump) - network: implement virNetworkUpdate for test_driver (Laine Stump) - network: implement virNetworkUpdate for bridge_driver (Laine Stump) - network: reorganize dnsmasq and radvd config file / startup (Laine Stump) - conf: implement NetworkObj backend of virNetworkUpdate API (Laine Stump) - network: utility functions for updating network config (Laine Stump) - network: implement RPC calls for virNetworkUpdate (Laine Stump) - tests: add qemu-1.2.0 help data (Ján Tomko) - qemu: add -sandbox to command line if requested (Ján Tomko) - qemu: conf: add seccomp_sandbox option (Ján Tomko) - qemu: add capability flag for seccomp sandbox (Ján Tomko) - qemu: Use disk wwn in qemu command line (Osier Yang) - qemu: Add caps to indentify if setting wwn is supported by qemu (Osier Yang) - conf: Parse and format disk <wwn> (Osier Yang) - schema: Add schema for disk <wwn> (Osier Yang) - blockjob: add blockcommit support to rpc (Eric Blake) - blockjob: add virsh blockcommit (Eric Blake) - conf: separate functions to parse DHCPHostDef and DHCPRangeDef (Laine Stump) - remove virDomainCpuSetFormat and virDomainCpuSetParse (Hu Tao) - xen: eliminate remaining uses of virDomainCpuSetParse (Laine Stump) - use virBitmap to store nodeinfo. (Hu Tao) - use virBitmap to store cells' cpumask info. (Hu Tao) - use virBitmap to store cpumask info. (Hu Tao) - use virBitmap to store numa nodemask info. (Hu Tao) - use virBitmap to store cpu affinity info (Hu Tao) - use virBitmap to store cpupin info (Hu Tao) - New functions for virBitmap (Hu Tao) - bitmap: new member variable and function renaming (Hu Tao) - Build: Fix typos which cause build failure (Osier Yang) - node_memory: Expose the APIs to Python bindings (Osier Yang) - node_memory: Expose the APIs to virsh (Osier Yang) - node_memory: Support get/set memory parameters for drivers (Osier Yang) - node_memory: Implement the internal APIs (Osier Yang) - node_memory: Wire up the RPC protocol (Osier Yang) - list: Use virConnectListAllSecrets in virsh (Osier Yang) - list: Expose virConnectListAllSecrets to Python binding (Osier Yang) - list: Implement listAllSecrets (Osier Yang) - list: Implement RPC calls for virConnectListAllSecrets (Osier Yang) - list: Use virConnectListAllNWFilters in virsh (Osier Yang) - list: Expose virConnectListAllNWFilters to Python binding (Osier Yang) - list: Implement listAllNWFilters (Osier Yang) - list: Implement RPC calls for virConnectListAllNWFilters (Osier Yang) - list: Use virConnectListAllNodeDevices in virsh (Osier Yang) - virsh: Don't motify the const string (Osier Yang) - list: Expose virConnectListAllNodeDevices to Python binding (Osier Yang) - list: Implement listAllNodeDevices (Osier Yang) - list: Add helpers for listing node devices (Osier Yang) - list: Implement RPC calls for virConnectListAllNodeDevices (Osier Yang) - Introduce a API for creating QEMU capabilities for a binary (Daniel P. Berrange) - Remove upfront check for hmp - just try it cope with failure (Daniel P. Berrange) - Don't overwrite errors raised by qemuMonitorHMPCommand (Daniel P. Berrange) - qemu: Add support for EOI with APIC (Martin Kletzander) - Add support for EOI with APIC (Martin Kletzander) - Improve virTypedParameterValidateSet (Osier Yang) - parallels: implement containers creation (Dmitry Guryanov) - parallels: fix parallelsDomainDefineXML for existing containers (Dmitry Guryanov) - parallels: handle unlimited cpus on containers (Dmitry Guryanov) - Fix data types used for list sizes in QEMU capabilities (Daniel P. Berrange) - Add API for copying instances of the qemuCapsPtr object (Daniel P. Berrange) - Add ability to store other metadata in the qemu capabilities object (Daniel P. Berrange) - Make qemuCapsProbeCommand static (Daniel P. Berrange) - Turn QEMU capabilities object into a full virObjectPtr (Daniel P. Berrange) - Allow caps to be NULL when creating virDomainObjPtr instances (Daniel P. Berrange) - Add a virBitmapCopy API (Daniel P. Berrange) - test: add xml2argvtest for usb-redir filter and update xml schema (Guannan Ren) - qemu: build USB redirection filter qemu command line (Guannan Ren) - qemu: define and parse USB redirection filter XML (Guannan Ren) - virsh: Fix version numbers in comments (Osier Yang) - qemu: add usb-redir.filter qemu capability flag (Guannan Ren) - maint: fix missing spaces in message (Eric Blake) - build: avoid confusing make with raw name 'undefine' (Eric Blake) - Add API for opening a QEMU monitor from a socket FD (Daniel P. Berrange) - list: Expose virConnectListAllInterfaces to Python binding (Osier Yang) - list: Use virConnectListAllInterfaces in virsh (Osier Yang) - list: Implement listAllInterfaces (Osier Yang) - list: Implemente RPC calls for virConnectListAllInterfaces (Osier Yang) - build: avoid dirty docs on fresh bootstrap (Eric Blake) - Print any exception that occurs in authentication callback (Daniel P. Berrange) - virsh: Fix the typos (Osier Yang) - list: Expose virConnectListAllNetworks to Python binding (Osier Yang) - list: Use virConnectListAllNetworks in virsh (Osier Yang) - list: Implement listAllNetworks for test driver (Osier Yang) - list: Implement listAllNetworks for network driver (Osier Yang) - list: Add helpers to list network objects (Osier Yang) - list: Implement RPC calls for virConnectListAllNetworks (Osier Yang) - list: Expose virStoragePoolListAllVolumes to Python binding (Osier Yang) - list: Use virStoragePoolListAllVolumes in virsh (Osier Yang) - list: Implement virStoragePoolListAllVolumes for test driver (Osier Yang) - list: Implement virStoragePoolListAllVolumes for storage driver (Osier Yang) - list: Implement RPC calls for virStoragePoolListAllVolumes (Osier Yang) - Introduce a test suite for the JSON monitor (Daniel P. Berrange) - Add helper library for testing the qemu monitor code (Daniel P. Berrange) - Add non-null annotations to qemuMonitorOpen (Daniel P. Berrange) - Fix PMSuspend and PMWakeup events (Jiri Denemark) - virsh: Update only changed scheduler tunables (Peter Krempa) - util: Add helper to assign typed params from string (Peter Krempa) - qemu: Add range checking for scheduler tunables when changed by API (Peter Krempa) - qemu: clean up qemuSetSchedulerParametersFlags() (Peter Krempa) - list: fix typo in virsh patch (Eric Blake) - Remove duplicate symbols and add test case (Daniel P. Berrange) - python: Expose virStorageListAllStoragePools to python binding (Osier Yang) - list: Use virConnectListAllStoragePools in virsh (Osier Yang) - list: Change MATCH for common use in virsh (Osier Yang) - virsh: Fix the wrong doc for pool-list (Osier Yang) - list: Add helper to convert strings separated by ', ' to array (Osier Yang) - list: Implement listAllStoragePools for test driver (Osier Yang) - list: Implement listAllStoragePools for storage driver (Osier Yang) - list: Implement the RPC calls for virConnectListAllStoragePools (Osier Yang) - list: Add helpers for listing storage pool objects (Osier Yang) - esx: Add implementation for virConnectListAllDomains() (Peter Krempa) - hyperv: Add implementation for virConnectListAllDomains() (Peter Krempa) - maint: avoid doubled name in syntax check failures (Eric Blake) - Rename iolimit to blockio. (Viktor Mihajlovski) - tests: Add tests for qemu S3/S4 state configuration (Martin Kletzander) - qemu: Add support for S3/S4 state configuration (Martin Kletzander) - conf: Support for Block Device IO Limits (Viktor Mihajlovski) - virsh: Improve checking for connection when running commands (Peter Krempa) - util: Update the inconsistent and outdated comments (Osier Yang) Cleanups: - Remove redundant lines in src/qemu/qemu_driver.c (Tang Chen) - Remove a redundant line in src/qemu/qemu_driver.c (Tang Chen) - maint: fix up copyright notice inconsistencies (Eric Blake) - build: avoid unused symbol (Eric Blake) - Adhere to copyright_address check (Guido Günther) - qemuhelptest: convert runaway tab to spaces (Ján Tomko) - qemu: drop unused arguments for dump-guest-memory (Eric Blake) - Build: Fix typos which cause build failure (Osier Yang) - esx: Remove unused variable from esxDomainGetAutostart (Matthias Bolte) - build: avoid tabs that failed syntax-check (Eric Blake) - virsh: remove unneeded usage of vshConnectionUsability() (Peter Krempa) Thanks everybody for the help on this release, with bug reports, ideas and patches ! I would expect the next release to happen at the end of October, i.e. keep the monthly release schedule, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

4 4

[libvirt] libvirt qemu-kvm installation into custom directories
by Onkar N Mahajan 25 Sep '12

25 Sep '12

I am configuring upstream libvirt, qemu-kvm for development purpose in non-default directories. I want my upstream libvirt installation to use upstream qemu-kvm (and not the qemu-kvm supplied by the distro). How can I make libvirt to use this qemu-kvm for guest installations ? The Host contains other libvirt/qemu-kvm supplied by-default by the distro which I am not running but which I *do not* want to disturb. Please give me some pointers as to to do this. -- Onkar

3 2

[libvirt] Fw: Enabling Freescale PowerPC Architecture support for Libvirt
by VeeraReddy 24 Sep '12

24 Sep '12

Hi , We want to enable Freescale PowerPC Architecture support for Libvirt. So that Libvirt can be run on Freescale Platforms. Please let us know how do we proceed on this. Do we need to implement our architecture driver for this and send it to you so that further releases of Libvirt will have Freescale Architecture support or do we need to follow any other approach. Please let us know. Regards, Veera.

2 1

[libvirt] [PATCH] build: fix detection of netcf linked with libnl1
by Christophe Fergeau 24 Sep '12

24 Sep '12

Commit 9298bfbcb introduced code to detect if netcf is linked with libnl1, and to prefer libnl1 over libnl3 when this is the case. This behaviour can be disabled by setting LIBNL_CFLAGS to any value, including the empty string. However, configure.ac sets LIBNL_CFLAGS to "" before attempting libnl detection, so the libnl1 detection code is always disabled. This caused issues on my f17 system where netcf is linked with libnl1 but libvirt got built with libnl3. This commit removes the setting of the LIBNL_* variables to "" as this does not appear to be needed. After this change, libnl1 is used when building libvirt on my f17 system. --- configure.ac | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3e90672..2cedc3f 100644 --- a/configure.ac +++ b/configure.ac @@ -2925,10 +2925,6 @@ AM_CONDITIONAL([WITH_VIRTUALPORT], [test "$with_virtualport" = "yes"]) dnl netlink library -LIBNL_ROUTE3_CFLAGS="" -LIBNL_ROUTE3_LIBS="" -LIBNL_CFLAGS="" -LIBNL_LIBS="" have_libnl=no if test "$with_linux" = "yes"; then -- 1.7.11.4

2 2

[libvirt] [libvirt-php] add API function 'libvirt_domain_reset' to support 'virsh reset' command since libvirt 0.9.7
by icez network 24 Sep '12

24 Sep '12

I'm implementing a php interface to libvirt which uses libvirt-php as an api but i found that there's missing command in the libvirt-php module that use to hard reset the vm (from command 'virsh reset') so I have to add it using the same process as the 'libvirt_domain_reboot' function. Here is the patch for it: diff -ur libvirt-php-0.4.6.orig/src/libvirt-php.c libvirt-php-0.4.6/src/libvirt-php.c --- libvirt-php-0.4.6.orig/src/libvirt-php.c 2012-08-20 11:22:39.000000000 +0700 +++ libvirt-php-0.4.6/src/libvirt-php.c 2012-09-24 13:50:34.751140249 +0700 @@ -102,6 +102,7 @@ PHP_FE(libvirt_domain_managedsave, NULL) PHP_FE(libvirt_domain_undefine, NULL) PHP_FE(libvirt_domain_reboot, NULL) + PHP_FE(libvirt_domain_reset, NULL) PHP_FE(libvirt_domain_define_xml, NULL) PHP_FE(libvirt_domain_create_xml, NULL) PHP_FE(libvirt_domain_memory_peek,NULL) @@ -4910,6 +4911,28 @@ } /* + Function name: libvirt_domain_reset + Since version: 0.4.6-iz + Description: Function is used to reset the domain identified by it's resource + Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + Returns: TRUE for success, FALSE on error +*/ +PHP_FUNCTION(libvirt_domain_reset) +{ + php_libvirt_domain *domain=NULL; + zval *zdomain; + int retval; + long flags=0; + + GET_DOMAIN_FROM_ARGS("r|l",&zdomain,&flags); + + retval=virDomainReset(domain->domain,flags); + DPRINTF("%s: virDomainReset(%p) returned %d\n", PHPFUNC, domain->domain, retval); + if (retval != 0) RETURN_FALSE; + RETURN_TRUE; +} + +/* Function name: libvirt_domain_define_xml Since version: 0.4.1(-1) Description: Function is used to define the domain from XML string diff -ur libvirt-php-0.4.6.orig/src/libvirt-php.h libvirt-php-0.4.6/src/libvirt-php.h --- libvirt-php-0.4.6.orig/src/libvirt-php.h 2012-08-07 22:11:25.000000000 +0700 +++ libvirt-php-0.4.6/src/libvirt-php.h 2012-09-24 13:49:05.428130682 +0700 @@ -314,6 +314,7 @@ PHP_FUNCTION(libvirt_domain_managedsave); PHP_FUNCTION(libvirt_domain_undefine); PHP_FUNCTION(libvirt_domain_reboot); +PHP_FUNCTION(libvirt_domain_reset); PHP_FUNCTION(libvirt_domain_define_xml); PHP_FUNCTION(libvirt_domain_create_xml); PHP_FUNCTION(libvirt_domain_memory_peek); -- Personal hosting by icez network http://www.thzhost.com

1 0

[libvirt] [PATCH] Don't install legacy initscripts at same time as systemd ones
by Daniel P. Berrange 24 Sep '12

24 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The Fedora policies don't want us installing the legacy initscripts in parallel with the systemd ones, so switch to only install the systemd unit Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1192739..a392663 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1217,9 +1217,7 @@ of recent versions of Linux (and other OSes). %define with_packager_version --with-packager-version="%{release}" %if %{with_systemd} -# We use 'systemd+redhat', so if someone installs upstart or -# legacy init scripts, they can still start libvirtd, etc -%define init_scripts --with-init_script=systemd+redhat +%define init_scripts --with-init_script=systemd %else %define init_scripts --with-init_script=redhat %endif -- 1.7.11.2

3 2

[libvirt] [PATCH v8][re-send] support offline migration
by liguang 24 Sep '12

24 Sep '12

original migration did not aware of offline case so, add code to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE should not combined with VIR_MIGRATE_NON_SHARED_*. so, this migration result is just make domain definition alive at target side. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 15 ++++++++++++ src/qemu/qemu_migration.c | 52 ++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 6 +++++ 5 files changed, 69 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index cfe5047..77df2ab 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -995,6 +995,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b12d9bc..2380ccc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9641,6 +9641,15 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK| + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("migrating storage handled by volume APIs")); + goto endjob; + } + goto offline; + } virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9653,6 +9662,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) @@ -9888,6 +9898,11 @@ qemuDomainMigrateConfirm3(virDomainPtr domain, goto cleanup; } + if (flags & VIR_MIGRATE_OFFLINE) { + ret = 0; + goto cleanup; + } + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)) goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1b21ef6..cb63264 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "offline"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +441,9 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) + virBufferAsprintf(buf, " <offline/>\n"); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +667,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE)) { + if (virXPathBoolean("count(./offline) > 0", ctxt)) + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + return 0; error: @@ -721,6 +731,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1151,6 +1165,13 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1314,6 +1335,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, goto endjob; } + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + ret = 0; + goto cleanup; + } + /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ @@ -1856,7 +1886,8 @@ qemuMigrationRun(struct qemud_driver *driver, virLockManagerPluginGetName(driver->lockManager)); return -1; } - + if (flags & VIR_MIGRATE_OFFLINE) + return 0; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_GRAPHICS))) goto cleanup; @@ -2372,6 +2403,8 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, qemuDomainObjExitRemoteWithDriver(driver, vm); } VIR_FREE(dom_xml); + if (flags & VIR_MIGRATE_OFFLINE) + goto cleanup; if (ret == -1) goto cleanup; @@ -2477,7 +2510,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2554,7 +2587,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2617,7 +2650,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -2941,6 +2974,8 @@ qemuMigrationFinish(struct qemud_driver *driver, */ if (retcode == 0) { if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; @@ -3038,7 +3073,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } } - + offline: dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); event = virDomainEventNewFromObj(vm, @@ -3120,7 +3155,10 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; - + if (flags & VIR_MIGRATE_OFFLINE) { + rv = 0; + goto cleanup; + } /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 1740204..2bcaea0 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4684466..ec25043 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6525,6 +6525,7 @@ static const vshCmdOptDef opts_migrate[] = { {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, {"timeout", VSH_OT_INT, 0, N_("force guest to suspend if live migration exceeds timeout (in seconds)")}, {"xml", VSH_OT_STRING, 0, N_("filename containing updated XML for the target")}, + {"offline", VSH_OT_BOOL, 0, N_("for offline migration")}, {NULL, 0, 0, NULL} }; @@ -6591,6 +6592,11 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + if (!virDomainIsActive(dom)) + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); -- 1.7.2.5

3 3

[libvirt] Submitting a patch
by Shawn Furrow 22 Sep '12

22 Sep '12

Hi all, I feel really bad sending this through the libvirt-list but the email provided at the bottom of the patch page is rejecting my email. I have a patch for Libvirt but I am unsure how to go about doing it. I saw that on the patches page it says to submit the patch using Mercurial's patchbomb extension. However, I have the current libvirt directory using git. Is there not a way for me to just send an email directly to the libvirt mailing list? I have not submitted a patch before so I do not know all of the in's and out's. Any guidance would be appreciated. Again sorry for spamming the development list. Thanks, Shawn -- Virginia Tech Bradley Department of Electrical and Computer Engineering B.S. Electrical Engineering B.S. Computer Engineering

3 2

[libvirt] [PATCH 0/4] virNetworkUpdate bugfixes
by Laine Stump 22 Sep '12

22 Sep '12

The 4 patches here are in decreasing order of importance. The first: [PATCH 1/4] network: don't refresh iptables rules on networks prevents proper behavior with a valid request when modifying the interface pool list of a macvtap or hostdev network (because it tries to refresh non-existent iptables rules, fails, then aborts the update). The second: [PATCH 2/4] network: make virNetworkObjUpdate error detection/recovery better fixes two problems that would crop up when attempting an invalid update to a network. The third was pointed out by DV in his review of the dhcp-range and portgroup update backends: [PATCH 3/4] network: log error for unknown virNetworkUpdate command would allow a call to the virNetworkUpdate() API with an unknown command number to succeed (it wouldn't do anything, but might provide the illusion that it *had*). The fourth: [PATCH 4/4] network: backend for virNetworkUpdate of interface list is the last of the networkUpdate section backends that I was explicitly/specifically asked to implement.

3 12

[libvirt] [PATCH] Remove redundant lines in src/qemu/qemu_driver.c
by Tang Chen 22 Sep '12

22 Sep '12

maxcpu and hostcpus are defined and calculated in qemudDomainPinVcpuFlags() and qemudDomainPinEmulator(), but never used. So remove them including nodeinfo. Signed-off-by: Tang Chen <tangchen(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 12ac15c..ce0f51d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3712,8 +3712,6 @@ qemudDomainPinVcpuFlags(virDomainPtr dom, virDomainDefPtr persistentDef = NULL; virCgroupPtr cgroup_dom = NULL; virCgroupPtr cgroup_vcpu = NULL; - int maxcpu, hostcpus; - virNodeInfo nodeinfo; int ret = -1; qemuDomainObjPrivatePtr priv; bool doReset = false; @@ -3749,13 +3747,6 @@ qemudDomainPinVcpuFlags(virDomainPtr dom, goto cleanup; } - if (nodeGetInfo(dom->conn, &nodeinfo) < 0) - goto cleanup; - hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); - maxcpu = maplen * 8; - if (maxcpu > hostcpus) - maxcpu = hostcpus; - pcpumap = virBitmapNewData(cpumap, maplen); if (!pcpumap) goto cleanup; @@ -3995,8 +3986,6 @@ qemudDomainPinEmulator(virDomainPtr dom, virCgroupPtr cgroup_emulator = NULL; pid_t pid; virDomainDefPtr persistentDef = NULL; - int maxcpu, hostcpus; - virNodeInfo nodeinfo; int ret = -1; qemuDomainObjPrivatePtr priv; bool doReset = false; @@ -4025,13 +4014,6 @@ qemudDomainPinEmulator(virDomainPtr dom, priv = vm->privateData; - if (nodeGetInfo(dom->conn, &nodeinfo) < 0) - goto cleanup; - hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); - maxcpu = maplen * 8; - if (maxcpu > hostcpus) - maxcpu = hostcpus; - pcpumap = virBitmapNewData(cpumap, maplen); if (!pcpumap) goto cleanup; -- 1.7.10.1

2 1

[libvirt] [PATCH v2] Add a test suite for validating SELinux labelling
by Daniel P. Berrange 22 Sep '12

22 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> There are many aspects of the guest XML which result in the SELinux driver applying file labelling. With the increasing configuration options it is desirable to test this behaviour. It is not possible to assume that the test suite has the ability to set SELinux labels. Most filesystems though will support extended attributes. Thus for the purpose of testing, it is possible to extend the existing LD_PRELOAD hack to override setfilecon() and getfilecon() to simply use the 'user.libvirt.selinux' attribute for the sake of testing. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Changed in v2: - Remove stray debug line - Uncomment VIR_FREE directive - Add test for turning chardev relabelling on/off that Rich just added support for - Opencode the configure.ac check for libattr --- .gitignore | 1 + configure.ac | 52 +++++ libvirt.spec.in | 1 + tests/Makefile.am | 20 +- tests/securityselinuxhelper.c | 33 +++ tests/securityselinuxlabeldata/chardev.txt | 7 + tests/securityselinuxlabeldata/chardev.xml | 47 ++++ tests/securityselinuxlabeldata/disks.txt | 5 + tests/securityselinuxlabeldata/disks.xml | 52 +++++ tests/securityselinuxlabeldata/kernel.txt | 2 + tests/securityselinuxlabeldata/kernel.xml | 20 ++ tests/securityselinuxlabeltest.c | 340 +++++++++++++++++++++++++++++ 12 files changed, 577 insertions(+), 3 deletions(-) create mode 100644 tests/securityselinuxlabeldata/chardev.txt create mode 100644 tests/securityselinuxlabeldata/chardev.xml create mode 100644 tests/securityselinuxlabeldata/disks.txt create mode 100644 tests/securityselinuxlabeldata/disks.xml create mode 100644 tests/securityselinuxlabeldata/kernel.txt create mode 100644 tests/securityselinuxlabeldata/kernel.xml create mode 100644 tests/securityselinuxlabeltest.c diff --git a/.gitignore b/.gitignore index 1cd2d45..58a8f34 100644 --- a/.gitignore +++ b/.gitignore @@ -150,6 +150,7 @@ /tests/secaatest /tests/seclabeltest /tests/securityselinuxtest +/tests/securityselinuxlabeltest /tests/sexpr2xmltest /tests/shunloadtest /tests/sockettest diff --git a/configure.ac b/configure.ac index 3e90672..2bb52ae 100644 --- a/configure.ac +++ b/configure.ac @@ -1398,6 +1398,53 @@ AM_CONDITIONAL([HAVE_AUDIT], [test "$with_audit" = "yes"]) AC_SUBST([AUDIT_CFLAGS]) AC_SUBST([AUDIT_LIBS]) + + +dnl Libattr library +AC_ARG_WITH([libattr], + AC_HELP_STRING([--with-libattr], [use libattr library @<:@default=check@:>@]), + [], + [with_libattr=check]) + +LIBATTR_CFLAGS= +LIBATTR_LIBS= +if test "$with_libattr" != "no" ; then + old_cflags="$CFLAGS" + old_libs="$LIBS" + if test "$with_libattr" != "check" && test "$with_libattr" != "yes" ; then + LIBATTR_CFLAGS="-I$with_libattr/include" + LIBATTR_LIBS="-L$with_libattr/lib" + fi + CFLAGS="$CFLAGS $LIBATTR_CFLAGS" + LIBS="$LIBS $LIBATTR_LIBS" + fail=0 + AC_CHECK_HEADER([attr/xattr.h], [], [fail=1]) + AC_CHECK_LIB([attr], [getxattr], [], [fail=1]) + + if test $fail = 1 ; then + if test "$with_libattr" = "yes" ; then + AC_MSG_ERROR([You must install the Libattr library in order to compile and run libvirt]) + else + with_libattr=no + LIBATTR_CFLAGS= + LIBATTR_LIBS= + fi + else + with_libattr=yes + fi + + if test "$with_libattr" = "yes" ; then + LIBATTR_LIBS="$LIBATTR_LIBS -lattr" + AC_DEFINE_UNQUOTED([WITH_LIBATTR], 1, [whether liblibattr is available]) + fi + + CFLAGS="$old_cflags" + LIBS="$old_libs" +fi +AM_CONDITIONAL([WITH_LIBATTR], [test "$with_libattr" = "yes"]) +AC_SUBST([LIBATTR_CFLAGS]) +AC_SUBST([LIBATTR_LIBS]) + dnl UUCP style file locks for PTY consoles if test "$with_console_lock_files" != "no"; then case $with_console_lock_files in @@ -3133,6 +3180,11 @@ AC_MSG_NOTICE([ audit: $AUDIT_CFLAGS $AUDIT_LIBS]) else AC_MSG_NOTICE([ audit: no]) fi +if test "$with_libattr" = "yes" ; then +AC_MSG_NOTICE([ libattr: $LIBATTR_CFLAGS $LIBATTR_LIBS]) +else +AC_MSG_NOTICE([ libattr: no]) +fi if test "$with_selinux" = "yes" ; then AC_MSG_NOTICE([ selinux: $SELINUX_CFLAGS $SELINUX_LIBS]) else diff --git a/libvirt.spec.in b/libvirt.spec.in index 1192739..dc5347c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -385,6 +385,7 @@ BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: libtasn1-devel BuildRequires: gnutls-devel +BuildRequires: libattr-devel %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 # for augparse, optionally used in testing BuildRequires: augeas diff --git a/tests/Makefile.am b/tests/Makefile.am index 8dbad97..d715291 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -68,6 +68,7 @@ EXTRA_DIST = \ qemuxml2argvdata \ qemuxml2xmloutdata \ qemuxmlnsdata \ + securityselinuxlabeldata \ schematestutils.sh \ sexpr2xmldata \ storagepoolschematest \ @@ -97,6 +98,9 @@ test_programs = virshtest sockettest \ if WITH_SECDRIVER_SELINUX test_programs += securityselinuxtest +if WITH_LIBATTR +test_programs += securityselinuxlabeltest +endif endif if WITH_DRIVER_MODULES @@ -573,10 +577,20 @@ securityselinuxtest_SOURCES = \ securityselinuxtest.c testutils.h testutils.c securityselinuxtest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS) securityselinuxtest_LDADD = $(LDADDS) -securityselinuxtest_DEPENDENCIES = libsecurityselinuxhelper.la -else -EXTRA_DIST += securityselinuxtest.c securityselinuxhelper.c +securityselinuxtest_DEPENDENCIES = libsecurityselinuxhelper.la ../src/libvirt.la + +if WITH_QEMU +if WITH_LIBATTR +securityselinuxlabeltest_SOURCES = \ + securityselinuxlabeltest.c testutils.h testutils.c \ + testutilsqemu.h testutilsqemu.c +securityselinuxlabeltest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS) +securityselinuxlabeltest_LDADD = $(qemu_LDADDS) +securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la ../src/libvirt.la +endif +endif endif +EXTRA_DIST += securityselinuxtest.c securityselinuxlabeltest.c securityselinuxhelper.c virbuftest_SOURCES = \ virbuftest.c testutils.h testutils.c diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 43676de..d4e50ba 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,6 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> +#include <attr/xattr.h> + + /* * The kernel policy will not allow us to arbitrarily change * test process context. This helper is used as an LD_PRELOAD @@ -64,3 +67,33 @@ int setcon(security_context_t context) { return setenv("FAKE_CONTEXT", context, 1); } + + +#if WITH_LIBATTR +int setfilecon(const char *path, security_context_t con) +{ + const char *constr = con; + return setxattr(path, "user.libvirt.selinux", + constr, strlen(constr), 0); +} + + +int getfilecon(const char *path, security_context_t *con) +{ + char *constr = NULL; + ssize_t len = getxattr(path, "user.libvirt.selinux", + NULL, 0); + if (len < 0) + return -1; + if (!(constr = malloc(len+1))) + return -1; + memset(constr, 0, len); + if (getxattr(path, "user.libvirt.selinux", constr, len) < 0) { + free(constr); + return -1; + } + *con = constr; + constr[len] = '\0'; + return 0; +} +#endif diff --git a/tests/securityselinuxlabeldata/chardev.txt b/tests/securityselinuxlabeldata/chardev.txt new file mode 100644 index 0000000..3f4b630 --- /dev/null +++ b/tests/securityselinuxlabeldata/chardev.txt @@ -0,0 +1,7 @@ +/plain.txt;system_u:object_r:svirt_image_t:s0:c41,c264 +/plain.dev;system_u:object_r:svirt_image_t:s0:c41,c264 +/plain.fifo;system_u:object_r:svirt_image_t:s0:c41,c264 +/nolabel.sock; +/plain.sock; +/yeslabel.sock;system_u:object_r:svirt_image_t:s0:c41,c264 +/altlabel.sock;system_u:object_r:svirt_image_custom_t:s0:c41,c264 diff --git a/tests/securityselinuxlabeldata/chardev.xml b/tests/securityselinuxlabeldata/chardev.xml new file mode 100644 index 0000000..64b6b5f --- /dev/null +++ b/tests/securityselinuxlabeldata/chardev.xml @@ -0,0 +1,47 @@ +<domain type='kvm'> + <name>vm1</name> + <uuid>c7b3edbd-edaf-9455-926a-d65c16db1800</uuid> + <memory unit='KiB'>219200</memory> + <os> + <type arch='i686' machine='pc-1.0'>hvm</type> + <boot dev='cdrom'/> + </os> + <devices> + <serial type='file'> + <source path='/plain.txt'/> + </serial> + <serial type='pipe'> + <source path='/plain.fifo'/> + </serial> + <serial type='dev'> + <source path='/plain.dev'/> + </serial> + <serial type='unix'> + <source mode='bind' path='/plain.sock'/> + </serial> + <serial type='unix'> + <source mode='connect' path='/nolabel.sock'> + <seclabel relabel='no' model='selinux'/> + </source> + </serial> + <serial type='unix'> + <source mode='connect' path='/yeslabel.sock'> + </source> + </serial> + <serial type='unix'> + <source mode='connect' path='/altlabel.sock'> + <seclabel relabel='yes' model='selinux'> + <label>system_u:object_r:svirt_image_custom_t:s0:c41,c264</label> + </seclabel> + </source> + </serial> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'> + <listen type='address' address='0.0.0.0'/> + </graphics> + </devices> + <seclabel model="selinux" type="dynamic" relabel="yes"> + <label>system_u:system_r:svirt_t:s0:c41,c264</label> + <imagelabel>system_u:object_r:svirt_image_t:s0:c41,c264</imagelabel> + </seclabel> +</domain> diff --git a/tests/securityselinuxlabeldata/disks.txt b/tests/securityselinuxlabeldata/disks.txt new file mode 100644 index 0000000..2573d99 --- /dev/null +++ b/tests/securityselinuxlabeldata/disks.txt @@ -0,0 +1,5 @@ +/plain.raw;system_u:object_r:svirt_image_t:s0:c41,c264 +/shared.raw;system_u:object_r:svirt_image_t:s0 +/readonly.raw;system_u:object_r:virt_content_t:s0 +/nolabel.raw; +/altlabel.raw;system_u:object_r:svirt_image_custom_t:s0:c41,c264 diff --git a/tests/securityselinuxlabeldata/disks.xml b/tests/securityselinuxlabeldata/disks.xml new file mode 100644 index 0000000..33e8763 --- /dev/null +++ b/tests/securityselinuxlabeldata/disks.xml @@ -0,0 +1,52 @@ +<domain type='kvm'> + <name>vm1</name> + <uuid>c7b3edbd-edaf-9455-926a-d65c16db1800</uuid> + <memory unit='KiB'>219200</memory> + <os> + <type arch='i686' machine='pc-1.0'>hvm</type> + <boot dev='cdrom'/> + </os> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/plain.raw'/> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/shared.raw'/> + <shareable/> + <target dev='vdb' bus='virtio'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/readonly.raw'/> + <readonly/> + <target dev='vdc' bus='virtio'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/nolabel.raw'> + <seclabel model='selinux' relabel='no'/> + </source> + <target dev='vdd' bus='virtio'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/altlabel.raw'> + <seclabel model='selinux' relabel='yes'> + <label>system_u:object_r:svirt_image_custom_t:s0:c41,c264</label> + </seclabel> + </source> + <target dev='vde' bus='virtio'/> + </disk> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'> + <listen type='address' address='0.0.0.0'/> + </graphics> + </devices> + <seclabel model="selinux" type="dynamic" relabel="yes"> + <label>system_u:system_r:svirt_t:s0:c41,c264</label> + <imagelabel>system_u:object_r:svirt_image_t:s0:c41,c264</imagelabel> + </seclabel> +</domain> diff --git a/tests/securityselinuxlabeldata/kernel.txt b/tests/securityselinuxlabeldata/kernel.txt new file mode 100644 index 0000000..87063fd --- /dev/null +++ b/tests/securityselinuxlabeldata/kernel.txt @@ -0,0 +1,2 @@ +/vmlinuz.raw;system_u:object_r:virt_content_t:s0 +/initrd.raw;system_u:object_r:virt_content_t:s0 diff --git a/tests/securityselinuxlabeldata/kernel.xml b/tests/securityselinuxlabeldata/kernel.xml new file mode 100644 index 0000000..0fd551d --- /dev/null +++ b/tests/securityselinuxlabeldata/kernel.xml @@ -0,0 +1,20 @@ +<domain type='kvm'> + <name>vm1</name> + <uuid>c7b3edbd-edaf-9455-926a-d65c16db1800</uuid> + <memory unit='KiB'>219200</memory> + <os> + <type arch='i686' machine='pc-1.0'>hvm</type> + <kernel>/vmlinuz.raw</kernel> + <initrd>/initrd.raw</initrd> + </os> + <devices> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'> + <listen type='address' address='0.0.0.0'/> + </graphics> + </devices> + <seclabel model="selinux" type="dynamic" relabel="yes"> + <label>system_u:system_r:svirt_t:s0:c41,c264</label> + <imagelabel>system_u:object_r:svirt_image_t:s0:c41,c264</imagelabel> + </seclabel> +</domain> diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c new file mode 100644 index 0000000..f25c6bf --- /dev/null +++ b/tests/securityselinuxlabeltest.c @@ -0,0 +1,340 @@ +/* + * Copyright (C) 2011-2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. + * + */ + + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> + +#include <selinux/selinux.h> +#include <selinux/context.h> + +#include "internal.h" +#include "testutils.h" +#include "testutilsqemu.h" +#include "qemu/qemu_domain.h" +#include "memory.h" +#include "virfile.h" +#include "util.h" +#include "logging.h" +#include "virterror_internal.h" +#include "security/security_manager.h" + + +#define VIR_FROM_THIS VIR_FROM_NONE + +static virCapsPtr caps; + +static virSecurityManagerPtr mgr; + +typedef struct testSELinuxFile testSELinuxFile; + +struct testSELinuxFile { + char *file; + char *context; +}; + + +static int +testSELinuxMungePath(char **path) +{ + char *tmp; + + if (virAsprintf(&tmp, "%s/securityselinuxlabeldata%s", + abs_srcdir, *path) < 0) { + virReportOOMError(); + return -1; + } + + VIR_FREE(*path); + *path = tmp; + return 0; +} + +static int +testSELinuxLoadFileList(const char *testname, + testSELinuxFile **files, + size_t *nfiles) +{ + int ret = -1; + char *path = NULL; + FILE *fp = NULL; + + *files = NULL; + *nfiles = 0; + + if (virAsprintf(&path, "%s/securityselinuxlabeldata/%s.txt", + abs_srcdir, testname) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (!(fp = fopen(path, "r"))) { + goto cleanup; + } + + while (!feof(fp)) { + char *line; + char *file, *context; + if (VIR_ALLOC_N(line, 1024) < 0) { + virReportOOMError(); + goto cleanup; + } + if (!fgets(line, 1024, fp)) { + if (!feof(fp)) + goto cleanup; + break; + } + + char *tmp = strchr(line, ';'); + *tmp = '\0'; + tmp++; + + if (virAsprintf(&file, "%s/securityselinuxlabeldata%s", abs_builddir, line) < 0) { + VIR_FREE(line); + virReportOOMError(); + goto cleanup; + } + if (*tmp != '\0' && *tmp != '\n') { + if (!(context = strdup(tmp))) { + VIR_FREE(line); + VIR_FREE(file); + virReportOOMError(); + goto cleanup; + } + + tmp = strchr(context, '\n'); + *tmp = '\0'; + } else { + context = NULL; + } + + if (VIR_EXPAND_N(*files, *nfiles, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + + (*files)[(*nfiles)-1].file = file; + (*files)[(*nfiles)-1].context = context; + } + + ret = 0; + +cleanup: + if (fp) + fclose(fp); + VIR_FREE(path); + return ret; +} + + +static virDomainDefPtr +testSELinuxLoadDef(const char *testname) +{ + char *xmlfile = NULL; + char *xmlstr = NULL; + virDomainDefPtr def = NULL; + size_t i; + + if (virAsprintf(&xmlfile, "%s/securityselinuxlabeldata/%s.xml", + abs_srcdir, testname) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virFileReadAll(xmlfile, 1024*1024, &xmlstr) < 0) { + goto cleanup; + } + + if (!(def = virDomainDefParseString(caps, xmlstr, + QEMU_EXPECTED_VIRT_TYPES, + 0))) + goto cleanup; + + for (i = 0 ; i < def->ndisks ; i++) { + if (def->disks[i]->type != VIR_DOMAIN_DISK_TYPE_FILE && + def->disks[i]->type != VIR_DOMAIN_DISK_TYPE_BLOCK) + continue; + + if (testSELinuxMungePath(&def->disks[i]->src) < 0) + goto cleanup; + } + + for (i = 0 ; i < def->nserials ; i++) { + if (def->serials[i]->source.type != VIR_DOMAIN_CHR_TYPE_FILE && + def->serials[i]->source.type != VIR_DOMAIN_CHR_TYPE_PIPE && + def->serials[i]->source.type != VIR_DOMAIN_CHR_TYPE_DEV && + def->serials[i]->source.type != VIR_DOMAIN_CHR_TYPE_UNIX) + continue; + + if (def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX) { + if (testSELinuxMungePath(&def->serials[i]->source.data.nix.path) < 0) + goto cleanup; + } else { + if (testSELinuxMungePath(&def->serials[i]->source.data.file.path) < 0) + goto cleanup; + } + } + + if (def->os.kernel && + testSELinuxMungePath(&def->os.kernel) < 0) + goto cleanup; + if (def->os.initrd && + testSELinuxMungePath(&def->os.initrd) < 0) + goto cleanup; + +cleanup: + VIR_FREE(xmlfile); + VIR_FREE(xmlstr); + return def; +} + + +static int +testSELinuxCreateDisks(testSELinuxFile *files, size_t nfiles) +{ + size_t i; + + if (virFileMakePath(abs_builddir "/securityselinuxlabeldata") < 0) + return -1; + + for (i = 0 ; i < nfiles ; i++) { + if (virFileTouch(files[i].file, 0600) < 0) + return -1; + } + return 0; +} + +static int +testSELinuxDeleteDisks(testSELinuxFile *files, size_t nfiles) +{ + size_t i; + + for (i = 0 ; i < nfiles ; i++) { + if (unlink(files[i].file) < 0) + return -1; + } + return 0; +} + +static int +testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles) +{ + size_t i; + security_context_t ctx; + + for (i = 0 ; i < nfiles ; i++) { + if (getfilecon(files[i].file, &ctx) < 0) { + if (errno == ENODATA) { + ctx = NULL; + } else { + virReportSystemError(errno, + "Cannot read label on %s", + files[i].file); + return -1; + } + } + if (!STREQ_NULLABLE(files[i].context, ctx)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "File %s context '%s' did not match epected '%s'", + files[i].file, ctx, files[i].context); + return -1; + } + } + return 0; +} + +static int +testSELinuxLabeling(const void *opaque) +{ + const char *testname = opaque; + int ret = -1; + testSELinuxFile *files = NULL; + size_t nfiles = 0; + size_t i; + virDomainDefPtr def = NULL; + + if (testSELinuxLoadFileList(testname, &files, &nfiles) < 0) + goto cleanup; + + if (testSELinuxCreateDisks(files, nfiles) < 0) + goto cleanup; + + if (!(def = testSELinuxLoadDef(testname))) + goto cleanup; + + if (virSecurityManagerSetAllLabel(mgr, def, NULL) < 0) + goto cleanup; + + if (testSELinuxCheckLabels(files, nfiles) < 0) + goto cleanup; + + ret = 0; + +cleanup: + if (testSELinuxDeleteDisks(files, nfiles) < 0) + goto cleanup; + + virDomainDefFree(def); + for (i = 0 ; i < nfiles; i++) { + VIR_FREE(files[i].file); + VIR_FREE(files[i].context); + } + VIR_FREE(files); + return ret; +} + + + +static int +mymain(void) +{ + int ret = 0; + + if (!(mgr = virSecurityManagerNew("selinux", "QEMU", false, true, false))) { + virErrorPtr err = virGetLastError(); + if (err->code == VIR_ERR_CONFIG_UNSUPPORTED) + exit(EXIT_AM_SKIP); + + fprintf(stderr, "Unable to initialize security driver: %s\n", + err->message); + exit(EXIT_FAILURE); + } + + if ((caps = testQemuCapsInit()) == NULL) + exit(EXIT_FAILURE); + +#define DO_TEST_LABELING(name) \ + if (virtTestRun("Labelling " # name, 1, testSELinuxLabeling, name) < 0) \ + ret = -1; \ + + setcon((security_context_t)"system_r:system_u:libvirtd_t:s0:c0.c1023"); + + DO_TEST_LABELING("disks"); + DO_TEST_LABELING("kernel"); + DO_TEST_LABELING("chardev"); + + return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") -- 1.7.11.4

2 1

[libvirt] [PATCH 00/29] Add selinux test & refactor configure.ac
by Daniel P. Berrange 21 Sep '12

21 Sep '12

2 34