- Devel - libvirt List Archives

[libvirt] [PATCH] LXC: s/chroot/chdir in lxcContainerPivotRoot()
by Richard Weinberger 14 Jun '13

14 Jun '13

...fixes a trivial copy&paste error. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- src/lxc/lxc_container.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 7531fea..c4056c3 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -653,11 +653,11 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) } } - /* Now we chroot into the tmpfs, then pivot into the + /* Now we chdir into the tmpfs, then pivot into the * root->src bind-mounted onto '/new' */ if (chdir(newroot) < 0) { virReportSystemError(errno, - _("Failed to chroot into %s"), newroot); + _("Failed to chdir into %s"), newroot); goto err; } -- 1.8.1.4

2 1

[libvirt] [PATCH] remote: Fix client crash when URI path is empty when using ssh
by Peter Krempa 14 Jun '13

14 Jun '13

The parsed path in the URI may be NULL resulting into: $ virsh -c qemu+ssh:// list Segmentation fault (core dumped) Introduced by 22d81ceb46ea4b83ad817c29b2b04df27a09c671 --- src/remote/remote_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index bd5646a..87c61f4 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -633,7 +633,7 @@ doRemoteOpen(virConnectPtr conn, case trans_libssh2: if (!sockname) { /* Right now we don't support default session connections */ - if (STREQ(conn->uri->path, "/session")) { + if (STREQ_NULLABLE(conn->uri->path, "/session")) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Connecting to session instance without " "socket path is not supported by the libssh2 " @@ -710,7 +710,7 @@ doRemoteOpen(virConnectPtr conn, if (!sockname) { /* Right now we don't support default session connections */ - if (STREQ(conn->uri->path, "/session")) { + if (STREQ_NULLABLE(conn->uri->path, "/session")) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Connecting to session instance without " "socket path is not supported by the ssh " -- 1.8.2.1

1 1

[libvirt] [PATCH] LXC: Check container init path after pivot_root()
by Richard Weinberger 14 Jun '13

14 Jun '13

Currently we check the path before changing the root directory. This cannot work. Do the check after pivot_root() such that we check for the patch within the correct root. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- src/lxc/lxc_container.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a003ec8..7531fea 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1948,13 +1948,6 @@ static int lxcContainerChild(void *data) if (lxcContainerResolveSymlinks(vmDef) < 0) goto cleanup; - if (!virFileExists(vmDef->os.init)) { - virReportSystemError(errno, - _("cannot find init path '%s' relative to container root"), - vmDef->os.init); - goto cleanup; - } - /* Wait for interface devices to show up */ if (lxcContainerWaitForContinue(argv->monitor) < 0) { virReportSystemError(errno, "%s", @@ -1996,6 +1989,13 @@ static int lxcContainerChild(void *data) argv->securityDriver) < 0) goto cleanup; + if (!virFileExists(vmDef->os.init)) { + virReportSystemError(errno, + _("cannot find init path '%s' relative to container root"), + vmDef->os.init); + goto cleanup; + } + /* rename and enable interfaces */ if (lxcContainerRenameAndEnableInterfaces(!!(vmDef->features & (1 << VIR_DOMAIN_FEATURE_PRIVNET)), -- 1.8.1.4

2 2

[libvirt] [PATCH] LXC: Ensure the init task of container comes from container
by Gao feng 14 Jun '13

14 Jun '13

Richard found libvirt_lxc execs the lxc init programs within the wrong rootfs context, we should run this init task from the rootfs of container. So chroot to the root directory of container, Make sure libvirt_lxc execs the right lxc init program. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 181f6c8..4edff15 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -645,8 +645,9 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - /* CWD is undefined after pivot_root, so go to / */ - if (chdir("/") < 0) + /* CWD is undefined after pivot_root, so go to /, + * and chroot to the new root directroy */ + if (chdir("/") < 0 || chroot(".") < 0) goto err; ret = 0; -- 1.8.1.4

2 3

[libvirt] [PATCH] remote: Forbid default "/session" connections when using ssh transport
by Peter Krempa 14 Jun '13

14 Jun '13

Without the socket path explicitly specified, the remote driver tried to connect to the "/system" instance socket even if "/session" was specified in the uri. With this patch this configuration now produces an error. It is still possible to initiate a session connection with specifying the path to the socket manually and also manually starting the session daemon. This was also possible prior to this patch, This is a minimal fix. We may decide to support remote session connections using ssh but this will require changes to the remote driver code so this fix shouldn't cause regressions in the case we decide to do that. --- src/remote/remote_driver.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fcf45d3..bd5646a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -631,11 +631,21 @@ doRemoteOpen(virConnectPtr conn, break; case trans_libssh2: - if (!sockname && - VIR_STRDUP(sockname, - flags & VIR_DRV_OPEN_REMOTE_RO ? - LIBVIRTD_PRIV_UNIX_SOCKET_RO : LIBVIRTD_PRIV_UNIX_SOCKET) < 0) - goto failed; + if (!sockname) { + /* Right now we don't support default session connections */ + if (STREQ(conn->uri->path, "/session")) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Connecting to session instance without " + "socket path is not supported by the libssh2 " + "connection driver")); + goto failed; + } + + if (VIR_STRDUP(sockname, + flags & VIR_DRV_OPEN_REMOTE_RO ? + LIBVIRTD_PRIV_UNIX_SOCKET_RO : LIBVIRTD_PRIV_UNIX_SOCKET) < 0) + goto failed; + } VIR_DEBUG("Starting LibSSH2 session"); @@ -698,11 +708,21 @@ doRemoteOpen(virConnectPtr conn, if (!command && VIR_STRDUP(command, "ssh") < 0) goto failed; - if (!sockname && - VIR_STRDUP(sockname, - flags & VIR_DRV_OPEN_REMOTE_RO ? - LIBVIRTD_PRIV_UNIX_SOCKET_RO : LIBVIRTD_PRIV_UNIX_SOCKET) < 0) - goto failed; + if (!sockname) { + /* Right now we don't support default session connections */ + if (STREQ(conn->uri->path, "/session")) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Connecting to session instance without " + "socket path is not supported by the ssh " + "connection driver")); + goto failed; + } + + if (VIR_STRDUP(sockname, + flags & VIR_DRV_OPEN_REMOTE_RO ? + LIBVIRTD_PRIV_UNIX_SOCKET_RO : LIBVIRTD_PRIV_UNIX_SOCKET) < 0) + goto failed; + } if (!(priv->client = virNetClientNewSSH(priv->hostname, port, -- 1.8.2.1

2 4

[libvirt] [PATCH] Implement dispose method for libxlDomainObjPrivate
by Frediano Ziglio 14 Jun '13

14 Jun '13

When creating a timer/event handler reference counting is used. So it could be possible (in theory) that libxlDomainObjPrivateFree is called with reference counting >1. The problem is that libxlDomainObjPrivateFree leave the object in an invalid state with ctx freed (but still having dandling pointer). This can lead timer/event handler to core. This patch destroy the object before disposing it so at timer/event object is still valid. Signed-off-by: Frediano Ziglio <frediano.ziglio(a)citrix.com> --- src/libxl/libxl_driver.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 935919b..1c8cfd7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -110,6 +110,8 @@ static int libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, bool start_paused, int restore_fd); +static void libxlDomainObjPrivateDispose(void *obj); + /* Function definitions */ static int libxlDomainObjPrivateOnceInit(void) @@ -117,7 +119,7 @@ libxlDomainObjPrivateOnceInit(void) if (!(libxlDomainObjPrivateClass = virClassNew(virClassForObjectLockable(), "libxlDomainObjPrivate", sizeof(libxlDomainObjPrivate), - NULL))) + libxlDomainObjPrivateDispose))) return -1; return 0; @@ -418,14 +420,26 @@ libxlDomainObjPrivateAlloc(void) } static void -libxlDomainObjPrivateFree(void *data) +libxlDomainObjPrivateDispose(void *obj) { - libxlDomainObjPrivatePtr priv = data; + libxlDomainObjPrivatePtr priv = obj; if (priv->deathW) libxl_evdisable_domain_death(priv->ctx, priv->deathW); libxl_ctx_free(priv->ctx); +} + +static void +libxlDomainObjPrivateFree(void *data) +{ + libxlDomainObjPrivatePtr priv = data; + + if (priv->deathW) { + libxl_evdisable_domain_death(priv->ctx, priv->deathW); + priv->deathW = NULL; + } + virObjectUnref(priv); } -- 1.7.10.4

2 1

[libvirt] fdisk still shows the "/dev/sdb" partitions even after the removal of scsi disk
by chandrashekar shastri 14 Jun '13

14 Jun '13

Hi, I have filed a bug "fdisk still shows the "/dev/sdb" partitions even after the removal of scsi disk" for the upstream kernel. Bug link: https://bugs.launchpad.net/qemu/+bug/1190525 RHEL guest shows the partittions even after the removal of scsi disk: fdisk still shows the "/dev/sdb" partitions even after the removal of scsi disk. Guest details: ------------------- Kernel : 2.6.32-358 Host Details : Upstream Kernel, Qemu, Libvirt and virt-manager --------------------------------------------------------------------- kernel version : 3.9.0+ qemu version : QEMU emulator version 1.5.0 libvirt version : 1.0.5 virt-install : 0.600.3 Steps to reproduce the issue: I. Add the SCSI disk through the virt-manager. 2. Create the partition using fdisk (eg: /dev/sbb) 3. Create a filesystem and format using mkfs.ext3 or mkfs.ext4 4. Remove the scsi disk through the virt-manager. 5. Again run the fdisk /dev/sdb, the guests still shows the partition even after the removal of the disk. This issue is not seen with virt-io disk. This issue is also reproducible without even creating the partitions. Expected Result: The output of fdisk /dev/sd* should not show the enties after the removal of scsi disks Thanks, Chandrashekar

2 2

[libvirt] [PATCH] qemu: allow restore with non-migratable XML input
by Ján Tomko 14 Jun '13

14 Jun '13

Convert input XML to migratable before using it in qemuDomainSaveImageOpen. XML in the save image is migratable, i.e. doesn't contain implicit controllers. If these controllers were in a non-default order in the input XML, the ABI check would fail. Removing and re-adding these controllers fixes it. https://bugzilla.redhat.com/show_bug.cgi?id=834196 --- src/qemu/qemu_domain.c | 29 +++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 4 ++++ src/qemu/qemu_driver.c | 13 ++++++++++--- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fdcf7bc..8d79066 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1275,6 +1275,35 @@ void qemuDomainObjExitRemote(virDomainObjPtr obj) } +virDomainDefPtr +qemuDomainDefCopy(virQEMUDriverPtr driver, + virDomainDefPtr src, + unsigned int flags) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + virDomainDefPtr ret = NULL; + virCapsPtr caps = NULL; + const char *xml = NULL; + + if (qemuDomainDefFormatBuf(driver, src, flags, &buf) < 0) + goto cleanup; + + xml = virBufferContentAndReset(&buf); + + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) + goto cleanup; + + if (!(ret = virDomainDefParseString(xml, caps, driver->xmlopt, + QEMU_EXPECTED_VIRT_TYPES, + VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + +cleanup: + VIR_FREE(xml); + virObjectUnref(caps); + return ret; +} + int qemuDomainDefFormatBuf(virQEMUDriverPtr driver, virDomainDefPtr def, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index f241296..068a4c3 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -241,6 +241,10 @@ void qemuDomainObjEnterRemote(virDomainObjPtr obj) void qemuDomainObjExitRemote(virDomainObjPtr obj) ATTRIBUTE_NONNULL(1); +virDomainDefPtr qemuDomainDefCopy(virQEMUDriverPtr driver, + virDomainDefPtr src, + unsigned int flags); + int qemuDomainDefFormatBuf(virQEMUDriverPtr driver, virDomainDefPtr vm, unsigned int flags, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c886378..93c7d14 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4877,17 +4877,24 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, goto error; if (xmlin) { virDomainDefPtr def2 = NULL; + virDomainDefPtr newdef = NULL; if (!(def2 = virDomainDefParseString(xmlin, caps, driver->xmlopt, QEMU_EXPECTED_VIRT_TYPES, VIR_DOMAIN_XML_INACTIVE))) goto error; - if (!virDomainDefCheckABIStability(def, def2)) { - virDomainDefFree(def2); + + newdef = qemuDomainDefCopy(driver, def2, VIR_DOMAIN_XML_MIGRATABLE); + virDomainDefFree(def2); + if (!newdef) + goto error; + + if (!virDomainDefCheckABIStability(def, newdef)) { + virDomainDefFree(newdef); goto error; } virDomainDefFree(def); - def = def2; + def = newdef; } VIR_FREE(xml); -- 1.8.1.5

2 2

[libvirt] AttributeError in virConnect.__del__ at program exit
by Sandro Bonazzola 13 Jun '13

13 Jun '13

Hi, using vdsm python code, I've the following error at program exit that seems to be related to libvirt python code, something wrong in a destructor: Exception AttributeError: AttributeError("virConnect instance has no attribute 'domainEventCallbacks'",) in <bound method virConnect.__del__ of <libvirt.virConnect instance at 0x4280f38>> ignored I'm using libvirt 1.0.6 Is it a known issue? Is there any workaround / fix ? -- Sandro Bonazzola Better technology. Faster innovation. Powered by community collaboration. See how it works at redhat.com

2 6

[libvirt] [PATCH] udev: fix crash in libudev logging
by Ján Tomko 13 Jun '13

13 Jun '13

VIR_ERROR_INT calls virLogMessage(..., const char *fmt, ...). Call virLogVMessage(..., const char *fmt, va_list list) instead, since libudev called us with a va_list object, not a list of arguments. https://bugzilla.redhat.com/show_bug.cgi?id=969152 --- Without the cast, I was getting: node_device/node_device_udev.c: In function 'nodeStateInitialize': node_device/node_device_udev.c:1684:5: error: argument 2 of 'udev_set_log_fn' might be a candidate for a format attribute [-Werror=missing-format-attribute] node_device/node_device_udev.c: At top level: cc1: error: unrecognized command line option "-Wno-unused-command-line-argument" [-Werror] Is there a nicer way to get rid of it? src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b93629f..d73a4d0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1486,6 +1486,7 @@ virLogSetBufferSize; virLogSetDefaultPriority; virLogSetFromEnv; virLogUnlock; +virLogVMessage; # util/virmacaddr.h diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 620cd58..ffcae16 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -348,15 +348,26 @@ static int udevGenerateDeviceName(struct udev_device *device, } -static void udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, - int priority ATTRIBUTE_UNUSED, - const char *file, - int line, - const char *fn, - const char *fmt, - va_list args) +typedef void (*udevLogFunctionPtr) (struct udev *udev, + int priority, + const char *file, + int line, + const char *fn, + const char *format, + va_list args); + +static void +ATTRIBUTE_FMT_PRINTF(6,0) +udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, + int priority ATTRIBUTE_UNUSED, + const char *file, + int line, + const char *fn, + const char *fmt, + va_list args) { - VIR_ERROR_INT(VIR_LOG_FROM_LIBRARY, file, line, fn, fmt, args); + virLogVMessage(VIR_LOG_FROM_LIBRARY, VIR_LOG_ERROR, + file, line, fn, NULL, fmt, args); } @@ -1672,7 +1683,8 @@ static int nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, * its return value. */ udev = udev_new(); - udev_set_log_fn(udev, udevLogFunction); + /* cast to get rid of missing-format-attribute warning */ + udev_set_log_fn(udev, (udevLogFunctionPtr) udevLogFunction); priv->udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); if (priv->udev_monitor == NULL) { -- 1.8.1.5

2 2