July 2014 - Devel - libvirt List Archives

[libvirt] [PATCHv5 00/28] Refactor changing of domain disk source
by Peter Krempa 09 Jul '14

09 Jul '14

v4 wasn't reviewed, but recent patches caused pretty serious conflicts thus I'm posting a rebased version. Note that one of the patches was already pushed as a part of a different series. This series is also a preparation for fixing issue with libvirt not setting correct permissions on gluster volumes. Peter Krempa (28): storage: Implement virStorageFileCreate for local and gluster files qemu: Don't propagate whole disk definition into qemuDomainGetImageIds qemu: Add helper to initialize storage file backend with correct uid/gid storage: file: Tolerate NULL src when uninitializing the backend conf: Don't output seclabels for backingStore elements storage: Move readonly and shared flags to disk source from disk def util: storagefile: Add deep copy for struct virStorageSource util: storage: Add function to transfer config parts to new chain element util: storage: Copy parent's disk metadata to backing chain elements util: cgroup: Add helper to convert device mode to string qemu: cgroup: Add functions to set cgroup image stuff on individual imgs qemu: cgroup: Setup only the top level disk image for read-write access locking: Add APIs to lock individual image files security: Introduce APIs to label single images security: selinux: Implement per-image seclabel restore security: selinux: Implement per-image seclabel set security: DAC: Implement per-image seclabel restore security: DAC: Implement per-image seclabel set security: AppArmor: Implement per-image seclabel restore security: AppArmor: Implement per-image seclabel set util: storage: Make virStorageFileChainLookup more network storage aware util: storage: Return complete parent info from virStorageFileChainLookup qemu: blockcopy: Use the mirror disk source to label the files qemu: block: Properly track disk source while pivotting to new image qemu: snapshot: Improve approach to deal with snapshot metadata qemu: Refactor qemuDomainPrepareDiskChainElement qemu: snapshot: Refactor image labelling of new snapshot files qemu: snapshot: Use storage driver to pre-create snapshot file src/conf/domain_conf.c | 77 +++++--- src/conf/domain_conf.h | 2 - src/libvirt_private.syms | 7 + src/libxl/libxl_conf.c | 2 +- src/locking/domain_lock.c | 65 ++++--- src/locking/domain_lock.h | 8 + src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_cgroup.c | 109 ++++++----- src/qemu/qemu_cgroup.h | 3 + src/qemu/qemu_command.c | 14 +- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_domain.c | 29 ++- src/qemu/qemu_domain.h | 4 + src/qemu/qemu_driver.c | 350 +++++++++++----------------------- src/qemu/qemu_migration.c | 16 +- src/security/security_apparmor.c | 55 ++++-- src/security/security_dac.c | 111 +++++------ src/security/security_driver.h | 10 + src/security/security_manager.c | 56 ++++++ src/security/security_manager.h | 7 + src/security/security_nop.c | 19 ++ src/security/security_selinux.c | 150 +++++++++------ src/security/security_stack.c | 38 ++++ src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend_fs.c | 17 ++ src/storage/storage_backend_gluster.c | 28 +++ src/storage/storage_driver.c | 2 +- src/util/vircgroup.c | 62 ++++-- src/util/vircgroup.h | 2 + src/util/virstoragefile.c | 280 ++++++++++++++++++++++++--- src/util/virstoragefile.h | 14 +- src/vbox/vbox_tmpl.c | 30 +-- src/xenxs/xen_sxpr.c | 10 +- src/xenxs/xen_xm.c | 10 +- tests/virstoragetest.c | 86 ++++----- 37 files changed, 1075 insertions(+), 610 deletions(-) -- 1.9.3

2 59

[libvirt] [PATCH] qemu: fix domxml-to-native failing when spice_tls is not enabled
by Jincheng Miao 09 Jul '14

09 Jul '14

The default graphics channel mode is 'any', so as to defaultMode attribute. If defaultMode and channel mode are all the default value 'any', qemuConnectDomainXMLToNative will set TLSPort. But in qemuBuildGraphicsSPICECommandLine, if spice_tls is not enabled, libvirtd will report an error to tell the user that spice TLS is disabled in qemu.conf. So qemuConnectDomainXMLToNative should check spice_tls is enabled, then decide to allocate an tlsPort number to this graphics. If user specified defaultMode is 'secure', qemuConnectDomainXMLToNative could allocate tlsPort, and then let qemuBuildGraphicsSPICECommandLine reports the spice_tls disabled error. The related bug is: https://bugzilla.redhat.com/show_bug.cgi?id=1113868 Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d34da6f..d1e3b2f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6013,7 +6013,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, break; case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: - needTLSPort = true; + if (cfg->spiceTLS) + needTLSPort = true; needPort = true; break; } -- 1.7.1

2 2

[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 09 Jul '14

09 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 09 Jul '14

09 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 09 Jul '14

09 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 09 Jul '14

09 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 09 Jul '14

09 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