- Devel - libvirt List Archives

[libvirt] [PATCH] systemd: add debug message when virDBusCallMethod failed
by Gao feng 10 Sep '13

10 Sep '13

Generate debug message when systemd doesn't support interface org.freedesktop.machine1.Manager. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/util/virsystemd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 3e69ef6..c631557 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -233,6 +233,7 @@ int virSystemdCreateMachine(const char *name, if (err->code == VIR_ERR_DBUS_SERVICE && STREQ(err->str2, "org.freedesktop.DBus.Error.ServiceUnknown")) { virResetLastError(); + VIR_DEBUG("systemd doesn't support interface org.freedesktop.machine1.Manager"); ret = -2; } goto cleanup; -- 1.8.3.1

3 5

[libvirt] link fow downloading libvirt-0.10.2-19.el6
by arun abhinay 10 Sep '13

10 Sep '13

Hi, In reference to comment28 in below link https://bugzilla.redhat.com/show_bug.cgi?id=911609#c28 The issue was fixed in libvirt-0.10.2-19.el6 version. I am facing similar crash and want to check with libvirt-0.10.2-19.el6 version. But i couldnt find this version from opensource. We could only find below version of libvirt from http://libvirt.org/sources/ *libvirt-0.10.2-1.fc17.src.rpm 24-Sep-2012 07:32 21M libvirt-0.10.2-1.fc17.x86_64.rpm 24-Sep-2012 07:32 21K libvirt-0.10.2.tar.gz 24-Sep-2012 07:53 21M** * *Can any one please provide me a link from where i can download libvirt-0.10.2-19.el6 version.* I am pasting my BT of my core ffor reference below #0 0x00007f068e9f951b in remoteClientCloseFunc (client=<value optimized out>, reason=1, opaque=0x2100110) at remote/remote_driver.c:340 #1 0x00007f068ea1a152 in virNetClientIOHandleOutput (client=0x2100110) at rpc/virnetclient.c:1200 #2 0x0000000000000009 in ?? () #3 0x0000000002100a50 in ?? () #4 0x0000000000000002 in ?? () #5 0x00007f0684000988 in ?? () #6 0x00007f068ea1caa1 in virNetClientIOEventLoop (client=0x2100890, thiscall=0xc02179369c522bee) at rpc/virnetclient.c:1525 #7 0x0000000000000000 in ?? () Thanks Abhinay

5 8

[libvirt] [PATCH 0/4] build: use subdir-objects
by Eric Blake 10 Sep '13

10 Sep '13

Automake 1.14 is annoyingly loud about warning that the future automake 2.0 will turn on subdir-objects by default. Since automake 1.9 also supports subdir-objects, the best course of action is to enable the feature. But we have to fix some problems before doing so. Also, I noticed some issues with .x files while searching for places that needed fixing. Eric Blake (4): build: avoid $(srcdir) in *_SOURCES build: use library rather than cross-directory compilation tests: check remaining .x files build: use automake subdir-objects .gitignore | 1 + cfg.mk | 3 +- configure.ac | 2 +- daemon/Makefile.am | 55 +++++++++++----- src/Makefile.am | 139 +++++++++++++++++++++++---------------- src/lock_protocol-structs | 55 ++++++++++++++++ src/lxc_monitor_protocol-structs | 16 +++++ tests/Makefile.am | 4 +- 8 files changed, 198 insertions(+), 77 deletions(-) create mode 100644 src/lock_protocol-structs create mode 100644 src/lxc_monitor_protocol-structs -- 1.8.3.1

2 7

[libvirt] [PATCH]LXC doc: Add warns if net namespace not enabled
by Chen Hanxiao 10 Sep '13

10 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we don't enable network namespace, we could shutdown host by executing command 'shutdown' inside container. This patch will add some warnings in LXC docs and give some advice to readers. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/drvlxc.html.in | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 640968f..8f3a36a 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -50,6 +50,13 @@ processes inside containers cannot be securely isolated from host process without the use of a mandatory access control technology such as SELinux or AppArmor. + +WARNING: If 'net' namespace not enabled for container, +host OS could be shutdown by executing command like 'reboot' +inside container. So make sure 'net' namespace was available and +set the <privnet/> feature in the XML, or configure virtual NICs. +Then this issue could be circumvented. + <h2><a name="init">Default container setup</a></h2> -- 1.7.1

3 5

[libvirt] [PATCH] Ensure root filesystem is recursively mounted readonly
by Daniel P. Berrange 10 Sep '13

10 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If the guest is configured with <filesystem type='mount'> <source dir='/'/> <target dir='/'/> <readonly/> </filesystem> Then any submounts under / should also end up readonly. eg if the user has /home on a separate volume, they'd expect /home to be readonly. Users can selectively make sub-mounts read-write again by simply listing them as new mounts without the <readonly> flag set <filesystem type='mount'> <source dir='/home'/> <target dir='/home'/> </filesystem> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 9c04d06..ae672c8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -532,7 +532,6 @@ static int lxcContainerGetSubtree(const char *prefix, } while (getmntent_r(procmnt, &mntent, mntbuf, sizeof(mntbuf)) != NULL) { - VIR_DEBUG("Got %s", mntent.mnt_dir); if (!STRPREFIX(mntent.mnt_dir, prefix)) continue; @@ -541,7 +540,6 @@ static int lxcContainerGetSubtree(const char *prefix, if (VIR_STRDUP(mounts[nmounts], mntent.mnt_dir) < 0) goto cleanup; nmounts++; - VIR_DEBUG("Grabbed %s", mntent.mnt_dir); } if (mounts) @@ -750,6 +748,61 @@ err: } +static int lxcContainerSetReadOnly(virDomainFSDefPtr root) +{ + FILE *procmnt; + struct mntent mntent; + char mntbuf[1024]; + int ret = -1; + char **mounts = NULL; + size_t nmounts = 0; + size_t i; + + VIR_DEBUG("root=%s", root->src); + + if (!(procmnt = setmntent("/proc/mounts", "r"))) { + virReportSystemError(errno, "%s", + _("Failed to read /proc/mounts")); + return -1; + } + + while (getmntent_r(procmnt, &mntent, mntbuf, sizeof(mntbuf)) != NULL) { + if (STREQ(mntent.mnt_dir, "/") || + STRPREFIX(mntent.mnt_dir, "/.oldroot")) + continue; + + if (VIR_REALLOC_N(mounts, nmounts+1) < 0) + goto cleanup; + if (VIR_STRDUP(mounts[nmounts], mntent.mnt_dir) < 0) + goto cleanup; + nmounts++; + } + + if (mounts) + qsort(mounts, nmounts, sizeof(mounts[0]), + lxcContainerChildMountSort); + + for (i = 0 ; i < nmounts ; i++) { + VIR_DEBUG("Bind readonly %s", mounts[i]); + if (mount(mounts[i], mounts[i], NULL, MS_BIND|MS_REC|MS_RDONLY|MS_REMOUNT, NULL) < 0) { + virReportSystemError(errno, + _("Failed to make mount %s readonly"), + mounts[i]); + goto cleanup; + } + } + + ret = 0; +cleanup: + for (i = 0; i < nmounts; i++) + VIR_FREE(mounts[i]); + VIR_FREE(mounts); + endmntent(procmnt); + return ret; + +} + + static int lxcContainerMountBasicFS(bool userns_enabled) { const struct { @@ -1001,6 +1054,8 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, int ret = -1; struct stat st; + VIR_DEBUG("src=%s dst=%s", fs->src, fs->dst); + if (virAsprintf(&src, "%s%s", srcprefix, fs->src) < 0) goto cleanup; @@ -1057,6 +1112,13 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, _("Failed to make directory %s readonly"), fs->dst); } + } else { + VIR_DEBUG("Binding %s readwrite", fs->dst); + if (mount(src, fs->dst, NULL, MS_BIND|MS_REMOUNT, NULL) < 0) { + virReportSystemError(errno, + _("Failed to make directory %s readwrite"), + fs->dst); + } } ret = 0; @@ -1330,6 +1392,8 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, char *src = NULL; int ret = -1; + VIR_DEBUG("src=%s dst=%s", fs->src, fs->dst); + if (virAsprintf(&src, "%s%s", srcprefix, fs->src) < 0) goto cleanup; @@ -1349,6 +1413,8 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, int ret = -1; char *data = NULL; + VIR_DEBUG("usage=%lld sec=%s", fs->usage, sec_mount_options); + if (virAsprintf(&data, "size=%lldk%s", fs->usage, sec_mount_options) < 0) goto cleanup; @@ -1536,6 +1602,11 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) goto cleanup; + /* Ensure entire root filesystem (except /.oldroot) is readonly */ + if (root->readonly && + lxcContainerSetReadOnly(root) < 0) + goto cleanup; + /* Mounts /proc/meminfo etc sysinfo */ if (lxcContainerMountProcFuse(vmDef, stateDir) < 0) goto cleanup; -- 1.8.3.1

3 4

[libvirt] [PATCH libvirt-sandbox] include <locale.h> where needed.
by Ian Main 09 Sep '13

09 Sep '13

For some reason this does not build out of the box for me as I get errors about 'setlocale()' being used without declaration. This patch adds the appropriate header to the appropriate files. Signed-off-by: Ian Main <imain(a)redhat.com> --- bin/virt-sandbox-service-util.c | 1 + bin/virt-sandbox.c | 1 + libvirt-sandbox/libvirt-sandbox-init-common.c | 1 + 3 files changed, 3 insertions(+) diff --git a/bin/virt-sandbox-service-util.c b/bin/virt-sandbox-service-util.c index 83ff17c..c7757fd 100644 --- a/bin/virt-sandbox-service-util.c +++ b/bin/virt-sandbox-service-util.c @@ -25,6 +25,7 @@ #include <libvirt-sandbox/libvirt-sandbox.h> #include <glib/gi18n.h> +#include <locale.h> #define STREQ(x,y) (strcmp(x,y) == 0) diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c index b16217b..b9d6825 100644 --- a/bin/virt-sandbox.c +++ b/bin/virt-sandbox.c @@ -24,6 +24,7 @@ #include <libvirt-sandbox/libvirt-sandbox.h> #include <glib/gi18n.h> +#include <locale.h> static gboolean do_close(GVirSandboxConsole *con G_GNUC_UNUSED, gboolean error G_GNUC_UNUSED, diff --git a/libvirt-sandbox/libvirt-sandbox-init-common.c b/libvirt-sandbox/libvirt-sandbox-init-common.c index 262f4e1..d3c21c2 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-common.c +++ b/libvirt-sandbox/libvirt-sandbox-init-common.c @@ -44,6 +44,7 @@ #include <unistd.h> #include <limits.h> #include <grp.h> +#include <locale.h> #include "libvirt-sandbox-rpcpacket.h" -- 1.8.1.4

1 0

[libvirt] [PATCH V3] Use loop-control to allocate loop device.
by Ian Main 09 Sep '13

09 Sep '13

This patch changes virFileLoopDeviceOpen() to use the new loop-control device to allocate a new loop device. If this behavior is unsupported we fall back to the previous method of searching /dev for a free device. With this patch you can start as many image based LXC domains as you like (well almost). Fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=995543 V2: - Modified to use a dedicated error return for loop-control allocation function. - Only do fallback if /dev/loop-control does not exist, otherwise return error. V3: - Remove warning about falling back to search technique. Signed-off-by: Ian Main <imain(a)redhat.com> --- configure.ac | 12 ++++++++++ src/util/virfile.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac8cfa1..10cd872 100644 --- a/configure.ac +++ b/configure.ac @@ -913,6 +913,18 @@ if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then AC_MSG_ERROR([Required kernel features for LXC were not found]) fi ]) + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[ + #include <sched.h> + #include <linux/loop.h> + #include <sys/epoll.h> + ]], [[ + unshare(!(LOOP_CTL_GET_FREE)); + ]])], [ + AC_DEFINE([HAVE_DECL_LOOP_CTL_GET_FREE], [1], + [Define to 1 if you have the declaration of `LOOP_CTL_GET_FREE', + and to 0 if you don't.]) + ]) fi if test "$with_lxc" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled]) diff --git a/src/util/virfile.c b/src/util/virfile.c index 2b07ac9..9d42380 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -528,7 +528,56 @@ int virFileUpdatePerm(const char *path, #if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR -static int virFileLoopDeviceOpen(char **dev_name) + +#if HAVE_DECL_LOOP_CTL_GET_FREE + +/* virFileLoopDeviceOpenLoopCtl() returns -1 when a real failure has occured + * while in the process of allocating or opening the loop device. On success + * we return 0 and modify the fd to the appropriate file descriptor. + * If /dev/loop-control does not exist, we return 0 and do not set fd. */ + +static int virFileLoopDeviceOpenLoopCtl(char **dev_name, int *fd) +{ + int devnr; + int ctl_fd; + char *looppath = NULL; + + VIR_DEBUG("Opening loop-control device"); + if ((ctl_fd = open("/dev/loop-control", O_RDWR)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to open /dev/loop-control")); + if (errno == ENOENT) { + return 0; + } + return -1; + } + + if ((devnr = ioctl(ctl_fd, LOOP_CTL_GET_FREE)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to get free loop device via ioctl")); + close(ctl_fd); + return -1; + } + close(ctl_fd); + + VIR_DEBUG("Found free loop device number %i", devnr); + + if (virAsprintf(&looppath, "/dev/loop%i", devnr) < 0) + return -1; + + if ((*fd = open(looppath, O_RDWR)) < 0) { + virReportSystemError(errno, + _("Unable to open %s"), looppath); + VIR_FREE(looppath); + return -1; + } + + *dev_name = looppath; + return 0; +} +#endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ + +static int virFileLoopDeviceOpenSearch(char **dev_name) { int fd = -1; DIR *dh = NULL; @@ -601,6 +650,25 @@ cleanup: return fd; } +static int virFileLoopDeviceOpen(char **dev_name) +{ + int loop_fd = -1; + +#ifdef HAVE_DECL_LOOP_CTL_GET_FREE + if (virFileLoopDeviceOpenLoopCtl(dev_name, &loop_fd) < 0) + return -1; + + VIR_DEBUG("Return from loop-control got fd %d\n", loop_fd); + + if (loop_fd >= 0) + return loop_fd; +#endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ + + /* Without the loop control device we just use the old technique. */ + loop_fd = virFileLoopDeviceOpenSearch(dev_name); + + return loop_fd; +} int virFileLoopDeviceAssociate(const char *file, char **dev) -- 1.8.1.4

2 2

[libvirt] [PATCH 1/1] cpu: Cleanup ppcCompute to avoid memory leak
by Li Zhang 09 Sep '13

09 Sep '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patch is to Cleanup ppcCompute to avoid memory leak to make the code better. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/cpu/cpu_powerpc.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index a47ee38..4e90672 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -345,16 +345,16 @@ ppcMakeCPUData(virArch arch, struct cpuPPCData *data) static virCPUCompareResult ppcCompute(virCPUDefPtr host, - const virCPUDefPtr cpu, - virCPUDataPtr *guestData, - char **message) + const virCPUDefPtr cpu, + virCPUDataPtr *guestData, + char **message) { struct ppc_map *map = NULL; struct ppc_model *host_model = NULL; struct ppc_model *guest_model = NULL; - int ret = 0; + virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR; virArch arch; size_t i; @@ -375,8 +375,10 @@ ppcCompute(virCPUDefPtr host, virAsprintf(message, _("CPU arch %s does not match host arch"), virArchToString(cpu->arch)) < 0) - goto error; - return VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; + + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; } arch = cpu->arch; } else { @@ -392,14 +394,16 @@ ppcCompute(virCPUDefPtr host, _("host CPU vendor does not match required " "CPU vendor %s"), cpu->vendor) < 0) - goto error; - return VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; + + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; } if (!(map = ppcLoadMap()) || !(host_model = ppcModelFromCPU(host, map)) || !(guest_model = ppcModelFromCPU(cpu, map))) - goto error; + goto cleanup; if (guestData != NULL) { if (cpu->type == VIR_CPU_TYPE_GUEST && @@ -412,25 +416,23 @@ ppcCompute(virCPUDefPtr host, _("host CPU model does not match required " "CPU model %s"), guest_model->name) < 0) - goto error; - return VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; + + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; } if (!(*guestData = ppcMakeCPUData(arch, &guest_model->data))) - goto error; + goto cleanup; } ret = VIR_CPU_COMPARE_IDENTICAL; -out: +cleanup: ppcMapFree(map); ppcModelFree(host_model); ppcModelFree(guest_model); return ret; - -error: - ret = VIR_CPU_COMPARE_ERROR; - goto out; } static virCPUCompareResult -- 1.8.1.4

2 1

[libvirt] [PATCH] build: shut up automake warnings
by Eric Blake 09 Sep '13

09 Sep '13

I'm tired of seeing screenfuls of messages like these when using automake 1.13 (Fedora 19): configure.ac:2121: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged. configure.ac:2121: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead, configure.ac:2121: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files. daemon/Makefile.am:19: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') seeing as how we MUST use those constructs for the benefit of automake 1.9 (RHEL 5). Conversely, RHEL 5 automake complained: aclocal:configure.ac:36: warning: macro `AM_SILENT_RULES' not found in library Obviously, I tested this patch on both Fedora 19 and RHEL 5. * configure.ac (AM_INIT_AUTOMAKE): Avoid obsoletion warnings. (AM_SILENT_RULES): Avoid unknown macro warning. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- configure.ac | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f853e03..925afcd 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,9 @@ AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) -dnl Make automake keep quiet about wildcards & other GNUmake-isms -AM_INIT_AUTOMAKE([-Wno-portability tar-ustar]) +dnl Make automake keep quiet about wildcards & other GNUmake-isms; also keep +dnl quiet about the fact that we intentionally cater to automake 1.9 +AM_INIT_AUTOMAKE([-Wno-portability -Wno-obsolete tar-ustar]) AM_MAINTAINER_MODE([enable]) # Maintainer note - comment this line out if you plan to rerun @@ -30,9 +31,11 @@ AM_MAINTAINER_MODE([enable]) # Leave it uncommented for normal releases, for faster ./configure. gl_ASSERT_NO_GNULIB_POSIXCHECK -# Use the silent-rules feature when possible. -m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) -AM_SILENT_RULES([yes]) +# Default to using the silent-rules feature when possible. Formatting +# chosen to bypass 'grep' checks that cause older automake to warn. +# Users (include rpm) can still change the default at configure time. +m4_ifndef([AM_SILENT_RULES], + [m4_define([AM_SILENT_RULES],[])])AM_SILENT_RULES([yes]) AC_CANONICAL_HOST -- 1.8.3.1

2 4

[libvirt] [PATCHv2] qemu: don't leak vm on failure
by Eric Blake 09 Sep '13

09 Sep '13

Failure to attach to a domain during 'virsh qemu-attach' left the list of domains in an odd state: $ virsh qemu-attach 4176 error: An error occurred, but the cause is unknown $ virsh list --all Id Name State ---------------------------------------------------- 2 foo shut off $ virsh qemu-attach 4176 error: Requested operation is not valid: domain is already active as 'foo' $ virsh undefine foo error: Failed to undefine domain foo error: Requested operation is not valid: cannot undefine transient domain $ virsh shutdown foo error: Failed to shutdown domain foo error: invalid argument: monitor must not be NULL It all stems from leaving the list of domains unmodified on the initial failure; we should follow the lead of createXML which removes vm on failure (the actual initial failure still needs to be fixed in a later patch, but at least this patch gets us to the point where we aren't getting stuck with an unremovable "shut off" transient domain). While investigating, I also found a leak in qemuDomainCreateXML; the two functions should behave similarly. Note that there are still two unusual paths: if dom is not allocated, the user will see an OOM error even though the vm remains registered (but oom errors already indicate tricky cleanup); and if the vm starts and then quits again all before the job ends, it is possible to return a non-NULL dom even though the dom will no longer be useful for anything (but this at least lets the user know their short-lived vm ran). * src/qemu/qemu_driver.c (qemuDomainCreateXML): Don't leak vm on failure to obtain job. (qemuDomainQemuAttach): Match cleanup of qemuDomainCreateXML. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v1 was discussed here: https://www.redhat.com/archives/libvir-list/2013-September/msg00362.html changes since then: plug another leak of vm, and clean up some style. Expand the commit message to explain unusual paths. src/qemu/qemu_driver.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e37fe33..6dafa2b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1602,8 +1602,11 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, def = NULL; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; /* XXXX free the 'vm' we created ? */ + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) { + qemuDomainRemoveInactive(driver, vm); + vm = NULL; + goto cleanup; + } if (qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, @@ -1631,10 +1634,10 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, virDomainAuditStart(vm, "booted", true); dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) dom->id = vm->def->id; + if (dom) + dom->id = vm->def->id; - if (vm && - qemuDomainObjEndJob(driver, vm) == 0) + if (qemuDomainObjEndJob(driver, vm) == 0) vm = NULL; cleanup: @@ -13630,34 +13633,38 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, def = NULL; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) { + qemuDomainRemoveInactive(driver, vm); + vm = NULL; goto cleanup; + } if (qemuProcessAttach(conn, driver, vm, pid, pidfile, monConfig, monJSON) < 0) { + if (qemuDomainObjEndJob(driver, vm) > 0) + qemuDomainRemoveInactive(driver, vm); + vm = NULL; monConfig = NULL; - goto endjob; + goto cleanup; } monConfig = NULL; dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) dom->id = vm->def->id; + if (dom) + dom->id = vm->def->id; -endjob: if (qemuDomainObjEndJob(driver, vm) == 0) { vm = NULL; - goto cleanup; - } cleanup: virDomainDefFree(def); - virObjectUnref(qemuCaps); virDomainChrSourceDefFree(monConfig); if (vm) virObjectUnlock(vm); VIR_FREE(pidfile); virObjectUnref(caps); + virObjectUnref(qemuCaps); return dom; } -- 1.8.3.1

2 3