- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] Few cleanups pointed out in reviews
by Peter Krempa 09 Jul '14

09 Jul '14

Peter Krempa (3): conf: Verify metadata type right away util: XML: Avoid forward function declaration lib: Check conditions for VIR_DOMAIN_BLOCK_REBASE_RELATIVE right away src/conf/domain_conf.c | 10 ++-------- src/libvirt.c | 17 +++++++++++++---- src/qemu/qemu_driver.c | 7 ------- src/util/virxml.c | 5 ----- 4 files changed, 15 insertions(+), 24 deletions(-) -- 2.0.0

3 9

[libvirt] [PATCH] virEventPollDispatchHandles: Honour array boundaries
by Michal Privoznik 09 Jul '14

09 Jul '14

When dispatching events from the event loop, the array of registered handles is searched to see what handles happened an event on. However, the array is searched in weird way: the check for the array boundaries is at the end, so we may touch the elements after the end of the array: ==10434== Invalid read of size 4 ==10434== at 0x52D06B6: virEventPollDispatchHandles (vireventpoll.c:486) ==10434== by 0x52D10E4: virEventPollRunOnce (vireventpoll.c:660) ==10434== by 0x52CF207: virEventRunDefaultImpl (virevent.c:308) ==10434== by 0x1639D1: virNetServerRun (virnetserver.c:1139) ==10434== by 0x1220DC: main (libvirtd.c:1507) ==10434== Address 0xc11ff04 is 4 bytes after a block of size 960 alloc'd ==10434== at 0x4C2CA5E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==10434== by 0x52AD378: virReallocN (viralloc.c:245) ==10434== by 0x52AD46E: virExpandN (viralloc.c:294) ==10434== by 0x52AD5B1: virResizeN (viralloc.c:352) ==10434== by 0x52CF2EC: virEventPollAddHandle (vireventpoll.c:116) ==10434== by 0x52CEF5B: virEventAddHandle (virevent.c:78) ==10434== by 0x11F69A90: nodeStateInitialize (node_device_udev.c:1797) ==10434== by 0x53C3C89: virStateInitialize (libvirt.c:743) ==10434== by 0x120563: daemonRunStateInit (libvirtd.c:919) ==10434== by 0x5317719: virThreadHelper (virthread.c:197) ==10434== by 0x8376F39: start_thread (in /lib64/libpthread-2.17.so) ==10434== by 0x8A7F9FC: clone (in /lib64/libc-2.17.so) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/vireventpoll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index 528b24c..13f40dc 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -477,46 +477,46 @@ static int virEventPollDispatchTimeouts(void) static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) { size_t i, n; VIR_DEBUG("Dispatch %d", nfds); /* NB, use nfds not eventLoop.handlesCount, because new * fds might be added on end of list, and they're not * in the fds array we've got */ for (i = 0, n = 0; n < nfds && i < eventLoop.handlesCount; n++) { - while ((eventLoop.handles[i].fd != fds[n].fd || - eventLoop.handles[i].events == 0) && - i < eventLoop.handlesCount) { + while (i < eventLoop.handlesCount && + (eventLoop.handles[i].fd != fds[n].fd || + eventLoop.handles[i].events == 0)) { i++; } if (i == eventLoop.handlesCount) break; VIR_DEBUG("i=%zu w=%d", i, eventLoop.handles[i].watch); if (eventLoop.handles[i].deleted) { EVENT_DEBUG("Skip deleted n=%zu w=%d f=%d", i, eventLoop.handles[i].watch, eventLoop.handles[i].fd); continue; } if (fds[n].revents) { virEventHandleCallback cb = eventLoop.handles[i].cb; int watch = eventLoop.handles[i].watch; void *opaque = eventLoop.handles[i].opaque; int hEvents = virEventPollFromNativeEvents(fds[n].revents); PROBE(EVENT_POLL_DISPATCH_HANDLE, "watch=%d events=%d", watch, hEvents); virMutexUnlock(&eventLoop.lock); (cb)(watch, fds[n].fd, hEvents, opaque); virMutexLock(&eventLoop.lock); } } return 0; } /* Used post dispatch to actually remove any timers that * were previously marked as deleted. This asynchronous * cleanup is needed to make dispatch re-entrant safe. */ -- 1.8.5.5

2 1

[libvirt] [PATCH] util: cgroup: Fix build on non-cgroup platforms
by Peter Krempa 09 Jul '14

09 Jul '14

Commit 48f44510098cead629ede9a49ea4e840a28ccca introduced a helper fucntion to convert cgroup device mode to string. The function was only conditionally compliled on platforms that support cgroup. This broke the build when attempting to export the symbol: CCLD libvirt.la Cannot export virCgroupGetDevicePermsString: symbol not defined Move the function out of the ifdef, as it doesn't really depend on the cgroup code being present. --- src/util/vircgroup.c | 76 ++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 2eaf265..1ec12ac 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -83,6 +83,44 @@ typedef enum { } virCgroupFlags; +/** + * virCgroupGetDevicePermsString: + * + * @perms: Bitwise or of VIR_CGROUP_DEVICE permission bits + * + * Returns string corresponding to the appropriate bits set. + */ +const char * +virCgroupGetDevicePermsString(int perms) +{ + if (perms & VIR_CGROUP_DEVICE_READ) { + if (perms & VIR_CGROUP_DEVICE_WRITE) { + if (perms & VIR_CGROUP_DEVICE_MKNOD) + return "rwm"; + else + return "rw"; + } else { + if (perms & VIR_CGROUP_DEVICE_MKNOD) + return "rm"; + else + return "r"; + } + } else { + if (perms & VIR_CGROUP_DEVICE_WRITE) { + if (perms & VIR_CGROUP_DEVICE_MKNOD) + return "wm"; + else + return "w"; + } else { + if (perms & VIR_CGROUP_DEVICE_MKNOD) + return "m"; + else + return ""; + } + } +} + + #ifdef VIR_CGROUP_SUPPORTED bool virCgroupAvailable(void) @@ -2624,44 +2662,6 @@ virCgroupDenyAllDevices(virCgroupPtr group) /** - * virCgroupGetDevicePermsString: - * - * @perms: Bitwise or of VIR_CGROUP_DEVICE permission bits - * - * Returns string corresponding to the appropriate bits set. - */ -const char * -virCgroupGetDevicePermsString(int perms) -{ - if (perms & VIR_CGROUP_DEVICE_READ) { - if (perms & VIR_CGROUP_DEVICE_WRITE) { - if (perms & VIR_CGROUP_DEVICE_MKNOD) - return "rwm"; - else - return "rw"; - } else { - if (perms & VIR_CGROUP_DEVICE_MKNOD) - return "rm"; - else - return "r"; - } - } else { - if (perms & VIR_CGROUP_DEVICE_WRITE) { - if (perms & VIR_CGROUP_DEVICE_MKNOD) - return "wm"; - else - return "w"; - } else { - if (perms & VIR_CGROUP_DEVICE_MKNOD) - return "m"; - else - return ""; - } - } -} - - -/** * virCgroupAllowDevice: * * @group: The cgroup to allow a device for -- 2.0.0

3 3

[libvirt] [PATCH 0/4] libxl: a few migration improvements
by Jim Fehlig 08 Jul '14

08 Jul '14

See individual patches for details. Jim Fehlig (4): libxl: rename goto label libxl: remove domain when migration prepare fails libxl: acquire job though begin phase only libxl: fix crash in migrate confirm for transient domains src/libxl/libxl_driver.c | 7 ++---- src/libxl/libxl_migration.c | 60 ++++++++++++++++++++++----------------------- src/libxl/libxl_migration.h | 2 +- 3 files changed, 33 insertions(+), 36 deletions(-) -- 1.8.4.5

2 9

[libvirt] [PATCH] LXC: fix an improper comments for lxcDomainDestroyFlags
by Chen Hanxiao 08 Jul '14

08 Jul '14

Currently @flag is not used yet. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 79c3b4a..5c4ab58 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1420,7 +1420,7 @@ lxcConnectDomainEventDeregisterAny(virConnectPtr conn, /** * lxcDomainDestroyFlags: * @dom: pointer to domain to destroy - * @flags: an OR'ed set of virDomainDestroyFlags + * @flags: extra flags; not used yet. * * Sends SIGKILL to container root process to terminate the container * -- 1.9.0

3 2

[libvirt] [PATCH libvirt] qemu: show a warning when using aio=native without cache=none
by Giuseppe Scrivano 08 Jul '14

08 Jul '14

Qemu will fallback to aio=threads when the cache mode doesn't use O_DIRECT, even if aio=native was explictly set. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1086704 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- src/qemu/qemu_command.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fb64cda..92a6c9a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3477,6 +3477,13 @@ qemuBuildDriveStr(virConnectPtr conn, mode = qemuDiskCacheV1TypeToString(disk->cachemode); } + if (disk->iomode == VIR_DOMAIN_DISK_IO_NATIVE && + disk->cachemode != VIR_DOMAIN_DISK_CACHE_DIRECTSYNC) { + VIR_WARN("native I/O needs either no disk cache " + "or directsync cache mode, QEMU will fallback " + "to aio=threads"); + } + virBufferAsprintf(&opt, ",cache=%s", mode); } else if (disk->shared && !disk->readonly) { virBufferAddLit(&opt, ",cache=off"); -- 1.9.3

3 4

[libvirt] [PATCH] Allow updating names in DHCP hosts by matching IPs.
by Ján Tomko 08 Jul '14

08 Jul '14

Also fix the error message if an IPv6 host with no MAC is not found. https://bugzilla.redhat.com/show_bug.cgi?id=991290 --- src/conf/network_conf.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 909631b..ce4d4d8 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3480,11 +3480,13 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { - /* search for the entry with this (mac|name), + /* search for the entry with this (ip|mac|name), * and update the IP+(mac|name) */ for (i = 0; i < ipdef->nhosts; i++) { if ((host.mac && !virMacAddrCompare(host.mac, ipdef->hosts[i].mac)) || + (VIR_SOCKET_ADDR_VALID(&host.ip) && + virSocketAddrEqual(&host.ip, &ipdef->hosts[i].ip)) || (host.name && STREQ_NULLABLE(host.name, ipdef->hosts[i].name))) { break; @@ -3492,10 +3494,14 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, } if (i == ipdef->nhosts) { + char *ip = virSocketAddrFormat(&host.ip); virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't locate an existing dhcp host entry with " - "\"mac='%s'\" in network '%s'"), - host.mac, def->name); + "\"mac='%s'\" \"name='%s'\" \"ip='%s'\" in" + " network '%s'"), + host.mac ? host.mac : _("unknown"), host.name, + ip ? ip : _("unknown"), def->name); + VIR_FREE(ip); goto cleanup; } @@ -3524,8 +3530,8 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, _("there is an existing dhcp host entry in " "network '%s' that matches " "\"<host mac='%s' name='%s' ip='%s'/>\""), - def->name, host.mac, host.name, - ip ? ip : "unknown"); + def->name, host.mac ? host.mac : _("unknown"), + host.name, ip ? ip : _("unknown")); VIR_FREE(ip); goto cleanup; } -- 1.8.5.5

2 1

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 08 Jul '14

08 Jul '14

When run under an environment that inherits an ignored SIGPIPE (hello, annoying buildbots), a syntax-check was producing quite a bit of noise, such as: > prohibit_argmatch_without_use > grep: write error > grep: write error > /bin/sed: couldn't write 25 items to stdout: Broken pipe > sed: couldn't write 1 item to stdout: Broken pipe > 0.46 prohibit_argmatch_without_use This has been fixed upstream in gnulib. There are several other portability improvements in our regular submodule update. * .gnulib: Update to latest, in part for quieter syntax-check. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the gnulib maintenance rule. * .gnulib d55899f...9d5efe7 (19): > maint.mk: less syntax-check noise when SIGPIPE is ignored > nl_langinfo: CODESET on MS-Windows and more items from localeconv > Bruno Haible has stepped down as maintainer. > mktime: merge #if/#ifdef usage from glibc > git-version-gen: improve option descriptions > regex: fix memory leak in compiler > regex: merge patch from libc > acl: port to gcc -Wredundant-decls > parse-duration: eliminate 68-year duration limit > pthread: don't assume AC_CANONICAL_HOST, port better to Solaris, etc. > pthread: define thread-safe macros on some platforms > regex: don't be multithreaded if USE_UNLOCKED_IO. > gettext: update macros to version 0.19 > select,poll: fix console handle check on windows 8 > select: fix waiting on anonymous pipes on MS-Windows > times: fix to return non constant value on MS-Windows > isatty: fix to work on windows 8 > maint: fix typo in fdl.texi > mountlist: avoid hasmntopt const type warning on solaris .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index d55899f..9d5efe7 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d55899fd2c5794ac85ecb14d5e2f646a89e4b4dd +Subproject commit 9d5efe7d61e1d96a6d7c97ffa4d21c5e33e9bd30 -- 1.9.3

1 0

[libvirt] [PATCH] Document the need to free vir*Ptr objects per-function
by Ján Tomko 08 Jul '14

08 Jul '14

Another patch for https://bugzilla.redhat.com/show_bug.cgi?id=994731 --- src/libvirt.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 134 insertions(+), 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 316fdf0..8684298 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1299,6 +1299,9 @@ do_open(const char *name, * * URIs are documented at http://libvirt.org/uri.html * + * virConnectClose should be used to release the resources after the connection + * is no longer needed. + * * Returns a pointer to the hypervisor connection or NULL in case of error */ virConnectPtr @@ -1331,7 +1334,7 @@ virConnectOpen(const char *name) * on the available methods to control the domains. * * See virConnectOpen for notes about environment variables which can - * have an effect on opening drivers + * have an effect on opening drivers and freeing the connection resources * * URIs are documented at http://libvirt.org/uri.html * @@ -1369,7 +1372,7 @@ virConnectOpenReadOnly(const char *name) * credentials via the callback * * See virConnectOpen for notes about environment variables which can - * have an effect on opening drivers + * have an effect on opening drivers and freeing the connection resources * * URIs are documented at http://libvirt.org/uri.html * @@ -1875,6 +1878,9 @@ virDomainGetConnect(virDomainPtr dom) * libvirtd daemon. Any domains marked for auto destroy will * block attempts at migration, save-to-file, or snapshots. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure */ virDomainPtr @@ -1937,6 +1943,9 @@ virDomainCreateXML(virConnectPtr conn, const char *xmlDesc, * libvirtd daemon. Any domains marked for auto destroy will * block attempts at migration, save-to-file, or snapshots. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure */ virDomainPtr @@ -2000,6 +2009,9 @@ virDomainCreateLinux(virConnectPtr conn, const char *xmlDesc, * Note that this won't work for inactive domains which have an ID of -1, * in that case a lookup based on the Name or UUId need to be done instead. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure. If the * domain cannot be found, then VIR_ERR_NO_DOMAIN error is raised. */ @@ -2036,6 +2048,9 @@ virDomainLookupByID(virConnectPtr conn, int id) * * Try to lookup a domain on the given hypervisor based on its UUID. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure. If the * domain cannot be found, then VIR_ERR_NO_DOMAIN error is raised. */ @@ -2072,6 +2087,9 @@ virDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) * * Try to lookup a domain on the given hypervisor based on its UUID. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure. If the * domain cannot be found, then VIR_ERR_NO_DOMAIN error is raised. */ @@ -2108,6 +2126,9 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) * * Try to lookup a domain on the given hypervisor based on its name. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns a new domain object or NULL in case of failure. If the * domain cannot be found, then VIR_ERR_NO_DOMAIN error is raised. */ @@ -5284,6 +5305,9 @@ virDomainMigrateDirect(virDomainPtr domain, * different processors even with the same architecture, or between * different types of hypervisor. * + * virDomainFree should be used to free the resources after the + * returned domain object is no longer needed. + * * Returns the new domain object if the migration was successful, * or NULL in case of error. Note that the new domain object * exists in the scope of the destination connection (dconn). @@ -5509,6 +5533,9 @@ virDomainMigrate(virDomainPtr domain, * @dname for that purpose). Domain name in @dxml must match the * original domain name. * + * virDomainFree should be used to free the resources after the + * returned domain object is no longer needed. + * * Returns the new domain object if the migration was successful, * or NULL in case of error. Note that the new domain object * exists in the scope of the destination connection (dconn). @@ -5680,6 +5707,9 @@ virDomainMigrate2(virDomainPtr domain, * different processors even with the same architecture, or between * different types of hypervisor. * + * virDomainFree should be used to free the resources after the + * returned domain object is no longer needed. + * * Returns the new domain object if the migration was successful, * or NULL in case of error. Note that the new domain object * exists in the scope of the destination connection (dconn). @@ -7916,7 +7946,7 @@ virDomainBlockStats(virDomainPtr dom, const char *disk, * @dom: pointer to domain object * @disk: path to the block device, or device shorthand * @params: pointer to block stats parameter object - * (return value) + * (return value, allocated by the caller) * @nparams: pointer to number of block stats; input and output * @flags: bitwise-OR of virTypedParameterFlags * @@ -8631,6 +8661,9 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *disk, * domain being defined; in that case, use virDomainBlockJobAbort() to * stop the block copy first. * + * virDomainFree should be used to free the resources after the + * domain object is no longer needed. + * * Returns NULL in case of error, a pointer to the domain otherwise */ virDomainPtr @@ -10899,6 +10932,9 @@ virConnectListDefinedNetworks(virConnectPtr conn, char **const names, * * Try to lookup a network on the given hypervisor based on its name. * + * virNetworkFree should be used to free the resources after the + * network object is no longer needed. + * * Returns a new network object or NULL in case of failure. If the * network cannot be found, then VIR_ERR_NO_NETWORK error is raised. */ @@ -10935,6 +10971,9 @@ virNetworkLookupByName(virConnectPtr conn, const char *name) * * Try to lookup a network on the given hypervisor based on its UUID. * + * virNetworkFree should be used to free the resources after the + * network object is no longer needed. + * * Returns a new network object or NULL in case of failure. If the * network cannot be found, then VIR_ERR_NO_NETWORK error is raised. */ @@ -11008,6 +11047,9 @@ virNetworkLookupByUUIDString(virConnectPtr conn, const char *uuidstr) * Create and start a new virtual network, based on an XML description * similar to the one returned by virNetworkGetXMLDesc() * + * virNetworkFree should be used to free the resources after the + * network object is no longer needed. + * * Returns a new network object or NULL in case of failure */ virNetworkPtr @@ -11044,6 +11086,9 @@ virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) * * Define a network, but does not create it * + * virNetworkFree should be used to free the resources after the + * network object is no longer needed. + * * Returns NULL in case of error, a pointer to the network otherwise */ virNetworkPtr @@ -11788,6 +11833,9 @@ virConnectListDefinedInterfaces(virConnectPtr conn, * * Try to lookup an interface on the given hypervisor based on its name. * + * virInterfaceFree should be used to free the resources after the + * interface object is no longer needed. + * * Returns a new interface object or NULL in case of failure. If the * interface cannot be found, then VIR_ERR_NO_INTERFACE error is raised. */ @@ -11824,6 +11872,9 @@ virInterfaceLookupByName(virConnectPtr conn, const char *name) * * Try to lookup an interface on the given hypervisor based on its MAC. * + * virInterfaceFree should be used to free the resources after the + * interface object is no longer needed. + * * Returns a new interface object or NULL in case of failure. If the * interface cannot be found, then VIR_ERR_NO_INTERFACE error is raised. */ @@ -11962,6 +12013,9 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) * automatically removed during the next reboot of the system running * libvirtd. * + * virInterfaceFree should be used to free the resources after the + * interface object is no longer needed. + * * Returns NULL in case of error, a pointer to the interface otherwise */ virInterfacePtr @@ -12634,6 +12688,9 @@ virConnectFindStoragePoolSources(virConnectPtr conn, * * Fetch a storage pool based on its unique name * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if no matching pool is found */ virStoragePoolPtr @@ -12670,6 +12727,9 @@ virStoragePoolLookupByName(virConnectPtr conn, * * Fetch a storage pool based on its globally unique id * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if no matching pool is found */ virStoragePoolPtr @@ -12706,6 +12766,9 @@ virStoragePoolLookupByUUID(virConnectPtr conn, * * Fetch a storage pool based on its globally unique id * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if no matching pool is found */ virStoragePoolPtr @@ -12741,6 +12804,9 @@ virStoragePoolLookupByUUIDString(virConnectPtr conn, * * Fetch a storage pool which contains a particular volume * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if no matching pool is found */ virStoragePoolPtr @@ -12778,6 +12844,9 @@ virStoragePoolLookupByVolume(virStorageVolPtr vol) * pool is not persistent, so its definition will disappear * when it is destroyed, or if the host is restarted * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if creation failed */ virStoragePoolPtr @@ -12818,6 +12887,9 @@ virStoragePoolCreateXML(virConnectPtr conn, * Define a new inactive storage pool based on its XML description. The * pool is persistent, until explicitly undefined. * + * virStoragePoolFree should be used to free the resources after the + * storage pool object is no longer needed. + * * Returns a virStoragePoolPtr object, or NULL if creation failed */ virStoragePoolPtr @@ -13277,7 +13349,7 @@ virStoragePoolGetInfo(virStoragePoolPtr pool, * storage pool. This is suitable for later feeding back * into the virStoragePoolCreateXML method. * - * Returns a XML document, or NULL on error + * Returns a XML document (caller frees), or NULL on error */ char * virStoragePoolGetXMLDesc(virStoragePoolPtr pool, @@ -13542,6 +13614,9 @@ virStorageVolGetConnect(virStorageVolPtr vol) * Fetch a pointer to a storage volume based on its name * within a pool * + * virStorageVolFree should be used to free the resources after the + * storage volume object is no longer needed. + * * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr @@ -13579,6 +13654,9 @@ virStorageVolLookupByName(virStoragePoolPtr pool, * Fetch a pointer to a storage volume based on its * globally unique key * + * virStorageVolFree should be used to free the resources after the + * storage volume object is no longer needed. + * * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr @@ -13616,6 +13694,9 @@ virStorageVolLookupByKey(virConnectPtr conn, * Fetch a pointer to a storage volume based on its * locally (host) unique path * + * virStorageVolFree should be used to free the resources after the + * storage volume object is no longer needed. + * * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr @@ -13705,6 +13786,9 @@ virStorageVolGetKey(virStorageVolPtr vol) * qcow2 image files which don't support full preallocation, * by creating a sparse image file with metadata. * + * virStorageVolFree should be used to free the resources after the + * storage volume object is no longer needed. + * * Returns the storage volume, or NULL on error */ virStorageVolPtr @@ -13753,6 +13837,9 @@ virStorageVolCreateXML(virStoragePoolPtr pool, * qcow2 image files which don't support full preallocation, * by creating a sparse image file with metadata. * + * virStorageVolFree should be used to free the resources after the + * storage volume object is no longer needed. + * * Returns the storage volume, or NULL on error */ virStorageVolPtr @@ -14454,6 +14541,9 @@ virNodeListDevices(virConnectPtr conn, * * Lookup a node device by its name. * + * virNodeDeviceFree should be used to free the resources after the + * node device object is no longer needed. + * * Returns a virNodeDevicePtr if found, NULL otherwise. */ virNodeDevicePtr @@ -14491,6 +14581,9 @@ virNodeDeviceLookupByName(virConnectPtr conn, const char *name) * * Lookup SCSI Host which is capable with 'fc_host' by its WWNN and WWPN. * + * virNodeDeviceFree should be used to free the resources after the + * node device object is no longer needed. + * * Returns a virNodeDevicePtr if found, NULL otherwise. */ virNodeDevicePtr @@ -14941,6 +15034,9 @@ virNodeDeviceReset(virNodeDevicePtr dev) * Create a new device on the VM host machine, for example, virtual * HBAs created using vport_create. * + * virNodeDeviceFree should be used to free the resources after the + * node device object is no longer needed. + * * Returns a node device object if successful, NULL in case of failure */ virNodeDevicePtr @@ -15280,6 +15376,9 @@ virConnectListSecrets(virConnectPtr conn, char **uuids, int maxuuids) * Try to lookup a secret on the given hypervisor based on its UUID. * Uses the 16 bytes of raw data to describe the UUID * + * virSecretFree should be used to free the resources after the + * secret object is no longer needed. + * * Returns a new secret object or NULL in case of failure. If the * secret cannot be found, then VIR_ERR_NO_SECRET error is raised. */ @@ -15318,6 +15417,9 @@ virSecretLookupByUUID(virConnectPtr conn, const unsigned char *uuid) * Try to lookup a secret on the given hypervisor based on its UUID. * Uses the printable string value to describe the UUID * + * virSecretFree should be used to free the resources after the + * secret object is no longer needed. + * * Returns a new secret object or NULL in case of failure. If the * secret cannot be found, then VIR_ERR_NO_SECRET error is raised. */ @@ -15357,6 +15459,9 @@ virSecretLookupByUUIDString(virConnectPtr conn, const char *uuidstr) * The usageID is unique within the set of secrets sharing the * same usageType value. * + * virSecretFree should be used to free the resources after the + * secret object is no longer needed. + * * Returns a new secret object or NULL in case of failure. If the * secret cannot be found, then VIR_ERR_NO_SECRET error is raised. */ @@ -15402,6 +15507,9 @@ virSecretLookupByUsage(virConnectPtr conn, * Otherwise, creates a new secret with an automatically chosen UUID, and * initializes its attributes from xml. * + * virSecretFree should be used to free the resources after the + * secret object is no longer needed. + * * Returns a secret on success, NULL on failure. */ virSecretPtr @@ -16793,6 +16901,9 @@ virConnectListNWFilters(virConnectPtr conn, char **const names, int maxnames) * * Try to lookup a network filter on the given hypervisor based on its name. * + * virNWFilterFree should be used to free the resources after the + * nwfilter object is no longer needed. + * * Returns a new nwfilter object or NULL in case of failure. If the * network filter cannot be found, then VIR_ERR_NO_NWFILTER error is raised. */ @@ -16829,6 +16940,9 @@ virNWFilterLookupByName(virConnectPtr conn, const char *name) * * Try to lookup a network filter on the given hypervisor based on its UUID. * + * virNWFilterFree should be used to free the resources after the + * nwfilter object is no longer needed. + * * Returns a new nwfilter object or NULL in case of failure. If the * nwfdilter cannot be found, then VIR_ERR_NO_NWFILTER error is raised. */ @@ -16865,6 +16979,9 @@ virNWFilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid) * * Try to lookup an nwfilter on the given hypervisor based on its UUID. * + * virNWFilterFree should be used to free the resources after the + * nwfilter object is no longer needed. + * * Returns a new nwfilter object or NULL in case of failure. If the * nwfilter cannot be found, then VIR_ERR_NO_NWFILTER error is raised. */ @@ -17005,6 +17122,9 @@ virNWFilterGetUUIDString(virNWFilterPtr nwfilter, char *buf) * Define a new network filter, based on an XML description * similar to the one returned by virNWFilterGetXMLDesc() * + * virNWFilterFree should be used to free the resources after the + * nwfilter object is no longer needed. + * * Returns a new nwfilter object or NULL in case of failure */ virNWFilterPtr @@ -17348,7 +17468,7 @@ virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***models, * without this flag features that are part of the CPU model will not be * listed. * - * Returns XML description of the computed CPU or NULL on error. + * Returns XML description of the computed CPU (caller frees) or NULL on error. */ char * virConnectBaselineCPU(virConnectPtr conn, @@ -18297,6 +18417,9 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot) * block copy operation; in that case, use virDomainBlockJobAbort() * to stop the block copy first. * + * virDomainSnapshotFree should be used to free the resources after the + * snapshot object is no longer needed. + * * Returns an (opaque) virDomainSnapshotPtr on success, NULL on failure. */ virDomainSnapshotPtr @@ -18966,6 +19089,9 @@ virDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) * * Get the current snapshot for a domain, if any. * + * virDomainSnapshotFree should be used to free the resources after the + * snapshot object is no longer needed. + * * Returns a domain snapshot object or NULL in case of failure. If the * current domain snapshot cannot be found, then the VIR_ERR_NO_DOMAIN_SNAPSHOT * error is raised. @@ -19005,6 +19131,9 @@ virDomainSnapshotCurrent(virDomainPtr domain, * * Get the parent snapshot for @snapshot, if any. * + * virDomainSnapshotFree should be used to free the resources after the + * snapshot object is no longer needed. + * * Returns a domain snapshot object or NULL in case of failure. If the * given snapshot is a root (no parent), then the VIR_ERR_NO_DOMAIN_SNAPSHOT * error is raised. -- 1.8.5.5

2 1

[libvirt] [PATCH] Actually fix the spec file
by Ján Tomko 08 Jul '14

08 Jul '14

There was a '%' missing before the last {rhel}. Tested on RHEL-7 this time. --- Trivial, but not pushed yet due to my bad commit history today. libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e5f9fb8..8d1acfa 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -522,7 +522,7 @@ BuildRequires: libapparmor-devel %if %{with_network} BuildRequires: dnsmasq >= 2.41 BuildRequires: iptables - %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0{?rhel} < 7) + %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0%{?rhel} < 7) BuildRequires: iptables-ipv6 %endif BuildRequires: radvd @@ -768,7 +768,7 @@ Requires: libvirt-daemon = %{version}-%{release} Requires: dnsmasq >= 2.41 Requires: radvd Requires: iptables - %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0{?rhel} < 7) + %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0%{?rhel} < 7) Requires: iptables-ipv6 %endif @@ -785,7 +785,7 @@ Summary: Nwfilter driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} Requires: iptables - %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0{?rhel} < 7) + %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0%{?rhel} < 7) Requires: iptables-ipv6 %endif Requires: ebtables -- 1.8.5.5

2 1

[libvirt] [PATCH] properly indent virSecurityLabelDefsParseXML() parameters
by Martin Kletzander 08 Jul '14

08 Jul '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as trivial src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 70f1103..b80e7cf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4664,9 +4664,9 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, static int virSecurityLabelDefsParseXML(virDomainDefPtr def, - xmlXPathContextPtr ctxt, - virCapsPtr caps, - unsigned int flags) + xmlXPathContextPtr ctxt, + virCapsPtr caps, + unsigned int flags) { size_t i = 0; int n; -- 2.0.0

1 0

[libvirt] [PATCH] Don't require iptables-ipv6 on >= F17 and RHEL >= 7
by Ján Tomko 08 Jul '14

08 Jul '14

We only need ip6tables, which is now a part of the iptables package: http://pkgs.fedoraproject.org/cgit/iptables.git/commit/?h=1392835 This needlessly pulls in iptables-services: https://bugzilla.redhat.com/show_bug.cgi?id=1101510 which can conflict with firewalld: https://bugzilla.redhat.com/show_bug.cgi?id=1101484 --- libvirt.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8802746..ba6054c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -522,7 +522,9 @@ BuildRequires: libapparmor-devel %if %{with_network} BuildRequires: dnsmasq >= 2.41 BuildRequires: iptables + %if 0%{?fedora} < 17 && 0%{?rhel} < 7 BuildRequires: iptables-ipv6 + %endif BuildRequires: radvd %endif %if %{with_nwfilter} @@ -766,7 +768,9 @@ Requires: libvirt-daemon = %{version}-%{release} Requires: dnsmasq >= 2.41 Requires: radvd Requires: iptables + %if 0%{?fedora} < 17 && 0%{?rhel} < 7 Requires: iptables-ipv6 + %endif %description daemon-driver-network The network driver plugin for the libvirtd daemon, providing @@ -781,7 +785,9 @@ Summary: Nwfilter driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} Requires: iptables + %if 0%{?fedora} < 17 && 0%{?rhel} < 7 Requires: iptables-ipv6 + %endif Requires: ebtables %description daemon-driver-nwfilter -- 1.8.5.5

2 2

[libvirt] [PATCH] properly set video ram size for qemu VGA video device
by Pavel Hrdina 08 Jul '14

08 Jul '14

https://bugzilla.redhat.com/show_bug.cgi?id=1076098 We support vram option for video devices in domain xml, but so far only for QXL it had some effect. VGA video device in QEMU can also accept the size of video ram and we should pass it. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_command.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fb64cda..09e29c9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4800,6 +4800,9 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def, /* QEMU accepts bytes for vram_size. */ virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); + } else if (video->type == VIR_DOMAIN_VIDEO_TYPE_VGA) { + /* QEMU accepts megabytes for vgamem_mb. */ + virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vram / 1024); } if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0) -- 1.8.5.5

4 3

[libvirt] [PATCH] Document the need to free vir*Ptr objects
by Ján Tomko 08 Jul '14

08 Jul '14

https://bugzilla.redhat.com/show_bug.cgi?id=994731 --- docs/api.html.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/api.html.in b/docs/api.html.in index eae7657..68ffa0b 100644 --- a/docs/api.html.in +++ b/docs/api.html.in @@ -159,6 +159,10 @@ </ul> </li> </ul> + <p>Note: functions returning vir*Ptr (like the virDomainLookup functions) + allocate memory which needs to be freed by the caller by the corresponding + vir*Free function (e.g. virDomainFree for a virDomainPtr object). + </p> <p> For more in-depth details of the storage related APIs see <a href="storage.html">the storage management page</a>. </p> -- 1.8.5.5

2 1

[libvirt] guest-fsfreeze-freeze: Does it allow for any guest-fsfreeze_hook in Windows guest machine.
by Puneet Bakshi 08 Jul '14

08 Jul '14

Hi, When guest agent command "guest-fsfreeze-freeze" is invoked on a linux VM, a hook is provided to do execute any pre-script before actually doing a freeze. int64_t qmp_guest_fsfreeze_freeze(Error **errp) { ::: execute_fsfreeze_hook(FSFREEZE_HOOK_FREEZE, &local_err); ::: } Can the same thing be done in case of Windows guest machine? I could not find similar thing in case of Windows ("qga_vss_fsfreeze()->requester_freeze()") where I can put a script (a hook) to do some preprocessing. Regards, ~Puneet

1 0

[libvirt] [PATCHv7 0/4] Rest of the relative backing and network commit series
by Peter Krempa 08 Jul '14

08 Jul '14

Rebased to current master. Peter Krempa (4): lib: Introduce flag VIR_DOMAIN_BLOCK_COMMIT_RELATIVE lib: Introduce flag VIR_DOMAIN_BLOCK_REBASE_RELATIVE qemu: Add support for networked disks for block commit qemu: Add support for networked disks for block pull/block rebase include/libvirt/libvirt.h.in | 6 ++++ src/libvirt.c | 8 +++++ src/qemu/qemu_driver.c | 83 +++++++++++++++++++++++++++++++++++++++----- tools/virsh-domain.c | 18 ++++++++-- tools/virsh.pod | 9 +++-- 5 files changed, 112 insertions(+), 12 deletions(-) -- 1.9.3

2 9

[libvirt] [PATCH 0/4] qemu: Support qemuDomainGetBlockInfo on remote storage
by Peter Krempa 08 Jul '14

08 Jul '14

And a few refactors. Peter Krempa (4): util: storage: Inline use of virStorageFileGetMetadataFromFDInternal util: storage: Allow specifying format for virStorageFileGetMetadataFromBuf storage: gluster: Optimize header reader functions qemu: refactor qemuDomainGetBlockInfo to work with remote storage src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 84 ++++++++++++++--------- src/storage/storage_backend_gluster.c | 48 ++----------- src/util/virstoragefile.c | 124 +++++++++++++++------------------- src/util/virstoragefile.h | 5 +- 5 files changed, 118 insertions(+), 144 deletions(-) -- 2.0.0

2 9

[libvirt] [PATCH] tools/wireshark: fix rpm build
by Pavel Hrdina 08 Jul '14

08 Jul '14

There is a missing include of $(top_srcdir)/include to handle "libvirt/libvirt.h" header file. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tools/wireshark/src/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/wireshark/src/Makefile.am b/tools/wireshark/src/Makefile.am index 40fe368..61ddb38 100644 --- a/tools/wireshark/src/Makefile.am +++ b/tools/wireshark/src/Makefile.am @@ -18,7 +18,11 @@ # # Author: Yuto KAWAMURA(kawamuray) -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/gnulib/lib +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/gnulib/lib ws_plugin_LTLIBRARIES = libvirt.la libvirt_la_SOURCES = packet-libvirt.h packet-libvirt.c plugin.c -- 1.8.5.5

2 2

[libvirt] [PATCH] LXC: introduce lxcDomainSetMemoryFlags
by Chen Hanxiao 08 Jul '14

08 Jul '14

In lxc, we could not use setmem command with --config options. This patch will add support for this. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 79c3b4a..68795cb 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -706,11 +706,19 @@ static int lxcDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) return ret; } -static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) +static int lxcDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, + unsigned int flags) { virDomainObjPtr vm; + virDomainDefPtr persistentDef = NULL; + virCapsPtr caps = NULL; int ret = -1; virLXCDomainObjPrivatePtr priv; + virLXCDriverPtr driver = dom->conn->privateData; + virLXCDriverConfigPtr cfg = NULL; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); if (!(vm = lxcDomObjFromDomain(dom))) goto cleanup; @@ -720,22 +728,38 @@ static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) if (virDomainSetMemoryEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (!(caps = virLXCDriverGetCapabilities(driver, false))) + goto cleanup; + + if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags, + &persistentDef) < 0) + goto cleanup; + if (newmem > vm->def->mem.max_balloon) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Cannot set memory higher than max memory")); goto cleanup; } - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is not running")); - goto cleanup; - } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + cfg = virLXCDriverGetConfig(driver); + persistentDef->mem.cur_balloon = newmem; + if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0) + goto cleanup; + } - if (virCgroupSetMemory(priv->cgroup, newmem) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("Failed to set memory for domain")); - goto cleanup; + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("Domain is not running")); + goto cleanup; + } + + if (virCgroupSetMemory(priv->cgroup, newmem) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("Failed to set memory for domain")); + goto cleanup; + } } ret = 0; @@ -743,9 +767,16 @@ static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) cleanup: if (vm) virObjectUnlock(vm); + virObjectUnref(caps); + virObjectUnref(cfg); return ret; } +static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) +{ + return lxcDomainSetMemoryFlags(dom, newmem, VIR_DOMAIN_AFFECT_LIVE); +} + static int lxcDomainSetMemoryParameters(virDomainPtr dom, virTypedParameterPtr params, @@ -5698,6 +5729,7 @@ static virDriver lxcDriver = { .domainGetMaxMemory = lxcDomainGetMaxMemory, /* 0.7.2 */ .domainSetMaxMemory = lxcDomainSetMaxMemory, /* 0.7.2 */ .domainSetMemory = lxcDomainSetMemory, /* 0.7.2 */ + .domainSetMemoryFlags = lxcDomainSetMemoryFlags, /* 1.2.7 */ .domainSetMemoryParameters = lxcDomainSetMemoryParameters, /* 0.8.5 */ .domainGetMemoryParameters = lxcDomainGetMemoryParameters, /* 0.8.5 */ .domainSetBlkioParameters = lxcDomainSetBlkioParameters, /* 0.9.8 */ -- 1.9.0

3 2

[libvirt] [PATCH] Do not allow changing the UUID of a nwfilter
by Ján Tomko 07 Jul '14

07 Jul '14

From: Hu Jianwei <jiahu(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=1077009 --- src/conf/nwfilter_conf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 0f633da..52f24e4 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -3058,6 +3058,17 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, return NULL; } virNWFilterObjUnlock(nwfilter); + } else { + nwfilter = virNWFilterObjFindByName(nwfilters, def->name); + if (nwfilter) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(nwfilter->def->uuid, uuidstr); + virReportError(VIR_ERR_OPERATION_FAILED, + _("filter '%s' already exists with uuid %s"), + def->name, uuidstr); + virNWFilterObjUnlock(nwfilter); + return NULL; + } } if (virNWFilterDefLoopDetect(nwfilters, def) < 0) { -- 1.8.5.5

2 1

[libvirt] Regression with 79f11b35
by Cole Robinson 07 Jul '14

07 Jul '14

I'm seeing a regression with: commit 79f11b35c77b3c286c84312dc9737c2ccbf67ed5 Author: Eric Blake <eblake(a)redhat.com> Date: Tue Apr 8 14:26:02 2014 -0600 conf: track user vs. canonical name through full chain lookup Setup info: $ ls -ld /mnt/data lrwxrwxrwx. 1 root root 17 Oct 24 2011 /mnt/data -> terabytedrv/data/ $ ls -l /mnt/data/devel/images/f18* -rw-r--r--. 1 qemu qemu 9316335616 Mar 30 18:36 /mnt/data/devel/images/f18-backing-img.qcow2 -rw-r--r--. 1 root root 6848249856 Apr 25 19:11 /mnt/data/devel/images/f18.qcow2 $ qemu-img info /mnt/data/devel/images/f18-backing-img.qcow2 image: /mnt/data/devel/images/f18-backing-img.qcow2 file format: qcow2 virtual size: 9.8G (10485760000 bytes) disk size: 8.7G cluster_size: 65536 Snapshot list: ID TAG VM SIZE DATE VM CLOCK 1 snapshot1 0 2014-01-13 18:48:43 00:00:00.000 2 snapshot2 0 2014-01-13 18:49:39 00:00:00.000 Format specific information: compat: 0.10 $ qemu-img info /mnt/data/devel/images/f18.qcow2 image: /mnt/data/devel/images/f18.qcow2 file format: qcow2 virtual size: 9.8G (10485760000 bytes) disk size: 6.4G cluster_size: 65536 backing file: f18-backing-img.qcow2 (actual path: /mnt/data/devel/images/f18-backing-img.qcow2) Format specific information: compat: 0.10 Before the patch: $ sudo virsh vol-dumpxml /mnt/data/devel/images/f18.qcow2 [full xml with backing image info] After the patch: $ sudo virsh vol-dumpxml /mnt/data/devel/images/f18.qcow2 [xml minus xml for the backing image] And these errors are on the console when the daemon starts: 2014-05-03 20:52:34.970+0000: 20600: error : virFindBackingFile:590 : Cannot access backing file './f18-backing-img.qcow2': No such file or directory 2014-05-03 20:52:34.970+0000: 20600: warning : virStorageFileGetMetadataInternal:868 : Backing file 'f18-backing-img.qcow2' of image '/mnt/data/devel/images/ztester-serial-f18.qcow2' is missing. On git head actually the vol-dumpxml explicitly fails, but I don't have the error handy. - Cole

1 1

[libvirt] QEMU snapshots on ZFS
by Arunas Ruksnaitis 07 Jul '14

07 Jul '14

I have a libvirt to control qemu domains with various flavours of Windows on Ubuntu 14.04 Trusty. The disk images are ZFS volumes. After I have resolved scheduling problems related to kernel (latest 3.15.3-031503-lowlatency kernel seems to have resolved scheduling and BSOD issues), I have never seen Windows to run this fast, even on bare iron. This is a WONDERFUL combination. Now I am starting to move forward, and have discovered that snapshot is only supported as QEMU native "savevm" command, which only works on QCOW2 backing image. Is there any chance to include support for ZFS native snapshots? I.e. do a coordinated RAM snapshot in a separate file, snapshot ZFS volume and tie these two together in a snapshot XML file. A related, but different question: any chance to support ZFS-backed storage pools, so that ZFS volumes could be created, and not QCOW images in ZFS file system (this is a waste of ZFS, as ZFS already has native COW, snapshots, cloning, migration and much more). Should I start a separate thread for this topic?

2 1

[libvirt] [PATCH] Free the return value of virFileFindResource
by Ján Tomko 07 Jul '14

07 Jul '14

Commits e18a80a and 57e5c3c switched from a getenv wrapper which does not allocate a string to virFileFindResource which does not, without freeing it. https://bugzilla.redhat.com/show_bug.cgi?id=1116427 --- src/locking/lock_driver_lockd.c | 2 ++ src/remote/remote_driver.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index c67bda6..1ca7772 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -273,11 +273,13 @@ static virNetClientPtr virLockManagerLockDaemonConnectionNew(bool privileged, if (virNetClientAddProgram(client, *prog) < 0) goto error; + VIR_FREE(daemonPath); VIR_FREE(lockdpath); return client; error: + VIR_FREE(daemonPath); VIR_FREE(lockdpath); virNetClientClose(client); virObjectUnref(client); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 88fc977..9d8120f 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1068,6 +1068,9 @@ doRemoteOpen(virConnectPtr conn, VIR_FREE(pkipath); VIR_FREE(knownHostsVerify); VIR_FREE(knownHosts); +#ifndef WIN32 + VIR_FREE(daemonPath); +#endif return retcode; -- 1.8.5.5

4 3

[libvirt] Where to get precompiled qga-vss.dll from ?
by Puneet Bakshi 07 Jul '14

07 Jul '14

Hi, I want to work with "guest-fsfreeze-*" commands in Windows 2008 guest VM. Host is CentOS 6.4. Windows 2008 is running QEMU VSS provider. When "guest-fsfreeze-*" commands are invoked from host, response received is "This is not supported". I am following http://lists.gnu.org/archive/html/qemu-devel/2013-02/msg01963.html. Regards, ~Puneet

2 1

[libvirt] [PATCHv2 0/2] smartcard/serial/parallel/console/channel auditing
by Peter Krempa 07 Jul '14

07 Jul '14

V2 adds docs to docs/auditlog.html.in and doesn't log the shared serial/console def twice. Sending for sanity review of language :) Peter Krempa (2): audit: Add auditing for serial/parallel/channel/console character devs audit: Audit smartcard devices docs/auditlog.html.in | 35 +++++++++++++++++++ src/conf/domain_audit.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_audit.h | 7 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_hotplug.c | 17 +++++---- 5 files changed, 144 insertions(+), 6 deletions(-) -- 1.9.3

3 6

[libvirt] [PATCH] doc: Be more specific about semantics of _REUSE_EXT flag
by Peter Krempa 07 Jul '14

07 Jul '14

Snapshots and block-copy have a flag that forces qemu to re-use existing file. Our docs weren't exactly clear on what the existing file should contain for this to actually work. Re-word the docs a bit to state that the file needs to be pre-created in the desired format and the backing chain metadata needs to be set prior to handing it over to qemu. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1084360 --- src/libvirt.c | 12 +++++++----- tools/virsh.pod | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index b80b484..e7a6aca 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -18274,10 +18274,12 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot) * destination files already exist as a non-empty regular file, the * snapshot is rejected to avoid losing contents of those files. * However, if @flags includes VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT, - * then the destination files must already exist and contain content - * identical to the source files (this allows a management app to - * pre-create files with relative backing file names, rather than the - * default of creating with absolute backing file names). + * then the destination files must be pre-created manually with + * the correct image format and metadata including backing store path. + * (this allows a management app to pre-create files with relative backing + * file names, rather than the default of creating with absolute backing + * file names). Note that setting incorrect metadata in the pre-created + * image may lead to the VM being unable to start. * * Be aware that although libvirt prefers to report errors up front with * no other effect, some hypervisors have certain types of failures where @@ -19731,7 +19733,7 @@ virDomainBlockPull(virDomainPtr dom, const char *disk, * by adding VIR_DOMAIN_BLOCK_REBASE_COPY_RAW to force the copy to be raw * (does not make sense with the shallow flag unless the source is also raw), * or by using VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT to reuse an existing file - * with initial contents identical to the backing file of the source (this + * which was pre-created with the correct format and metadata (this * allows a management app to pre-create files with relative backing file * names, rather than the default of absolute backing file names; as a * security precaution, you should generally only use reuse_ext with the diff --git a/tools/virsh.pod b/tools/virsh.pod index 1b6f3c4..39fe423 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -875,8 +875,8 @@ flattens the entire chain; but if I<--shallow> is specified, the copy shares the backing chain. If I<--reuse-external> is specified, then I<dest> must exist and have -contents identical to the resulting backing file (that is, it must -start with contents matching the backing file I<disk> if I<--shallow> +metadata identical to the resulting backing file (that is, it must +start with metadata matching the backing file I<disk> if I<--shallow> is used, otherwise it must start empty); this option is typically used to set up a relative backing file name in the destination. @@ -3165,7 +3165,8 @@ metadata again). If I<--reuse-external> is specified, and the snapshot XML requests an external snapshot with a destination of an existing file, then the -destination must exist, and is reused; otherwise, a snapshot is refused +destination must exist and be pre-created with correct format and +metadata. The file is then reused; otherwise, a snapshot is refused to avoid losing contents of the existing files. If I<--quiesce> is specified, libvirt will try to use guest agent @@ -3224,8 +3225,9 @@ results in the following XML: If I<--reuse-external> is specified, and the domain XML or I<diskspec> option requests an external snapshot with a destination of an existing -file, then the destination must exist, and is reused; otherwise, a -snapshot is refused to avoid losing contents of the existing files. +file, then the destination must exist and be pre-created with correct +format and metadata. The file is then reused; otherwise, a snapshot +is refused to avoid losing contents of the existing files. If I<--quiesce> is specified, libvirt will try to use guest agent to freeze and unfreeze domain's mounted file systems. However, -- 2.0.0

2 1

[libvirt] Follow-up on .so version number question
by Tony Asleson 07 Jul '14

07 Jul '14

Eric posted this a while back (ref: http://www.redhat.com/archives/libvir-list/2010-April/msg00226.html) without any apparent response/discussion. Can someone please elaborate on this? Thanks, Tony

2 1

[libvirt] new openvz driver (bossonvz)
by Bosson VZ 07 Jul '14

07 Jul '14

Hello, in the company I work for, we use openvz and qemu/kvm on our clusters side-by-side. To manage our domains, we used libvirt/qemu for qemu/kvm domains and vz tools for openvz domains in the past. This was very inconvinient since the management differed in many ways. So we have decided to unify our management and use libvirt exclusively. Since the openvz driver already included in libvirt lacks features that need, we have implemented a new libvirt backend driver for openvz called the bossonvz driver. Unlike the openvz driver, bossonvz is a complete, feature-rich stateful libvirt driver. It uses the libvirt driver API exclusively and communicates with the kernel directly, much like the LXC driver. The code is hugely inspired by the LXC driver and the Qemu driver, but adds a bit of functionality to the libvirt core too. More details and the source code can be found at http://bossonvz.bosson.eu/ The driver is completely independent of vz tools, it needs only a running vz kernel. One of the things, we are most proud of, is the possibility to access the domain's tty via VNC (hurray to uniform management web interfaces). Since the code was developed in-house (primarily for internal purposes), it is based on an older libvirt release (1.1.2). There are also some modifications to the libvirt core (virCommand) and the domain file (mount options syntax) which might need some redesign. At the moment I would like to get some feedback on the driver. In the future, I would like to see the driver merged upstream, and am prepared to do the work but I need to know if there is any interest in doing so. -- Cluster Design, s.r.o.

5 14

[libvirt] [PATCH v2] libxl: add discard support to libxl_device_disk
by Olaf Hering 07 Jul '14

07 Jul '14

Translate libvirt discard settings into libxl-4.5 discard settings. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- v2: add cast to switch variable to let compiler check if the code handles all enum values src/libxl/libxl_conf.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 8eeaf82..bb9b53d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -715,6 +715,33 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, return -1; } +static void +libxlDiskSetDiscard(libxl_device_disk *x_disk, int discard) +{ + if (!x_disk->readwrite) + return; +#if defined(LIBXL_HAVE_LIBXL_DEVICE_DISK_DISCARD_ENABLE) + switch ((enum virDomainDiskDiscard)discard) { + case VIR_DOMAIN_DISK_DISCARD_DEFAULT: + case VIR_DOMAIN_DISK_DISCARD_LAST: + break; + case VIR_DOMAIN_DISK_DISCARD_UNMAP: + libxl_defbool_set(&x_disk->discard_enable, true); + break; + case VIR_DOMAIN_DISK_DISCARD_IGNORE: + libxl_defbool_set(&x_disk->discard_enable, false); + break; + } +#else + if (discard == VIR_DOMAIN_DISK_DISCARD_DEFAULT) + return; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("This version of libxenlight does not support " + "discard= option passing")); +#endif +} + + int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -829,6 +856,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) x_disk->removable = 1; x_disk->readwrite = !l_disk->readonly; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; + libxlDiskSetDiscard(x_disk, l_disk->discard); /* An empty CDROM must have the empty format, otherwise libxl fails. */ if (x_disk->is_cdrom && !x_disk->pdev_path) x_disk->format = LIBXL_DISK_FORMAT_EMPTY;

2 1

[libvirt] [PATCH] libxl: add discard support to libxl_device_disk
by Olaf Hering 07 Jul '14

07 Jul '14

Translate libvirt discard settings into libxl-4.5 discard settings. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- default means leave decision to libxl. Not sure if that is what "default" in libvirt terms really means. src/libxl/libxl_conf.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index b7fed7f..4cb062e 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -713,6 +713,33 @@ libxlMakeDomBuildInfo(virDomainObjPtr vm, libxl_domain_config *d_config) return -1; } +static void +libxlDiskSetDiscard(libxl_device_disk *x_disk, int discard) +{ + if (!x_disk->readwrite) + return; +#if defined(LIBXL_HAVE_LIBXL_DEVICE_DISK_DISCARD_ENABLE) + switch (discard) { + case VIR_DOMAIN_DISK_DISCARD_DEFAULT: + break; + case VIR_DOMAIN_DISK_DISCARD_UNMAP: + libxl_defbool_set(&x_disk->discard_enable, true); + break; + default: + case VIR_DOMAIN_DISK_DISCARD_IGNORE: + libxl_defbool_set(&x_disk->discard_enable, false); + break; + } +#else + if (discard == VIR_DOMAIN_DISK_DISCARD_DEFAULT) + return; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("This version of libxenlight does not support " + "discard= option passing")); +#endif +} + + int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -827,6 +854,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) x_disk->removable = 1; x_disk->readwrite = !l_disk->readonly; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; + libxlDiskSetDiscard(x_disk, l_disk->discard); /* An empty CDROM must have the empty format, otherwise libxl fails. */ if (x_disk->is_cdrom && !x_disk->pdev_path) x_disk->format = LIBXL_DISK_FORMAT_EMPTY;

4 5

[libvirt] [libvirt-glib] spec: Substitute minimum glib2 version from configure.ac
by Christophe Fergeau 07 Jul '14

07 Jul '14

This way we don't have to keep track of the minimum glib2 version we need in 2 separate places. Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> --- configure.ac | 1 + libvirt-glib.spec.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 097f7f4..80ab703 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,7 @@ AM_SILENT_RULES([yes]) LIBVIRT_REQUIRED=0.10.2 AC_SUBST([LIBVIRT_REQUIRED]) dnl used in the .spec file GLIB2_REQUIRED=2.22.0 +AC_SUBST([GLIB2_REQUIRED]) dnl used in the .spec file GLIB2_TEST_REQUIRED=2.38.0 GOBJECT2_REQUIRED=2.10.0 GIO_REQUIRED=2.10.0 diff --git a/libvirt-glib.spec.in b/libvirt-glib.spec.in index 202e624..32ce4f0 100644 --- a/libvirt-glib.spec.in +++ b/libvirt-glib.spec.in @@ -30,7 +30,7 @@ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/glib/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glib2-devel >= 2.22.0 +BuildRequires: glib2-devel >= @GLIB2_REQUIRED@ BuildRequires: libvirt-devel >= %{libvirt_version} BuildRequires: python-devel %if %{with_introspection} -- 1.9.3

1 0

[libvirt] [PATCH] LXC: Allow setting max mem lower than current mem
by Ján Tomko 07 Jul '14

07 Jul '14

For inactive domains, set both current and maximum memory to the specified 'maximum memory' value. This matches the behavior of QEMU driver's SetMaxMemory. https://bugzilla.redhat.com/show_bug.cgi?id=1091132 --- src/lxc/lxc_driver.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9c006e9..b47ac5e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -692,9 +692,14 @@ static int lxcDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) goto cleanup; if (newmax < vm->def->mem.cur_balloon) { - virReportError(VIR_ERR_INVALID_ARG, - "%s", _("Cannot set max memory lower than current memory")); - goto cleanup; + if (!virDomainObjIsActive(vm)) { + vm->def->mem.cur_balloon = newmax; + } else { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Cannot set max memory lower than current" + " memory for an active domain")); + goto cleanup; + } } vm->def->mem.max_balloon = newmax; -- 1.8.5.5

2 1

[libvirt] [PATCH] virsh: domain: Use inactive XML when unplugging interface with --config
by Peter Krempa 07 Jul '14

07 Jul '14

Similary to cmdDetachDisk fetch the inactive definition when --config is specified as the active may not contain the network interface if it was plugged with --config. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1056902 --- tools/virsh-domain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b1ab911..3efaced 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10131,7 +10131,12 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (!(doc = virDomainGetXMLDesc(dom, 0))) + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + doc = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE); + else + doc = virDomainGetXMLDesc(dom, 0); + + if (!doc) goto cleanup; if (!(xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt))) { -- 1.9.3

2 2

[libvirt] [PATCH] virt-lxc-convert: make free return values in bytes
by Cédric Bosdonnat 07 Jul '14

07 Jul '14

Tiny fix for virt-lxc-convert: we are setting memory values in bytes, while free may give us values in a different unit by default: force free to output bytes with -b flag. --- examples/lxcconvert/virt-lxc-convert | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/lxcconvert/virt-lxc-convert b/examples/lxcconvert/virt-lxc-convert index 7220153..e62172e 100644 --- a/examples/lxcconvert/virt-lxc-convert +++ b/examples/lxcconvert/virt-lxc-convert @@ -64,7 +64,7 @@ if test -r "$fstab"; then sed 's/^$[^#]$/lxc.mount.entry = \1/' "$fstab" >>"${conf_new}" fi -memory=$(free | sed -n '/Mem:/s/ \+/ /gp' | cut -f 2 -d ' ') +memory=$(free -b | sed -n '/Mem:/s/ \+/ /gp' | cut -f 2 -d ' ') default_tmpfs="size=$((memory/2))" # Do we have tmpfs without size param? -- 1.8.4.5

2 1

[libvirt] [PATCH] qemu: dump: Report better error when dumping VM with passthrough devices
by Peter Krempa 07 Jul '14

07 Jul '14

For the regular dump operation we migrate the VM to a file. This won't work when the VM has passthrough devices assigned. Rather than reporting a cryptic error from qemu run our check whether it can be migrated. This does not influence the memory-only dump that is allowed with passthrough devices. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=874418 --- src/qemu/qemu_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d1aa9e..fe76d55 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3481,6 +3481,10 @@ doCoreDump(virQEMUDriverPtr driver, "memory-only dump")); goto cleanup; } + + if (!qemuMigrationIsAllowed(driver, vm, vm->def, false, false)) + goto cleanup; + ret = qemuMigrationToFile(driver, vm, fd, 0, path, qemuCompressProgramName(compress), false, QEMU_ASYNC_JOB_DUMP); -- 2.0.0

2 2

[libvirt] [PATCH] LXC: remove duplicate controller check code
by Chen Hanxiao 07 Jul '14

07 Jul '14

We invoked virCgroupHasController twice for checking VIR_CGROUP_CONTROLLER_DEVICES in lxcDomainAttachDeviceDiskLive. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index fce16f2..9c006e9 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4052,12 +4052,6 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, goto cleanup; } - if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("devices cgroup isn't mounted")); - goto cleanup; - } - perms = (def->readonly ? VIR_CGROUP_DEVICE_READ : VIR_CGROUP_DEVICE_RW) | -- 1.9.0

2 1

[libvirt] Possible to set iSCSI initiator-name?
by Richard W.M. Jones 06 Jul '14

06 Jul '14

Glancing at the libvirt code in git, it doesn't appear to be possible to set the iSCSI initiator name for domains which are backed with iSCSI disks. Some background: When qemu contacts the iSCSI target, it sends its own initiator name, which, if not set, defaults to 'iqn.2008-11.org.linux-kvm'. Some iSCSI targets have variable configuration keyed on the initiator name -- that is definitely the case for a userspace iscsi target that I tested (called pyTarget[1]), and for a libguestfs user's unspecified target[2]. qemu lets you override the default initiator name[3] using: qemu -iscsi initiator-name=iqn.YYYY-MM... This appears to be a global setting. I'm not clear if it makes sense or is possible to have multiple initiator names for a single qemu. I'm not missing something am I? (Note I'm not talking about storage pools which do have a way to specify initiator name). Rich. [1] https://pytarget.codeplex.com/ [2] https://www.redhat.com/archives/libguestfs/2014-July/msg00013.html [3] https://lists.gnu.org/archive/html/qemu-devel/2012-01/msg02765.html -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top

1 0

[libvirt] Not able to run "virsh qemu-agent-command" when socat is working
by Puneet Bakshi 05 Jul '14

05 Jul '14

Hi, I am running qemu guest agent in Windows 2k8. I am able to execute "qemu-agent-commands" using socat but not through "virsh qemu-agent-command". *Guest VM xml* <controller type='virtio-serial' index='0'> <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </controller> <channel type='unix'> <source mode='bind' path='/var/lib/libvirt/qemu/g06.agent'/> <target type='virtio' name='org.qemu.guest_agent.1'/> <alias name='channel0'/> <address type='virtio-serial' controller='0' bus='0' port='1'/> </channel> *Guest win2k8 is running following command* C:\qemu-ga> qemu-ga.exe -t c:\qemu-ga -p \\.Global\org.qemu.guest_agent.1 *Host CentOS system* socat returns response appropriately. [root@sdsr720-14 ~]# echo "{'execute':'guest-ping'}" | socat stdio,ignoreeof /var/lib/libvirt/qemu/g06.agent {"return": {}} *"virsh qemu-agent-command" returns blank.* [root@sdsr720-14 ~]# virsh qemu-agent-command vm_win_06 '{ "execute": "guest_ping"}' [root@sdsr720-14 ~]# Why "virsh qemu-agent-command" is not working? Am I doing something wrong here? Regards, ~Puneet

2 2

[libvirt] [PATCH 0/2] docs: hacking and formatdomain fixes
by Michele Paolino 04 Jul '14

04 Jul '14

replaced link in haking.html.in and fixed XML tags in formatdomain.html.in Michele Paolino (2): docs: Fix broken link in the HACKING page docs: formatdomain.html fixes docs/formatdomain.html.in | 8 ++++---- docs/hacking.html.in | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) -- 1.9.3

3 5

[libvirt] [PATCHv6 0/7] Rest of the relative backing and network commit series
by Peter Krempa 04 Jul '14

04 Jul '14

Mostly cosmetical changes since the last round. Peter Krempa (7): qemu: caps: Add capability for change-backing-file command qemu: monitor: Add argument for specifying backing name for block commit qemu: monitor: Add support for backing name specification for block-stream lib: Introduce flag VIR_DOMAIN_BLOCK_COMMIT_RELATIVE lib: Introduce flag VIR_DOMAIN_BLOCK_REBASE_RELATIVE qemu: Add support for networked disks for block commit qemu: Add support for networked disks for block pull/block rebase include/libvirt/libvirt.h.in | 6 +++ src/libvirt.c | 8 ++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 87 +++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.c | 6 +-- src/qemu/qemu_monitor.c | 22 ++++++----- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 17 +++++++++ src/qemu/qemu_monitor_json.h | 2 + tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 18 ++++++++- tools/virsh.pod | 9 ++++- 13 files changed, 156 insertions(+), 28 deletions(-) -- 1.9.3

2 9

[libvirt] [PATCH 0/6] audit: Improve disk auditing and add auditing of new device types
by Peter Krempa 04 Jul '14

04 Jul '14

Peter Krempa (6): util: storage: Add helper to determine whether storage is local conf: audit: rng: Reorder new and old RNG device definitions conf: audit: Split out common steps to audit domain devices audit: disk: Refactor disk auditing to avoid auditing remote storage audit: Add auditing for serial/parallel/channel/console characted devs audit: Audit smartcard devices src/conf/domain_audit.c | 281 +++++++++++++++++++++++++--------------------- src/conf/domain_audit.h | 11 +- src/libvirt_private.syms | 2 + src/lxc/lxc_driver.c | 6 +- src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_hotplug.c | 38 +++---- src/util/virstoragefile.c | 7 ++ src/util/virstoragefile.h | 1 + 8 files changed, 198 insertions(+), 152 deletions(-) -- 1.9.3

2 19

[libvirt] [PATCH 0/2] Adapt to wireshark-1.12
by Michal Privoznik 04 Jul '14

04 Jul '14

With the new wireshark installed I've noticed couple of build breaks. This fixes the problems I've seen. Michal Privoznik (2): wireshark: Include more of libvirt internals wireshark: Honor API change coming with 1.12 release tools/wireshark/src/Makefile.am | 2 +- tools/wireshark/src/packet-libvirt.c | 35 +++++++++++++++++++++++++++++++-- tools/wireshark/src/packet-libvirt.h | 18 ++--------------- tools/wireshark/util/make-dissector-reg | 7 +++++++ 4 files changed, 43 insertions(+), 19 deletions(-) -- 1.8.5.5

3 5

[libvirt] [PATCH]util:ovs:Delete port if it is exist when add port
by Lichunhe 04 Jul '14

04 Jul '14

If the ovs service stop abnormal, or host cold reboot, vm is destroyed after ovs service stop. The ovs port which connect to interface of vm will not be clear. When the ovs service restart, recover configuration from db, but the interface is no exist, port recovery failed, and then vm restart on the same host, libvirt add port again, but the port configuration is same as before, ovs will not connect the interface, only store the configuration in db. Below will trigger this problem, virsh start vm service openvswitch-switch stop virsh destroy vm service openvswitch-switch start virsh start vm Signed-off-by: Chunhe Li <lichunhe(a)huawei.com> --- src/util/virnetdevopenvswitch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 9bcbfb1..dd601c0 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -84,7 +84,8 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, cmd = virCommandNew(OVSVSCTL); - virCommandAddArgList(cmd, "--timeout=5", "--", "--may-exist", "add-port", + virCommandAddArgList(cmd, "--timeout=5", "--", "--if-exists", "del-port", + ifname, "--", "--may-exist", "add-port", brname, ifname, NULL); if (virtVlan && virtVlan->nTags > 0) {

2 3

[libvirt] [PATCH 0/5] Reorganize storage auth (both disk and pool)
by John Ferlan 03 Jul '14

03 Jul '14

While understandably not really a 1.2.6 candidate, I figured I'd post this now in hopes that it gets the ball rolling. The changes will help with a related bz to support libiscsi for SCSI passthrough devices where a <hostdev> entry for an iscsi adapter would be able to have <auth> data. The bulk of changes are code motion/merge. The details for each are: The first patch will create new API's which will then be used by the parse domain disk and the parse storage pool code if the "<auth" element is found. The logic merges the parsing found in the domain disk and storage pool code with one slight caveat - the domain disk code expects to find "<secret type='xxxx'", where xxxx is 'iscsi' or 'ceph'. Trying use the Type{To/From}String API's in virstoragefile.c resulted in a link time failure (even though secret_conf.h was included). Never quite figured it out - I will take suggestions though. Although since the domain disk code is all that really cares about it and the domain_conf code can use the Type{To/From}String API's - I just left it as is. The new copy API is used when the pool code needs to copy it's auth data into each domain disk's auth entry. The second patch will fix a not-run test that tests the auth. It seems it was not added to the active list of tests because the output generated did not include the "usage" information (eg " usage='mycluster_myname") that is part of the <secret> element. Additionally because it did not include it the output was "<secret type='iscsi' </auth>". So rather than ignore the test - add to the filters to avoid looking for "<secret" - through to the closing ">". The -auth.xml and -auth.args files needed adjustments to follow the non "-auth" version of the files that have changed over time, but not also changed int the "-auth" files. The third patch will cause the domain disk algorithms to utilize the new generic parse and format APIs as well as using the 'authdef' instead of the inline structure fields. This patch also restores the checking for </auth> in the recently restored auth test. Still avoiding the whole <secret... /> line as I saw no way to filter just the usage that's in the stored XML file. The fourth patch is a mostly innocuous html change - it could go early, but it just felt better in this place. The fifth patch will cause the storage pool algorithms to utilize the new generic parse/format API's as well as new authdef structure for accessing the data. The removal of the duplicated cephx/chap structures seems (in my mind at least) to simplify things. They were essentially copies of each other with no seemingly real value in keeping separate other than the visual in the code of ".chap." or ".cephx.". John Ferlan (5): virstorage: Introduce virStorageAuthDef qemuargv2xmltest: Resurrect RBD and iSCSI auth Utilize virDomainDiskAuth for domain disk formatdomain: Fix issues found describing auth Utilize virDomainDiskAuth for storage pools docs/formatdomain.html.in | 24 +-- src/conf/domain_conf.c | 106 ++-------- src/conf/storage_conf.c | 152 ++------------ src/conf/storage_conf.h | 38 +--- src/libvirt_private.syms | 5 +- src/qemu/qemu_command.c | 72 ++++--- src/qemu/qemu_conf.c | 46 +---- src/storage/storage_backend_iscsi.c | 41 ++-- src/storage/storage_backend_rbd.c | 65 +++--- src/util/virstoragefile.c | 219 +++++++++++++++++++-- src/util/virstoragefile.h | 37 +++- tests/qemuargv2xmltest.c | 3 + ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 4 +- .../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 12 +- .../qemuxml2argv-disk-drive-network-rbd-auth.xml | 4 +- 15 files changed, 415 insertions(+), 413 deletions(-) -- 1.9.3

3 13

[libvirt] [PATCH v4 0/5] Another version of active commit
by Eric Blake 03 Jul '14

03 Jul '14

Rebased to latest libvirt.git, and still waiting on Jeff's qemu patches to go into qemu.git before I can push any of these, https://lists.gnu.org/archive/html/qemu-devel/2014-06/msg04060.html but reposting because of a feature Adam had been requesting: Patch 3/5 is new, and adds a new <activecommit/> marker to the 'virsh capabilities' output if qemu is detected as supporting active commit. I've resolved some of Peter's review comments in patches 1 and 2 (patch 1 underwent a bit of a rewrite to differentiate the qemu capability probe from normal use of the interface, and 2 dropped mention of RHEL 6.3 except in the commit message). At this point, I haven't altered 4 or 5, although I still need to do something about getting a persistent domain definition updated after a pivot changes the file in use by a running domain. I've forced an update to my git repo: http://repo.or.cz/w/libvirt/ericb.git/shortlog/refs/heads/gluster or git checkout git://repo.or.cz/libvirt/ericb.git gluster Eric Blake (5): blockjob: allow omitted arguments to QMP block-commit blockjob: turn on qemu capability bit for active commit blockjob: expose active commit capability blockcommit: track job type in xml blockcommit: turn on active commit docs/formatcaps.html.in | 46 +++++++++++++++- docs/formatdomain.html.in | 20 +++---- docs/schemas/capability.rng | 5 ++ docs/schemas/domaincommon.rng | 13 +++++ src/conf/capabilities.c | 3 +- src/conf/domain_conf.c | 33 +++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 13 +++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 53 ++++++++++++++---- src/qemu/qemu_monitor.c | 12 +++++ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 29 ++++++++-- src/qemu/qemu_monitor_json.h | 3 +- src/qemu/qemu_process.c | 18 ++++--- tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 62 ++++++++++++---------- tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 62 ++++++++++++---------- tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 62 ++++++++++++---------- tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 62 ++++++++++++---------- tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 62 ++++++++++++---------- tests/qemumonitorjsontest.c | 47 ++++++++++++++++ .../qemuxml2argv-disk-active-commit.xml | 37 +++++++++++++ .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 4 +- .../qemuxml2xmlout-disk-mirror-old.xml | 4 +- tests/qemuxml2xmltest.c | 1 + 25 files changed, 481 insertions(+), 173 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml -- 1.9.3

2 14

[libvirt] [PATCH v2] tests: Avoid double linking some libraries
by Michal Privoznik 03 Jul '14

03 Jul '14

The problem is, since 614581f32b domaincapstest is linked with $(LDADDS) by default. Then, since 94e3f23e8a7 the test may be conditionally linked with $(qemu_LDADDS) which already contains $(LDADDS). And some linkers doesn't cope with this nicely: CCLD domaincapstest ../src/libvirt_probes.o:(.probes+0x0): multiple definition of `libvirt_event_poll_add_handle_semaphore' ../src/libvirt_probes.o:(.probes+0x0): first defined here ../src/libvirt_probes.o:(.probes+0x2): multiple definition of `libvirt_event_poll_update_handle_semaphore' ../src/libvirt_probes.o:(.probes+0x2): first defined here ../src/libvirt_probes.o:(.probes+0x4): multiple definition of `libvirt_event_poll_remove_handle_semaphore' ../src/libvirt_probes.o:(.probes+0x4): first defined here ../src/libvirt_probes.o:(.probes+0x6): multiple definition of `libvirt_event_poll_dispatch_handle_semaphore' ../src/libvirt_probes.o:(.probes+0x6): first defined here And so on. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -fix securityselinuxlabeltest too tests/Makefile.am | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a262c7b..bc1040a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -509,12 +509,11 @@ endif WITH_STORAGE if WITH_DTRACE_PROBES qemu_LDADDS += ../src/libvirt_qemu_probes.lo endif WITH_DTRACE_PROBES -qemu_LDADDS += $(LDADDS) qemuxml2argvtest_SOURCES = \ qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuxml2argvtest_LDADD = $(qemu_LDADDS) $(LIBXML_LIBS) +qemuxml2argvtest_LDADD = $(qemu_LDADDS) $(LDADDS) $(LIBXML_LIBS) qemuxml2argvmock_la_SOURCES = \ qemuxml2argvmock.c @@ -525,62 +524,64 @@ qemuxml2argvmock_la_LDFLAGS = -module -avoid-version \ qemuxml2xmltest_SOURCES = \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuxml2xmltest_LDADD = $(qemu_LDADDS) +qemuxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuxmlnstest_SOURCES = \ qemuxmlnstest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuxmlnstest_LDADD = $(qemu_LDADDS) +qemuxmlnstest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuargv2xmltest_SOURCES = \ qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuargv2xmltest_LDADD = $(qemu_LDADDS) +qemuargv2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h -qemuhelptest_LDADD = $(qemu_LDADDS) +qemuhelptest_LDADD = $(qemu_LDADDS) $(LDADDS) qemumonitortest_SOURCES = qemumonitortest.c testutils.c testutils.h -qemumonitortest_LDADD = $(qemu_LDADDS) +qemumonitortest_LDADD = $(qemu_LDADDS) $(LDADDS) qemumonitorjsontest_SOURCES = \ qemumonitorjsontest.c \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemumonitorjsontest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) +qemumonitorjsontest_LDADD = libqemumonitortestutils.la \ + $(qemu_LDADDS) $(LDADDS) qemucapabilitiestest_SOURCES = \ qemucapabilitiestest.c \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemucapabilitiestest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) +qemucapabilitiestest_LDADD = libqemumonitortestutils.la \ + $(qemu_LDADDS) $(LDADDS) qemucaps2xmltest_SOURCES = \ qemucaps2xmltest.c \ testutils.c testutils.h \ $(NULL) -qemucaps2xmltest_LDADD = $(qemu_LDADDS) +qemucaps2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuagenttest_SOURCES = \ qemuagenttest.c \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemuagenttest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) +qemuagenttest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) $(LDADDS) qemuhotplugtest_SOURCES = \ qemuhotplugtest.c \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemuhotplugtest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) +qemuhotplugtest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) $(LDADDS) domainsnapshotxml2xmltest_SOURCES = \ domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) +domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) else ! WITH_QEMU EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \ @@ -837,7 +838,7 @@ domaincapstest_LDADD = $(LDADDS) if WITH_QEMU domaincapstest_SOURCES += testutilsqemu.c testutilsqemu.h -domaincapstest_LDADD += $(qemu_LDADDS) +domaincapstest_LDADD += $(qemu_LDADDS) $(GNULIB_LIBS) endif WITH_QEMU if WITH_LIBVIRTD @@ -1055,7 +1056,7 @@ if WITH_QEMU securityselinuxlabeltest_SOURCES = \ securityselinuxlabeltest.c testutils.h testutils.c \ testutilsqemu.h testutilsqemu.c -securityselinuxlabeltest_LDADD = $(qemu_LDADDS) $(SELINUX_LIBS) +securityselinuxlabeltest_LDADD = $(qemu_LDADDS) $(LDADDS) $(SELINUX_LIBS) securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la \ ../src/libvirt.la endif WITH_QEMU -- 1.8.5.5

3 3

[libvirt] [PATCH] tests: Avoid double linking some libraries
by Michal Privoznik 03 Jul '14

03 Jul '14

The problem is, since 614581f32b domaincapstest is linked with $(LDADDS) by default. Then, since 94e3f23e8a7 the test may be conditionally linked with $(qemu_LDADDS) which already contains $(LDADDS). And some linkers doesn't cope with this nicely: CCLD domaincapstest ../src/libvirt_probes.o:(.probes+0x0): multiple definition of `libvirt_event_poll_add_handle_semaphore' ../src/libvirt_probes.o:(.probes+0x0): first defined here ../src/libvirt_probes.o:(.probes+0x2): multiple definition of `libvirt_event_poll_update_handle_semaphore' ../src/libvirt_probes.o:(.probes+0x2): first defined here ../src/libvirt_probes.o:(.probes+0x4): multiple definition of `libvirt_event_poll_remove_handle_semaphore' ../src/libvirt_probes.o:(.probes+0x4): first defined here ../src/libvirt_probes.o:(.probes+0x6): multiple definition of `libvirt_event_poll_dispatch_handle_semaphore' ../src/libvirt_probes.o:(.probes+0x6): first defined here And so on. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I'd push this as build breaker, but there's another approach to consider, create qemu_BARE_LDADDS and fill it with the qemu_impl, etc. Then, let: qemu_LDADDS = $(qemu_BARE_LDADDS) $(LDADDS) What's your preference? tests/Makefile.am | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a262c7b..b9a6345 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -509,12 +509,11 @@ endif WITH_STORAGE if WITH_DTRACE_PROBES qemu_LDADDS += ../src/libvirt_qemu_probes.lo endif WITH_DTRACE_PROBES -qemu_LDADDS += $(LDADDS) qemuxml2argvtest_SOURCES = \ qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuxml2argvtest_LDADD = $(qemu_LDADDS) $(LIBXML_LIBS) +qemuxml2argvtest_LDADD = $(qemu_LDADDS) $(LDADDS) $(LIBXML_LIBS) qemuxml2argvmock_la_SOURCES = \ qemuxml2argvmock.c @@ -525,62 +524,64 @@ qemuxml2argvmock_la_LDFLAGS = -module -avoid-version \ qemuxml2xmltest_SOURCES = \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuxml2xmltest_LDADD = $(qemu_LDADDS) +qemuxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuxmlnstest_SOURCES = \ qemuxmlnstest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuxmlnstest_LDADD = $(qemu_LDADDS) +qemuxmlnstest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuargv2xmltest_SOURCES = \ qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuargv2xmltest_LDADD = $(qemu_LDADDS) +qemuargv2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h -qemuhelptest_LDADD = $(qemu_LDADDS) +qemuhelptest_LDADD = $(qemu_LDADDS) $(LDADDS) qemumonitortest_SOURCES = qemumonitortest.c testutils.c testutils.h -qemumonitortest_LDADD = $(qemu_LDADDS) +qemumonitortest_LDADD = $(qemu_LDADDS) $(LDADDS) qemumonitorjsontest_SOURCES = \ qemumonitorjsontest.c \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemumonitorjsontest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) +qemumonitorjsontest_LDADD = libqemumonitortestutils.la \ + $(qemu_LDADDS) $(LDADDS) qemucapabilitiestest_SOURCES = \ qemucapabilitiestest.c \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemucapabilitiestest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) +qemucapabilitiestest_LDADD = libqemumonitortestutils.la \ + $(qemu_LDADDS) $(LDADDS) qemucaps2xmltest_SOURCES = \ qemucaps2xmltest.c \ testutils.c testutils.h \ $(NULL) -qemucaps2xmltest_LDADD = $(qemu_LDADDS) +qemucaps2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuagenttest_SOURCES = \ qemuagenttest.c \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemuagenttest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) +qemuagenttest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) $(LDADDS) qemuhotplugtest_SOURCES = \ qemuhotplugtest.c \ testutils.c testutils.h \ testutilsqemu.c testutilsqemu.h \ $(NULL) -qemuhotplugtest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) +qemuhotplugtest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) $(LDADDS) domainsnapshotxml2xmltest_SOURCES = \ domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) +domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) else ! WITH_QEMU EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \ @@ -837,7 +838,7 @@ domaincapstest_LDADD = $(LDADDS) if WITH_QEMU domaincapstest_SOURCES += testutilsqemu.c testutilsqemu.h -domaincapstest_LDADD += $(qemu_LDADDS) +domaincapstest_LDADD += $(qemu_LDADDS) $(GNULIB_LIBS) endif WITH_QEMU if WITH_LIBVIRTD -- 1.8.5.5

3 5

[libvirt] RFC: 'old' event for leaseshelper.c when lease renews
by Nehal J Wani 03 Jul '14

03 Jul '14

In the current version of dnsmasq, the leases helper script/program specified by --dhcp-script to dnsmasq is invoked on three events, 'add', 'old', 'del'. In short, add: -> a new lease has to be added to db del: -> a lease has to be deleted from db old:-> if lease has changed Now, the lease can be considered to be changed in 2 ways. [standard-change] The change could be to the associated hostname or MAC address [auxiliary-change] The change associated with expiry time or clientid When only --dhcp-script is set, 'old' events are sent only for standard-lease changes. But when --dhcp-script is set along with --leasefile-ro, 'old' events are sent for any change in the lease. So, right now, if a lease is renewed, the reflected change doesn't appear in our JSON formatted lease database <interface-name>.status. We have the following options with this: (i) We can simply add the --leasefile-ro option. But in that case, the leases file database which is generated by dnsmasq by the name <network-name>.leases will cease to exist. It won't contain any lease information. All lease database handling will be done by our leaseshelper. Note: this option given a lot of information which is not stored in <network-name>.leases file. (ii) We ask the dnsmasq developer(s) to add an extra command line option to enable auxiliary changes in lease to be propagated to leaseshelper via 'old' events. I had a small conversation with Simon Kelley, and he said: "Yes. For that application (libvirt), you clearly don't want a third-party patch. At very least I'd be willing to add a boolean option to dnsmasq which enables "old" events when the lease expiry time changes, independent of leasefile-ro." If we do this, then can retain <network-name>.leases and have our helper too. (iii) We do nothing. IMO, we should go for (i), since <network-name>.leases becomes obsolete, once we have our own leases helper. Also, enabling --leasefile-ro enables a lot of other options, like vendor-class, user-class, circuit-id and much more, which may be asked for in future and get added to the virNetworkDHCPLeases struct. But we will have to remove the option --dhcp-leasefile. Although it won't affect any existing APIs, if people did rely on the dnsmasq's generated leases file before, they will find it missing. There is one more point. The man page of dnsmasq for the leasefile-ro option, states, "In addition to the invocations given in --dhcp-script the lease-change script is called once, at dnsmasq startup, with the single argument "init". When called like this the script should write the saved state of the lease database, in dnsmasq leasefile format, to stdout and exit with zero exit code." This is something extra that we will have to add to leaseshelper if we go with (i). The easier option is to go with (ii), since Simon is already willing to add that functionality. -- Nehal J Wani

3 6

[libvirt] [RFC]KVM VMs stay in pause state too long in finish phase during migration
by Wang Rui 03 Jul '14

03 Jul '14

Hi, I started a VM on KVM environment(libvirt1.2.6 qemu1.5.1). I found that the startup thread keeps vm lock too long. And this would cause other VMs paused(both on src and dest) too long during migration. Steps to Reproduce: 1. Define and start three VMs(VMA, VMB, VMC) on source host with 16 NICs for each. XML configuration for NIC: <interface type='bridge'> <source bridge='br0'/> <model type='virtio'/> </interface> 2. Migrate the three VMs from source host to destination host concurrently. 3. On destination host, the three VMs may do the following operation: 1) VMA: do qemuProcessStart(get VM lock until end) -> .. -> virNetDevTapCreateInBridgePort(). This function costs time 0.28s per NIC, and 16 NICs costs about 4s. The following log shows time cost for creating NICs on my host. And it seems that the time of creating NICs is different between hosts. 2014-07-03 08:40:41.283+0000: 47007: info : remoteDispatchAuthList:2781 : Bypass polkit auth for privileged client pid:47635,uid:0 2014-07-03 08:40:41.285+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:41.560+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:41.852+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:42.144+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:42.464+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:42.756+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:43.076+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:43.372+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:43.680+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:43.972+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:44.268+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:44.560+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:44.720+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:44.804+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:44.888+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:45.040+0000: 47009: info : virNetDevProbeVnetHdr:203 : Enabling IFF_VNET_HDR 2014-07-03 08:40:45.369+0000: 47009: warning : qemuDomainObjTaint:1670 : Domain id=7 name='suse11sp3_test_7' uuid=94c4ac0b-3a6a-41aa-b16c-80aa7adbc6b8 is tainted: high-privileges 2014-07-03 08:40:45.708+0000: 47009: info : virSecurityDACSetOwnership:227 : Setting DAC user and group on '/home/wcj/DTS/suse11sp3_test_7' to '0:0' 2) VMB: do qemuMigrationPrepareAny() -> virDomainObjListAdd(). This function acquires driver->doms lock. And then virHashSearch() waits for VMA's vm lock which is hold by VMA's qemuProcessStart() thread. 3) VMC: do qemuDomainMigrateFinish3 -> virDomainObjListFindByName. This operation waits for driver->doms lock which is hold by VMB's qemuMigrationPrepareAny() thread. As VMC is in finish phase, it's in pause state on both source host and destination host. In the worst case, VMC may stay in pause state for about 4s during migration. And the pause time increased if we migrate more VMs concurrently. VirNetDevTapCreateInBridgePort() which holds vm lock costs a little long time. IMHO it would be nice to do some lock optimization for this case. (I think it makes little sense to optimize the time of creating net device. Because even though the time is reduced to 0.1s, if vm has 16 NICs, the vm lock will be held for more than 1.6s.) Any ideas?

1 0

[libvirt] [PATCH] xenapiConnectGetCapabilities: Remove unused 'cleanup' label
by Michal Privoznik 03 Jul '14

03 Jul '14

In the lastest rework (9e7ecabf) a cleanup label was left over which results in compilation error. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build-breaker rule. src/xenapi/xenapi_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index e3bb77e..316e274 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -447,7 +447,7 @@ xenapiConnectGetCapabilities(virConnectPtr conn) virCapsPtr caps = ((struct _xenapiPrivate *)(conn->privateData))->caps; if (caps) return virCapabilitiesFormatXML(caps); - cleanup: + xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, _("Capabilities not available")); return NULL; -- 1.8.5.5

1 0