- Devel - libvirt List Archives

[libvirt] [PATCH v2] BlockCopy support rbd external destination file
by Liu Qing 14 Nov '16

14 Nov '16

Currently qemuDomainBlockCopy only support local file. This patch make the rbd external destination file could be passed to qemu driver_mirror. If the flag VIR_DOMAIN_BLOCK_COPY_REUSE_EXT is not set for rbd protocol, qemuDomainBlockCopy will report an error. Signed-off-by: Liu Qing <liuqing(a)chinac.com> --- src/qemu/qemu_driver.c | 119 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a82e58b..c0b7fda 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16609,6 +16609,12 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, virQEMUDriverConfigPtr cfg = NULL; const char *format = NULL; int desttype = virStorageSourceGetActualType(mirror); + char *mirr_path = NULL; + qemuDomainSecretInfoPtr tmp_secinfo = NULL; + qemuDomainSecretInfoPtr mirr_secinfo = NULL; + qemuDomainSecretInfoPtr tmp_encinfo = NULL; + virStorageSourcePtr tmp_src = NULL; + qemuDomainDiskPrivatePtr diskPriv = NULL; /* Preliminaries: find the disk we are editing, sanity checks */ virCheckFlags(VIR_DOMAIN_BLOCK_COPY_SHALLOW | @@ -16629,6 +16635,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; + diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + if (!(device = qemuAliasFromDisk(disk))) goto endjob; @@ -16675,51 +16683,67 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, } /* Prepare the destination file. */ - /* XXX Allow non-file mirror destinations */ - if (!virStorageSourceIsLocalStorage(mirror)) { + if (!virStorageSourceIsLocalStorage(mirror) && + (mirror->type != VIR_STORAGE_TYPE_NETWORK || + mirror->protocol != VIR_STORAGE_NET_PROTOCOL_RBD)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("non-file destination not supported yet")); goto endjob; } - if (stat(mirror->path, &st) < 0) { - if (errno != ENOENT) { - virReportSystemError(errno, _("unable to stat for disk %s: %s"), - disk->dst, mirror->path); - goto endjob; - } else if (flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT || - desttype == VIR_STORAGE_TYPE_BLOCK) { - virReportSystemError(errno, - _("missing destination file for disk %s: %s"), - disk->dst, mirror->path); - goto endjob; - } - } else if (!S_ISBLK(st.st_mode)) { - if (st.st_size && !(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external destination file for disk %s already " - "exists and is not a block device: %s"), - disk->dst, mirror->path); - goto endjob; - } - if (desttype == VIR_STORAGE_TYPE_BLOCK) { - virReportError(VIR_ERR_INVALID_ARG, - _("blockdev flag requested for disk %s, but file " - "'%s' is not a block device"), - disk->dst, mirror->path); - goto endjob; + if (virStorageSourceIsLocalStorage(mirror)) { + if (stat(mirror->path, &st) < 0) { + if (errno != ENOENT) { + virReportSystemError(errno, _("unable to stat for disk %s: %s"), + disk->dst, mirror->path); + goto endjob; + } else if (flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT || + desttype == VIR_STORAGE_TYPE_BLOCK) { + virReportSystemError(errno, + _("missing destination file for disk %s: %s"), + disk->dst, mirror->path); + goto endjob; + } + } else if (!S_ISBLK(st.st_mode)) { + if (st.st_size && !(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("external destination file for disk %s already " + "exists and is not a block device: %s"), + disk->dst, mirror->path); + goto endjob; + } + if (desttype == VIR_STORAGE_TYPE_BLOCK) { + virReportError(VIR_ERR_INVALID_ARG, + _("blockdev flag requested for disk %s, but file " + "'%s' is not a block device"), + disk->dst, mirror->path); + goto endjob; + } } + } else if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { + virReportError(VIR_ERR_INVALID_ARG, + "%s", + _("only external destination file is supported for " + "rbd protocol")); + goto endjob; } if (!mirror->format) { - if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { - mirror->format = disk->src->format; - } else { - /* If the user passed the REUSE_EXT flag, then either they - * can also pass the RAW flag or use XML to tell us the format. - * So if we get here, we assume it is safe for us to probe the - * format from the file that we will be using. */ - mirror->format = virStorageFileProbeFormat(mirror->path, cfg->user, + if (virStorageSourceIsLocalStorage(mirror)) { + if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { + mirror->format = disk->src->format; + } else { + /* If the user passed the REUSE_EXT flag, then either they + * can also pass the RAW flag or use XML to tell us the format. + * So if we get here, we assume it is safe for us to probe the + * format from the file that we will be using. */ + mirror->format = virStorageFileProbeFormat(mirror->path, cfg->user, cfg->group); + } + } else { + virReportError(VIR_ERR_INVALID_ARG, + _("format is required for %s"), + mirror->path); + goto endjob; } } @@ -16745,9 +16769,29 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, goto endjob; } + tmp_secinfo = diskPriv->secinfo; + tmp_encinfo = diskPriv->encinfo; + tmp_src = disk->src; + disk->src = mirror; + + if (qemuDomainSecretDiskPrepare(conn, priv, disk) < 0) { + disk->src = tmp_src; + diskPriv->secinfo = tmp_secinfo; + diskPriv->encinfo = tmp_encinfo; + goto endjob; + } + + disk->src = tmp_src; + mirr_secinfo = diskPriv->secinfo; + diskPriv->secinfo = tmp_secinfo; + diskPriv->encinfo = tmp_encinfo; + + if (qemuGetDriveSourceString(mirror, mirr_secinfo, &mirr_path) < 0) + goto endjob; + /* Actually start the mirroring */ qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorDriveMirror(priv->mon, device, mirror->path, format, + ret = qemuMonitorDriveMirror(priv->mon, device, mirr_path, format, bandwidth, granularity, buf_size, flags); virDomainAuditDisk(vm, NULL, mirror, "mirror", ret >= 0); if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -16775,6 +16819,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, qemuDomainObjEndJob(driver, vm); cleanup: + VIR_FREE(mirr_path); VIR_FREE(device); virObjectUnref(cfg); return ret; -- 1.8.3.1

1 0

[libvirt] [PATCH 00/24] docs: Kill useless spaces in <pre/>
by Michal Privoznik 14 Nov '16

14 Nov '16

Whilst reviewing patches that reworked our web page I've noticed couple of overflows in some example XMLs. For instance: http://libvirt.org/formatnetwork.html#elementsAddress The problem is we have very long lines sometimes. And to make it worse we have a lot of spaces at the beginning of some <pre/> sections. Remove them. Michal Privoznik (24): aclpolkit.html.in: Kill useless spaces in <pre/> cgroups.html.in: Kill useless spaces in <pre/> compiling.html.in: Kill useless spaces in <pre/> devguide.html.in: Kill useless spaces in <pre/> downloads.html.in: Kill useless spaces in <pre/> drvbhyve.html.in: Kill useless spaces in <pre/> drvesx.html.in: Kill useless spaces in <pre/> drvlxc.html.in: Kill useless spaces in <pre/> format.html.in: Kill useless spaces in <pre/> formatcaps.html.in: Kill useless spaces in <pre/> formatdomain.html.in: Kill useless spaces in <pre/> formatnetwork.html.in: Kill useless spaces in <pre/> formatnwfilter.html.in: Kill useless spaces in <pre/> formatsecret.html.in: Kill useless spaces in <pre/> formatstorage.html.in: Kill useless spaces in <pre/> formatstorageencryption.html.in: Kill useless spaces in <pre/> command.html.in: Kill useless spaces in <pre/> locking.html.in: Kill useless spaces in <pre/> rpc.html.in: Kill useless spaces in <pre/> locking-lockd.html.in: Kill useless spaces in <pre/> locking-sanlock.html.in: Kill useless spaces in <pre/> logging.html.in: Kill useless spaces in <pre/> migration.html.in: Kill useless spaces in <pre/> storage.html.in: Kill useless spaces in <pre/> docs/aclpolkit.html.in | 6 +- docs/cgroups.html.in | 10 +- docs/compiling.html.in | 34 +- docs/devguide.html.in | 12 +- docs/downloads.html.in | 6 +- docs/drvbhyve.html.in | 34 +- docs/drvesx.html.in | 44 +- docs/drvlxc.html.in | 12 +- docs/format.html.in | 2 +- docs/formatcaps.html.in | 2 +- docs/formatdomain.html.in | 2338 +++++++++++++++++----------------- docs/formatnetwork.html.in | 320 ++--- docs/formatnwfilter.html.in | 210 +-- docs/formatsecret.html.in | 200 +-- docs/formatstorage.html.in | 280 ++-- docs/formatstorageencryption.html.in | 38 +- docs/internals/command.html.in | 172 +-- docs/internals/locking.html.in | 132 +- docs/internals/rpc.html.in | 220 ++-- docs/locking-lockd.html.in | 32 +- docs/locking-sanlock.html.in | 40 +- docs/logging.html.in | 38 +- docs/migration.html.in | 48 +- docs/storage.html.in | 296 ++--- 24 files changed, 2263 insertions(+), 2263 deletions(-) -- 2.8.4

2 25

[libvirt] [PATCH] BlockCopy support rbd external destination file
by Liu Qing 14 Nov '16

14 Nov '16

Currently qemuDomainBlockCopy only support local file. This patch make the rbd external destination file could be passed to qemu driver_mirror. If the external rbd file is not exist, qemuDomainBlockCopy will report an error. Signed-off-by: Liu Qing <liuqing(a)chinac.com> --- src/qemu/qemu_driver.c | 82 +++++++++++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 38c8414..ee8db69 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16609,6 +16609,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, virQEMUDriverConfigPtr cfg = NULL; const char *format = NULL; int desttype = virStorageSourceGetActualType(mirror); + char *mirr_path = NULL; /* Preliminaries: find the disk we are editing, sanity checks */ virCheckFlags(VIR_DOMAIN_BLOCK_COPY_SHALLOW | @@ -16675,42 +16676,50 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, } /* Prepare the destination file. */ - /* XXX Allow non-file mirror destinations */ - if (!virStorageSourceIsLocalStorage(mirror)) { + if (!virStorageSourceIsLocalStorage(mirror) && + (mirror->type != VIR_STORAGE_TYPE_NETWORK || + mirror->protocol != VIR_STORAGE_NET_PROTOCOL_RBD)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("non-file destination not supported yet")); goto endjob; } - if (stat(mirror->path, &st) < 0) { - if (errno != ENOENT) { - virReportSystemError(errno, _("unable to stat for disk %s: %s"), - disk->dst, mirror->path); - goto endjob; - } else if (flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT || - desttype == VIR_STORAGE_TYPE_BLOCK) { - virReportSystemError(errno, - _("missing destination file for disk %s: %s"), - disk->dst, mirror->path); - goto endjob; - } - } else if (!S_ISBLK(st.st_mode)) { - if (st.st_size && !(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external destination file for disk %s already " - "exists and is not a block device: %s"), - disk->dst, mirror->path); - goto endjob; - } - if (desttype == VIR_STORAGE_TYPE_BLOCK) { - virReportError(VIR_ERR_INVALID_ARG, - _("blockdev flag requested for disk %s, but file " - "'%s' is not a block device"), - disk->dst, mirror->path); - goto endjob; + if (virStorageSourceIsLocalStorage(mirror)) { + if (stat(mirror->path, &st) < 0) { + if (errno != ENOENT) { + virReportSystemError(errno, _("unable to stat for disk %s: %s"), + disk->dst, mirror->path); + goto endjob; + } else if (flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT || + desttype == VIR_STORAGE_TYPE_BLOCK) { + virReportSystemError(errno, + _("missing destination file for disk %s: %s"), + disk->dst, mirror->path); + goto endjob; + } + } else if (!S_ISBLK(st.st_mode)) { + if (st.st_size && !(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("external destination file for disk %s already " + "exists and is not a block device: %s"), + disk->dst, mirror->path); + goto endjob; + } + if (desttype == VIR_STORAGE_TYPE_BLOCK) { + virReportError(VIR_ERR_INVALID_ARG, + _("blockdev flag requested for disk %s, but file " + "'%s' is not a block device"), + disk->dst, mirror->path); + goto endjob; + } } + } else if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { + virReportError(VIR_ERR_INVALID_ARG, + _("only external destination file is supported for " + "rbd protocol")); + goto endjob; } - if (!mirror->format) { + if (!mirror->format && virStorageSourceIsLocalStorage(mirror)) { if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { mirror->format = disk->src->format; } else { @@ -16721,8 +16730,12 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, mirror->format = virStorageFileProbeFormat(mirror->path, cfg->user, cfg->group); } + } else { + virReportError(VIR_ERR_INVALID_ARG, + _("format is required for %s"), + mirror->path); + goto endjob; } - /* pre-create the image file */ if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { int fd = qemuOpenFile(driver, vm, mirror->path, @@ -16744,10 +16757,16 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, qemuDomainDiskChainElementRevoke(driver, vm, mirror); goto endjob; } + if (mirror->protocol == VIR_STORAGE_NET_PROTOCOL_RBD) { + if (qemuGetDriveSourceString(mirror, conn, &mirr_path) < 0) + goto endjob; + } + else if (VIR_STRDUP(mirr_path, mirror->path) < 0) + goto endjob; /* Actually start the mirroring */ qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorDriveMirror(priv->mon, device, mirror->path, format, + ret = qemuMonitorDriveMirror(priv->mon, device, mirr_path, format, bandwidth, granularity, buf_size, flags); virDomainAuditDisk(vm, NULL, mirror, "mirror", ret >= 0); if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -16775,6 +16794,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, qemuDomainObjEndJob(driver, vm); cleanup: + VIR_FREE(mirr_path); VIR_FREE(device); virObjectUnref(cfg); return ret; -- 1.9.1

3 2

[libvirt] Segfault in qemuDomainDefVcpusPostParse:2480
by Nehal J Wani 14 Nov '16

14 Nov '16

The man page of qemu(2.6.2), states the following: -smp [cpus=]n[,cores=cores][,threads=threads][,sockets=sockets][,maxcpus=maxcpus] Simulate an SMP system with n CPUs. On the PC target, up to 255 CPUs are supported. On Sparc32 target, Linux limits the number of usable CPUs to 4. For the PC target, the number of cores per socket, the number of threads per cores and the total number of sockets can be specified. Missing values will be computed. *If any on the three values is given, the total number of CPUs n can be omitted*. maxcpus specifies the maximum number of hotpluggable CPUs. So, I built the master branch of libvirt and tested the following: Client: $ ./run ./tools/virsh domxml-from-native qemu-argv <(echo '/usr/bin/qemu-system-x86_64 -enable-kvm -smp cores=2,threads=1,sockets=1') error: Disconnected from qemu:///session due to I/O error error: Cannot recv data: Connection reset by peer Server: $ ./run gdb ./daemon/libvirtd GNU gdb (GDB) Fedora 7.11.1-86.fc24 ... Starting program: /home/wani/libvirt/daemon/.libs/lt-libvirtd [Thread debugging using libthread_db enabled] ... [Thread 0x7fffc462c700 (LWP 16850) exited] ... Thread 4 "lt-libvirtd" received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7fffe4cf1700 (LWP 16836)] qemuDomainDefVcpusPostParse (def=0x7fffb8000ec0) at qemu/qemu_domain.c:2480 2480 if (!vcpu->online) { qemuDomainDefVcpusPostParse() calls vcpu = virDomainDefGetVcpu(def, 0), which returns NULL. I'd be happy to send a patch, but I am not sure what the right solution is. - Should not specifying n to -smp allowed? - Should -cpus=n also be parsed in qemuParseCommandLineSmp()? Cheers! Nehal J Wani

3 2

[libvirt] [PATCH 0/4] admin: Fix a leaking conn reference and other improvements
by Erik Skultety 14 Nov '16

14 Nov '16

This series fixes a memory leak in a dangling conn object reference caused by assigning NULL to conn->closeCallback object by the RPC catch-disconnect routine followed by a comparison of equality of conn->closeCallback->callback and the client-registered callback reference. Before fixing the issue itself, there are some new helpers introduced following the same idea as the helpers introduced by series https://www.redhat.com/archives/libvir-list/2016-February/msg00849.html Erik Skultety (4): vsh: Drop conditional error reporting in vshErrorHandler admin: Remove unnecessary @conn object locking datatypes: Introduce some admin-related close callback handling helpers admin: Use the newly introduced close callback handling helpers po/POTFILES.in | 1 + src/admin/admin_remote.c | 6 +--- src/datatypes.c | 67 +++++++++++++++++++++++++++++++++++++++--- src/datatypes.h | 8 +++++ src/libvirt-admin.c | 24 +-------------- src/libvirt_admin_private.syms | 3 ++ tools/vsh.c | 2 -- 7 files changed, 77 insertions(+), 34 deletions(-) -- 2.5.5

2 7

[libvirt] [PATCH] storage_backend_rbd: check the return value of rados_conf_set
by Chen Hanxiao 12 Nov '16

12 Nov '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We forget to check the return value of rados_conf_set. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/storage/storage_backend_rbd.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 718c4d6..58bcb9a 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -162,10 +162,20 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, rados_conf_set(ptr->cluster, "client_mount_timeout", client_mount_timeout); VIR_DEBUG("Setting RADOS option rados_mon_op_timeout to %s", mon_op_timeout); - rados_conf_set(ptr->cluster, "rados_mon_op_timeout", mon_op_timeout); + if (rados_conf_set(ptr->cluster, "rados_mon_op_timeout", mon_op_timeout) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to set RADOS option: %s"), + "rados_mon_op_timeout"); + goto cleanup; + } VIR_DEBUG("Setting RADOS option rados_osd_op_timeout to %s", osd_op_timeout); - rados_conf_set(ptr->cluster, "rados_osd_op_timeout", osd_op_timeout); + if (rados_conf_set(ptr->cluster, "rados_osd_op_timeout", osd_op_timeout) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to set RADOS option: %s"), + "rados_osd_op_timeout"); + goto cleanup; + } /* * Librbd supports creating RBD format 2 images. We no longer have to invoke @@ -173,7 +183,12 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, * This leaves us to simply use rbd_create() and use the default behavior of librbd */ VIR_DEBUG("Setting RADOS option rbd_default_format to %s", rbd_default_format); - rados_conf_set(ptr->cluster, "rbd_default_format", rbd_default_format); + if (rados_conf_set(ptr->cluster, "rbd_default_format", rbd_default_format) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to set RADOS option: %s"), + "rbd_default_format"); + goto cleanup; + } ptr->starttime = time(0); if ((r = rados_connect(ptr->cluster)) < 0) { -- 1.8.3.1

2 4

[libvirt] How to make udev not touch my device?
by Michal Privoznik 11 Nov '16

11 Nov '16

Hey udev developers, I'm a libvirt developer and I've been facing an interesting issue recently. Libvirt is a library for managing virtual machines and as such allows basically any device to be exposed to a virtual machine. For instance, a virtual machine can use /dev/sdX as its own disk. Because of security reasons we allow users to configure their VMs to run under different UID/GID and also SELinux context. That means that whenever a VM is being started up, libvirtd (our daemon we have) relabels all the necessary paths that QEMU process (representing VM) can touch. However, I'm facing an issue that I don't know how to fix. In some cases QEMU can close & reopen a block device. However, closing a block device triggers an event and hence if there is a rule that sets a security label on a device the QEMU process is unable to reopen the device again. My question is, whet we can do to prevent udev from mangling with our security labels that we've set on the devices? One of the ideas our lead developer had was for libvirt to set some kind of udev label on devices managed by libvirt (when setting up security labels) and then whenever udev sees such labelled device it won't touch it at all (this could be achieved by a rule perhaps?). Later, when domain is shutting down libvirt removes that label. But I don't think setting an arbitrary label on devices is supported, is it? Michal

5 11

[libvirt] [PATCH] docs: change "Learn" to "Documentation"
by Pavel Hrdina 11 Nov '16

11 Nov '16

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- I know that this is not a big issue, but I don't like the "Learn". As I've mentioned in my review [1] IMO "Documentation" is better. [1] <https://www.redhat.com/archives/libvir-list/2016-November/msg00446.html> docs/page.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/page.xsl b/docs/page.xsl index fcb5191..837060b 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -106,7 +106,7 @@ <ul> <li><a href="downloads.html">Download</a></li> <li><a href="contribute.html">Contribute</a></li> - <li><a href="docs.html">Learn</a></li> + <li><a href="docs.html">Documentation</a></li> </ul> </div> <div id="search"> -- 2.10.2

2 1

[libvirt] [PATCH] qemuDomainAttachNetDevice: Avoid @originalError leak
by Michal Privoznik 11 Nov '16

11 Nov '16

Coverity identified that this variable might be leaked. And it's right. If an error occurred and we have to roll back the control jumps to try_remove label where we save the current error (see 0e82fa4c34 for more info). However, inside the code a jump onto other label is possible thus leaking the error object. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Best viewed with 'git show --ignore-space-change' src/qemu/qemu_hotplug.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1bc2706..0dcbee6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1326,32 +1326,32 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, if (vlan < 0) { if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) { char *netdev_name; - if (virAsprintf(&netdev_name, "host%s", net->info.alias) < 0) - goto cleanup; - qemuDomainObjEnterMonitor(driver, vm); - if (charDevPlugged && - qemuMonitorDetachCharDev(priv->mon, charDevAlias) < 0) - VIR_WARN("Failed to remove associated chardev %s", charDevAlias); - if (netdevPlugged && - qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) - VIR_WARN("Failed to remove network backend for netdev %s", - netdev_name); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); - VIR_FREE(netdev_name); + if (virAsprintf(&netdev_name, "host%s", net->info.alias) >= 0) { + qemuDomainObjEnterMonitor(driver, vm); + if (charDevPlugged && + qemuMonitorDetachCharDev(priv->mon, charDevAlias) < 0) + VIR_WARN("Failed to remove associated chardev %s", charDevAlias); + if (netdevPlugged && + qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) + VIR_WARN("Failed to remove network backend for netdev %s", + netdev_name); + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + VIR_FREE(netdev_name); + } } else { VIR_WARN("Unable to remove network backend"); } } else { char *hostnet_name; - if (virAsprintf(&hostnet_name, "host%s", net->info.alias) < 0) - goto cleanup; - qemuDomainObjEnterMonitor(driver, vm); - if (hostPlugged && - qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) - VIR_WARN("Failed to remove network backend for vlan %d, net %s", - vlan, hostnet_name); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); - VIR_FREE(hostnet_name); + if (virAsprintf(&hostnet_name, "host%s", net->info.alias) >= 0) { + qemuDomainObjEnterMonitor(driver, vm); + if (hostPlugged && + qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) + VIR_WARN("Failed to remove network backend for vlan %d, net %s", + vlan, hostnet_name); + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + VIR_FREE(hostnet_name); + } } virSetError(originalError); virFreeError(originalError); -- 2.8.4

2 2

[libvirt] FYI: virnettlssession broken by gnutls 3.5.6
by Daniel P. Berrange 11 Nov '16

11 Nov '16

The gnutls 3.5.6 release changed the format is used to report the x509 DN field, breaking the virnettlssession test suite. This will also break anyone using the x509 whitelist config parameter in libvirtd.conf. I've discussed it here: https://lists.gnupg.org/pipermail/gnutls-devel/2016-November/008224.html and its likely that a new gnutls release will revert the changes, thus fixing libvirt. I've temporaraily downgraded gnutls on the CI machines to avoid us hitting the bug in 3.5.6 (via excludepkgs in /etc/yum.repo.d/rawhide.repo) Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|

1 0