- Devel - libvirt List Archives

[libvirt] libivrt issue report , 1.1.0 version, while migrate VMs between two hosts, is it solved or other way to avoid it, thanks
by Guozhonghua 20 Nov '13

20 Nov '13

Libivrt 1.1.0 Migrate VM between two hosts using shell scripts. The issues is occurred about every 5 minutes, using gdb and the back trace is below: (gdb) c Continuing. [New Thread 0x7f78e7c11700 (LWP 48116)] [New Thread 0x7f78cf7fe700 (LWP 48129)] [New Thread 0x7f78ceffd700 (LWP 48306)] [New Thread 0x7f78ce7fc700 (LWP 62351)] [New Thread 0x7f78cdffb700 (LWP 62694)] Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7f78ed24a700 (LWP 46120)] 0x00007f78ef553579 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 (gdb) bt #0 0x00007f78ef553579 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007f78ef555a45 in malloc () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x00007f78ef545ae3 in vasprintf () from /lib/x86_64-linux-gnu/libc.so.6 #3 0x00007f78f07a3e54 in virVasprintf (strp=0x7f78ed249b38, fmt=0x7f78f0959c48 "server=%p client=%p message=%p prog=%p", list=0x7f78ed249c00) at util/virstring.c:334 #4 0x00007f78f077d998 in virLogVMessage (source=VIR_LOG_FROM_FILE, priority=VIR_LOG_DEBUG, filename=0x7f78f0959bed "rpc/virnetserver.c", linenr=182, funcname=0x7f78f095a500 "virNetServerHandleJob", metadata=0x0, fmt=0x7f78f0959c48 "server=%p client=%p message=%p prog=%p", vargs=0x7f78ed249c00) at util/virlog.c:836 #5 0x00007f78f077d85d in virLogMessage (source=VIR_LOG_FROM_FILE, priority=VIR_LOG_DEBUG, filename=0x7f78f0959bed "rpc/virnetserver.c", linenr=182, funcname=0x7f78f095a500 "virNetServerHandleJob", metadata=0x0, fmt=0x7f78f0959c48 "server=%p client=%p message=%p prog=%p") at util/virlog.c:773 #6 0x00007f78f08acd86 in virNetServerHandleJob (jobOpaque=0x7f78f305f6a0, opaque=0x7f78f304a360) at rpc/virnetserver.c:181 #7 0x00007f78f07a8a5e in virThreadPoolWorker (opaque=0x7f78f304a0a0) at util/virthreadpool.c:144 #8 0x00007f78f07a842a in virThreadHelper (data=0x7f78f3049ec0) at util/virthreadpthread.c:205 #9 0x00007f78ef897e9a in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0 #10 0x00007f78ef5c54bd in clone () from /lib/x86_64-linux-gnu/libc.so.6 #11 0x0000000000000000 in ?? () (gdb) frame 6 #6 0x00007f78f08acd86 in virNetServerHandleJob (jobOpaque=0x7f78f305f6a0, opaque=0x7f78f304a360) at rpc/virnetserver.c:181 181 rpc/virnetserver.c: No such file or directory. (gdb) p job $1 = (virNetServerJobPtr) 0x7f78f305f6a0 (gdb) p srv $2 = (virNetServerPtr) 0x7f78f304a360 (gdb) p job->client $3 = (virNetServerClientPtr) 0x7f78f3054a60 (gdb) p job->msg $4 = (virNetMessagePtr) 0x7f78f3051480 (gdb) p job->prog $5 = (virNetServerProgramPtr) 0x7f78f3054c60 (gdb) $6 = (virNetServerProgramPtr) 0x7f78f3054c60 (gdb) frame 5 #5 0x00007f78f077d85d in virLogMessage (source=VIR_LOG_FROM_FILE, priority=VIR_LOG_DEBUG, filename=0x7f78f0959bed "rpc/virnetserver.c", linenr=182, funcname=0x7f78f095a500 "virNetServerHandleJob", metadata=0x0, fmt=0x7f78f0959c48 "server=%p client=%p message=%p prog=%p") at util/virlog.c:773 773 util/virlog.c: No such file or directory. (gdb) frame 3 #3 0x00007f78f07a3e54 in virVasprintf (strp=0x7f78ed249b38, fmt=0x7f78f0959c48 "server=%p client=%p message=%p prog=%p", list=0x7f78ed249c00) at util/virstring.c:334 334 util/virstring.c: No such file or directory. (gdb) p strp $7 = (char **) 0x7f78ed249b38 (gdb) p *strp $8 = 0x0 (gdb) p list $9 = (struct __va_list_tag *) 0x7f78ed249c00 (gdb) p *list $10 = {gp_offset = 48, fp_offset = 48, overflow_arg_area = 0x7f78ed249ce8, reg_save_area = 0x7f78ed249c20} ------------------------------------------------------------------------------------------------------------------------------------- ???????????????????????????????????????? ???????????????????????????????????????? ???????????????????????????????????????? ??? This e-mail and its attachments contain confidential information from H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!

2 2

[libvirt] [PATCH 1/2] LXC: fix the problem that libvirt lxc fail to start on latest kernel
by Gao feng 20 Nov '13

20 Nov '13

After kernel commit 5ff9d8a65ce80efb509ce4e8051394e9ed2cd942 vfs: Lock in place mounts from more privileged users, unprivileged user has no rights to move the mounts that inherited from parent mountns. we use this feature to move the /stateDir/domain-name.{dev, devpts} to the /dev/ and /dev/pts directroy of container. this commit breaks libvirt lxc. this patch do the moving on host side, we are privileged user at this moment. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 81 +----------------------------------------------- src/lxc/lxc_controller.c | 53 +++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 80 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 2bdf957..61283e4 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -953,76 +953,6 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def ATTRIBUTE_UNUSED, } #endif -static int lxcContainerMountFSDev(virDomainDefPtr def, - const char *stateDir) -{ - int ret = -1; - char *path = NULL; - - VIR_DEBUG("Mount /dev/ stateDir=%s", stateDir); - - if ((ret = virAsprintf(&path, "/.oldroot/%s/%s.dev", - stateDir, def->name)) < 0) - return ret; - - if (virFileMakePath("/dev") < 0) { - virReportSystemError(errno, "%s", - _("Cannot create /dev")); - goto cleanup; - } - - VIR_DEBUG("Trying to move %s to /dev", path); - - if (mount(path, "/dev", NULL, MS_MOVE, NULL) < 0) { - virReportSystemError(errno, - _("Failed to mount %s on /dev"), - path); - goto cleanup; - } - - ret = 0; - -cleanup: - VIR_FREE(path); - return ret; -} - -static int lxcContainerMountFSDevPTS(virDomainDefPtr def, - const char *stateDir) -{ - int ret; - char *path = NULL; - - VIR_DEBUG("Mount /dev/pts stateDir=%s", stateDir); - - if ((ret = virAsprintf(&path, - "/.oldroot/%s/%s.devpts", - stateDir, - def->name)) < 0) - return ret; - - if (virFileMakePath("/dev/pts") < 0) { - virReportSystemError(errno, "%s", - _("Cannot create /dev/pts")); - goto cleanup; - } - - VIR_DEBUG("Trying to move %s to /dev/pts", path); - - if ((ret = mount(path, "/dev/pts", - NULL, MS_MOVE, NULL)) < 0) { - virReportSystemError(errno, - _("Failed to mount %s on /dev/pts"), - path); - goto cleanup; - } - -cleanup: - VIR_FREE(path); - - return ret; -} - static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) { size_t i; @@ -1683,14 +1613,6 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (virCgroupIsolateMount(cgroup, "/.oldroot/", sec_mount_options) < 0) goto cleanup; - /* Mounts /dev */ - if (lxcContainerMountFSDev(vmDef, stateDir) < 0) - goto cleanup; - - /* Mounts /dev/pts */ - if (lxcContainerMountFSDevPTS(vmDef, stateDir) < 0) - goto cleanup; - /* Setup device nodes in /dev/ */ if (lxcContainerSetupDevices(ttyPaths, nttyPaths) < 0) goto cleanup; @@ -1853,8 +1775,7 @@ static int lxcContainerChild(void *data) const char *tty = argv->ttyPaths[0]; if (STRPREFIX(tty, "/dev/pts/")) tty += strlen("/dev/pts/"); - if (virAsprintf(&ttyPath, "%s/%s.devpts/%s", - LXC_STATE_DIR, vmDef->name, tty) < 0) + if (virAsprintf(&ttyPath, "%s/dev/pts/%s", root->src, tty) < 0) goto cleanup; } else if (VIR_STRDUP(ttyPath, "/dev/null") < 0) { goto cleanup; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index c013147..f7b4127 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2020,6 +2020,56 @@ cleanup: } +static int +virLXCControllerMoveMount(char *name, char *root, + const char *s, const char *d) +{ + int ret = -1; + char *src = NULL; + char *dst = NULL; + + if ((ret = virAsprintf(&src, "%s/%s.%s", + LXC_STATE_DIR, name, s)) < 0) + return ret; + + if ((ret = virAsprintf(&dst, "%s%s", root, d)) < 0) + goto cleanup; + + if (virFileMakePath(dst) < 0) { + virReportSystemError(errno, _("Cannot create %s"), dst); + goto cleanup; + } + + if (mount(src, dst, NULL, MS_MOVE, NULL) < 0) { + virReportSystemError(errno, + _("Failed to mount %s on %s"), + src, dst); + goto cleanup; + } + + ret = 0; +cleanup: + VIR_FREE(src); + VIR_FREE(dst); + return ret; +} + +static int +virLXCControllerMoveMounts(virDomainDefPtr def) +{ + virDomainFSDefPtr root = virDomainGetRootFilesystem(def); + + if (virLXCControllerMoveMount(def->name, root->src, + "dev", "/dev") < 0) + return -1; + + if (virLXCControllerMoveMount(def->name, root->src, + "devpts", "/dev/pts") < 0) + return -1; + + return 0; +} + static void virLXCControllerEventSend(virLXCControllerPtr ctrl, int procnr, @@ -2167,6 +2217,9 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerSetupConsoles(ctrl, containerTTYPaths) < 0) goto cleanup; + if (virLXCControllerMoveMounts(ctrl->def) < 0) + goto cleanup; + if (lxcSetPersonality(ctrl->def) < 0) goto cleanup; -- 1.8.3.1

2 5

[libvirt] [PATCH] maint: ship .pl scripts as executables
by Eric Blake 19 Nov '13

19 Nov '13

All our .pl scripts had the executable bit set, except for one. Make it consistent (even if we invoke the scripts as an argument to $(PERL) rather than directly). * src/check-aclrules.pl: Make executable. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/check-aclrules.pl | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/check-aclrules.pl diff --git a/src/check-aclrules.pl b/src/check-aclrules.pl old mode 100644 new mode 100755 -- 1.8.3.1

1 0

[libvirt] [PATCH] Don't depend on syslog.service
by Guido Günther 19 Nov '13

19 Nov '13

Syslog is socket activated since at least systemd v35 so we can drop this dependency. Debian's linitian otherwise complains about it. References: http://www.freedesktop.org/wiki/Software/systemd/syslog/ http://lintian.debian.org/tags/systemd-service-file-refers-to-obsolete-targ… --- src/locking/virtlockd.service.in | 1 - tools/libvirt-guests.service.in | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in index a9f9f93..0ef9923 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -1,7 +1,6 @@ [Unit] Description=Virtual machine lock manager Requires=virtlockd.socket -After=syslog.target [Service] EnvironmentFile=-/etc/sysconfig/virtlockd diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index d41bf2b..5aeb14c 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -1,6 +1,6 @@ [Unit] Description=Suspend Active Libvirt Guests -After=syslog.target network.target +After=network.target [Service] EnvironmentFile=-/etc/sysconfig/libvirt-guests -- 1.8.4.2

2 3

[libvirt] [RESEND PATCH] qemu: Add support for virt machine type with virtio-mmio devices on armv7
by Clark Laughlin 19 Nov '13

19 Nov '13

These changes allow the correct virtio-blk-device and virtio-net-device devices to be used for the 'virt' machine type for armv7 rather than the PCI virtio devices. Signed-off-by: Clark Laughlin <clark.laughlin(a)linaro.org> --- Resend, with signed-off-by added and updated subject. --- src/qemu/qemu_command.c | 4 +++- src/qemu/qemu_domain.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63e235d..901120e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1335,12 +1335,14 @@ cleanup: return ret; } + static int qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { if (def->os.arch == VIR_ARCH_ARMV7L && - STRPREFIX(def->os.machine, "vexpress-") && + (STRPREFIX(def->os.machine, "vexpress-") || + STREQ(def->os.machine, "virt")) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { qemuDomainPrimeVirtioDeviceAddresses( def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 81d0ba9..346fec3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -797,6 +797,9 @@ qemuDomainDefaultNetModel(const virDomainDef *def) if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; + if (STREQ(def->os.machine, "virt")) + return "virtio"; + /* Incomplete. vexpress (and a few others) use this, but not all * arm boards */ return "lan9118"; -- 1.8.1.2

2 1

[libvirt] [PATCH] Fix off-by-1 in default SELinux MCS range
by Daniel P. Berrange 19 Nov '13

19 Nov '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> For a while we're have random failures of 'securityselinuxtest' which were not at all reproducible. Fortunately we finally caught a failure with VIR_TEST_DEBUG=1 enabled. This revealed TEST: securityselinuxtest 1) GenLabel "dynamic unconfined, s0, c0.c1023" ... OK 2) GenLabel "dynamic unconfined, s0, c0.c1023" ... OK 3) GenLabel "dynamic unconfined, s0, c0.c1023" ... OK 4) GenLabel "dynamic virtd, s0, c0.c1023" ... OK 5) GenLabel "dynamic virtd, s0, c0.c10" ... OK 6) GenLabel "dynamic virtd, s2-s3, c0.c1023" ... OK 7) GenLabel "dynamic virtd, missing range" ... Category two 1024 is out of range 0-1023 FAILED FAIL: securityselinuxtest And sure enough we had an off-by-1 in the MCS range code when the current process has no range set. The test suite randomly allocates 2 categories from 0->1024 so the chances of hitting this in the test suite were slim indeed :-) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/security/security_selinux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 310e300..ace9cc0 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -218,10 +218,10 @@ virSecuritySELinuxMCSGetProcessRange(char **sens, *tmp = '\0'; /* sens now just contains the sensitivity lower bound */ - /* If there was no category part, just assume c0.c1024 */ + /* If there was no category part, just assume c0.c1023 */ if (!cat) { *catMin = 0; - *catMax = 1024; + *catMax = 1023; ret = 0; goto cleanup; } -- 1.8.3.1

2 1

[libvirt] block-backup API for libvirt
by Ian Main 19 Nov '13

19 Nov '13

In qemu there will soon be drive-backup and block-backup commands that allow you to create backups or point-in-time snapshots of VM images. The original feature that drove this was to allow 'image fleecing', which involves creating a light weight mechanism to take a point in time snapshot of the running VM and access that remotely. You can get a good idea of the API from this post: http://lists.gnu.org/archive/html/qemu-devel/2013-10/msg02266.html I would like to see this available via libvirt and wanted to start working on a suitable API. I'm curious if anyone has any input on how they would like to see this done? While I have done some work with and on libvirt I'm no expert on the design philosophy behind the APIs so some direction here before I get coding would be much appreciated. >From what I can tell a volume based API that creates 'backups' and does the NBD export call could work but I'd like to hear if that's reasonable. Thanks! Ian

2 2

[libvirt] [PATCH] Rename virDomainGetRootFilesystem to virDomainGetFilesystemForTarget
by Daniel P. Berrange 19 Nov '13

19 Nov '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virDomainGetRootFilesystem method can be generalized to allow any filesystem path to be obtained. While doing this, start a new test case for purpose of testing various helper methods in the domain_conf.{c,h} files, such as this one. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 1 + src/conf/domain_conf.c | 5 +- src/conf/domain_conf.h | 3 +- src/libvirt_private.syms | 2 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_process.c | 2 +- tests/Makefile.am | 6 ++ tests/domainconfdata/getfilesystem.xml | 28 ++++++++ tests/domainconftest.c | 120 +++++++++++++++++++++++++++++++++ tests/testutils.c | 57 ++++++++++++++++ tests/testutils.h | 5 ++ 11 files changed, 225 insertions(+), 6 deletions(-) create mode 100644 tests/domainconfdata/getfilesystem.xml create mode 100644 tests/domainconftest.c diff --git a/.gitignore b/.gitignore index 6b024e7..acf73a4 100644 --- a/.gitignore +++ b/.gitignore @@ -158,6 +158,7 @@ /tests/commandtest /tests/conftest /tests/cputest +/tests/domainconftest /tests/domainsnapshotxml2xmltest /tests/esxutilstest /tests/eventtest diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d3f1ca2..23fea0e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17600,12 +17600,13 @@ virDiskNameToBusDeviceIndex(virDomainDiskDefPtr disk, } virDomainFSDefPtr -virDomainGetRootFilesystem(virDomainDefPtr def) +virDomainGetFilesystemForTarget(virDomainDefPtr def, + const char *path) { size_t i; for (i = 0; i < def->nfss; i++) { - if (STREQ(def->fss[i]->dst, "/")) + if (STREQ(def->fss[i]->dst, path)) return def->fss[i]; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4561ccc..22cbd5b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2497,7 +2497,8 @@ int virDiskNameToBusDeviceIndex(virDomainDiskDefPtr disk, int *busIdx, int *devIdx); -virDomainFSDefPtr virDomainGetRootFilesystem(virDomainDefPtr def); +virDomainFSDefPtr virDomainGetFilesystemForTarget(virDomainDefPtr def, + const char *path); int virDomainFSIndexByName(virDomainDefPtr def, const char *name); int virDomainVideoDefaultType(const virDomainDef *def); int virDomainVideoDefaultRAM(const virDomainDef *def, int type); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a705c56..2d3d7f1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -222,7 +222,7 @@ virDomainFSTypeFromString; virDomainFSTypeToString; virDomainFSWrpolicyTypeFromString; virDomainFSWrpolicyTypeToString; -virDomainGetRootFilesystem; +virDomainGetFilesystemForTarget; virDomainGraphicsAuthConnectedTypeFromString; virDomainGraphicsAuthConnectedTypeToString; virDomainGraphicsDefFree; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 2bdf957..12d957a 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1847,7 +1847,7 @@ static int lxcContainerChild(void *data) if (lxcContainerSetID(vmDef) < 0) goto cleanup; - root = virDomainGetRootFilesystem(vmDef); + root = virDomainGetFilesystemForTarget(vmDef, "/"); if (argv->nttyPaths) { const char *tty = argv->ttyPaths[0]; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index c51c4d5..d15cde3 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -930,7 +930,7 @@ virLXCProcessReadLogOutput(virDomainObjPtr vm, static int virLXCProcessEnsureRootFS(virDomainObjPtr vm) { - virDomainFSDefPtr root = virDomainGetRootFilesystem(vm->def); + virDomainFSDefPtr root = virDomainGetFilesystemForTarget(vm->def, "/"); if (root) return 0; diff --git a/tests/Makefile.am b/tests/Makefile.am index e46d5f7..0ef82fb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -64,6 +64,7 @@ EXTRA_DIST = \ commanddata \ confdata \ cputestdata \ + domainconfdata \ domainschemadata \ domainschematest \ domainsnapshotschematest \ @@ -138,6 +139,7 @@ test_programs = virshtest sockettest \ virportallocatortest \ sysinfotest \ virstoragetest \ + domainconftest \ $(NULL) if WITH_REMOTE @@ -884,6 +886,10 @@ sysinfotest_SOURCES = \ sysinfotest.c testutils.h testutils.c sysinfotest_LDADD = $(LDADDS) +domainconftest_SOURCES = \ + domainconftest.c testutils.h testutils.c +domainconftest_LDADD = $(LDADDS) + fdstreamtest_SOURCES = \ fdstreamtest.c testutils.h testutils.c fdstreamtest_LDADD = $(LDADDS) diff --git a/tests/domainconfdata/getfilesystem.xml b/tests/domainconfdata/getfilesystem.xml new file mode 100644 index 0000000..2ee78b4 --- /dev/null +++ b/tests/domainconfdata/getfilesystem.xml @@ -0,0 +1,28 @@ +<domain type='test'> + <name>demo</name> + <uuid>8369f1ac-7e46-e869-4ca5-759d51478066</uuid> + <memory unit='KiB'>500000</memory> + <currentMemory unit='KiB'>500000</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <init>/bin/sh</init> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/'/> + <target dir='/'/> + </filesystem> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/'/> + <target dir='/dev'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/domainconftest.c b/tests/domainconftest.c new file mode 100644 index 0000000..d38ef5c --- /dev/null +++ b/tests/domainconftest.c @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include "testutils.h" +#include "virerror.h" +#include "viralloc.h" +#include "virlog.h" + +#include "domain_conf.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +static virCapsPtr caps; +static virDomainXMLOptionPtr xmlopt; + +struct testGetFilesystemData { + const char *filename; + const char *path; + bool expectEntry; +}; + +static int testGetFilesystem(const void *opaque) +{ + int ret = -1; + char *xmlData = NULL; + virDomainDefPtr def = NULL; + char *filename = NULL; + const struct testGetFilesystemData *data = opaque; + virDomainFSDefPtr fsdef; + + if (virAsprintf(&filename, "%s/domainconfdata/%s.xml", + abs_srcdir, data->filename) < 0) + goto cleanup; + + if (virtTestLoadFile(filename, &xmlData) < 0) + goto cleanup; + + if (!(def = virDomainDefParseString(xmlData, caps, xmlopt, + 1 << VIR_DOMAIN_VIRT_TEST, 0))) + goto cleanup; + + fsdef = virDomainGetFilesystemForTarget(def, + data->path); + if (!fsdef) { + if (data->expectEntry) { + fprintf(stderr, "Expected FS for path '%s' in '%s'\n", + data->path, filename); + goto cleanup; + } + } else { + if (!data->expectEntry) { + fprintf(stderr, "Unexpected FS for path '%s' in '%s'\n", + data->path, filename); + goto cleanup; + } + } + + ret = 0; + +cleanup: + virDomainDefFree(def); + VIR_FREE(xmlData); + VIR_FREE(filename); + return ret; +} + +static int +mymain(void) +{ + int ret = 0; + + if ((caps = virTestGenericCapsInit()) == NULL) + goto cleanup; + + if (!(xmlopt = virTestGenericDomainXMLConfInit())) + goto cleanup; + +#define DO_TEST_GET_FS(fspath, expect) \ + do { \ + struct testGetFilesystemData data = { \ + .filename = "getfilesystem", \ + .path = fspath, \ + .expectEntry = expect, \ + }; \ + if (virtTestRun("Get FS " fspath, testGetFilesystem, &data) < 0) \ + ret = -1; \ + } while (0) + + DO_TEST_GET_FS("/", true); + DO_TEST_GET_FS("/dev", true); + DO_TEST_GET_FS("/dev/pts", false); + DO_TEST_GET_FS("/doesnotexist", false); + + virObjectUnref(caps); + virObjectUnref(xmlopt); + + cleanup: + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) diff --git a/tests/testutils.c b/tests/testutils.c index 5d634b4..5975715 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -654,3 +654,60 @@ int virtTestClearLineRegex(const char *pattern, return 0; } + + +virCapsPtr virTestGenericCapsInit(void) +{ + virCapsPtr caps; + virCapsGuestPtr guest; + + if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64, + 0, 0)) == NULL) + return NULL; + + if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_I686, + "/usr/bin/acme-virt", NULL, + 0, NULL)) == NULL) + goto error; + + if (!virCapabilitiesAddGuestDomain(guest, "test", NULL, NULL, 0, NULL)) + goto error; + + + if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_X86_64, + "/usr/bin/acme-virt", NULL, + 0, NULL)) == NULL) + goto error; + + if (!virCapabilitiesAddGuestDomain(guest, "test", NULL, NULL, 0, NULL)) + goto error; + + + if (virTestGetDebug()) { + char *caps_str; + + caps_str = virCapabilitiesFormatXML(caps); + if (!caps_str) + goto error; + + fprintf(stderr, "Generic driver capabilities:\n%s", caps_str); + + VIR_FREE(caps_str); + } + + return caps; + +error: + virObjectUnref(caps); + return NULL; +} + +static virDomainDefParserConfig virTestGenericDomainDefParserConfig; +static virDomainXMLPrivateDataCallbacks virTestGenericPrivateDataCallbacks; + +virDomainXMLOptionPtr virTestGenericDomainXMLConfInit(void) +{ + return virDomainXMLOptionNew(&virTestGenericDomainDefParserConfig, + &virTestGenericPrivateDataCallbacks, + NULL); +} diff --git a/tests/testutils.h b/tests/testutils.h index 478b53c..4781e04 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -27,6 +27,8 @@ # include "viralloc.h" # include "virfile.h" # include "virstring.h" +# include "capabilities.h" +# include "domain_conf.h" # define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */ # define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken */ @@ -98,4 +100,7 @@ int virtTestMain(int argc, return virtTestMain(argc, argv, func); \ } +virCapsPtr virTestGenericCapsInit(void); +virDomainXMLOptionPtr virTestGenericDomainXMLConfInit(void); + #endif /* __VIT_TEST_UTILS_H__ */ -- 1.8.3.1

1 0

[libvirt] [PATCH] Add missing break to switch-case block
by Doug Goldstein 19 Nov '13

19 Nov '13

The case label for VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED did not have its own break statement but relied on falling through which we probably don't want. --- python/libvirt-override.c | 1 + 1 file changed, 1 insertion(+) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 2e58bf9..747c877 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -6399,6 +6399,7 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, break; case VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED: cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDeviceRemovedCallback); + break; case VIR_DOMAIN_EVENT_ID_LAST: break; -- 1.8.3.2

2 2

[libvirt] [libvirt-python 00/18] Remaining bits for libvirt-python split
by Doug Goldstein 19 Nov '13

19 Nov '13

As a follow up to Daniel Berrange's libvirt-python creation patchset [1], I've added the following to allow the repo to build against multiple versions of libvirt. I've successfully built it against libvirt 0.10.2.8 from Fedora 18 but will test further against some other distros as well. If you just want something clone-able you can get the full repo from: git clone https://github.com/cardoe/libvirt-python.git And since its github you can see the web page at: https://github.com/cardoe/libvirt-python The patchset is still a work in progress for the following: * commit message clean up * tests against additional versions I'm really curious to see how far back people want to support things. [1] http://www.redhat.com/archives/libvir-list/2013-November/msg00416.html Doug Goldstein (18): Bump version number to current 1.1.5 Add missing URL attribute to setup.py Add maintainer/maintainer_email to the libvirt list Add libvirt version check macro from libvirt upstream Break generator.py to be called per module Create array of modules to be built Don't build LXC module when building less than 1.0.2 virTypedParams* API appeared in 1.0.2 virNodeGetCPUMap API not added until 1.0.0 virDomainMigrate3 and virDomainMigrateToURI3 not added until 1.1.0 Wrap new domain create APIs added in 1.1.1 virConnectGetCPUModelNames() did not appear until 1.1.3 virDomainGetJobStats() was added in 1.0.3 virDomainMigrateGetCompressionCache() was added in 1.0.3 VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK added in 1.0.0 VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED was added in 1.1.1 Add missing break to switch-case block Bring some virTypedParams* API from libvirt generator.py | 24 ++++++++++++------------ libvirt-override.c | 40 ++++++++++++++++++++++++++++++++++++++-- libvirt-utils.c | 43 +++++++++++++++++++++++++++++++++++++++++++ libvirt-utils.h | 16 ++++++++++++++++ setup.py | 53 +++++++++++++++++++++++++++++++++++++++++------------ 5 files changed, 150 insertions(+), 26 deletions(-) -- 1.8.3.2

3 39

[libvirt] [PATCH] qemumonitorjsontest: Introduce GetNonExistingCPUData test
by Michal Privoznik 19 Nov '13

19 Nov '13

In the 730af8f2cd commit we are fixing broken qemu startup on systems with ancient qemu. This commit introduces the regression test for that specific case to make sure we don't break it again. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemumonitorjsontest.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 4cdb938..2152e4a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2038,6 +2038,49 @@ cleanup: return ret; } +static int +testQemuMonitorJSONGetNonExistingCPUData(const void *opaque) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr) opaque; + qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + virCPUDataPtr cpuData = NULL; + int rv, ret = -1; + + if (!test) + return -1; + + if (qemuMonitorTestAddItem(test, "qom-list", + "{" + " \"id\": \"libvirt-7\"," + " \"error\": {" + " \"class\": \"CommandNotFound\"," + " \"desc\": \"The command qom-list has not been found\"" + " }" + "}") < 0) + goto cleanup; + + rv = qemuMonitorJSONGetGuestCPU(qemuMonitorTestGetMonitor(test), + VIR_ARCH_X86_64, + &cpuData); + if (rv != -2) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Unexpected return value %d, expecting -2", rv); + goto cleanup; + } + + if (cpuData) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Unexpected allocation of data = %p, expecting NULL", + cpuData); + goto cleanup; + } + + ret = 0; +cleanup: + qemuMonitorTestFree(test); + cpuDataFree(cpuData); + return ret; +} static int mymain(void) @@ -2094,6 +2137,7 @@ mymain(void) DO_TEST(SetObjectProperty); DO_TEST(GetDeviceAliases); DO_TEST(CPU); + DO_TEST(GetNonExistingCPUData); DO_TEST_SIMPLE("qmp_capabilities", qemuMonitorJSONSetCapabilities); DO_TEST_SIMPLE("system_powerdown", qemuMonitorJSONSystemPowerdown); DO_TEST_SIMPLE("system_reset", qemuMonitorJSONSystemReset); -- 1.8.3.2

2 1

[libvirt] [PATCH] qemuMonitorJSONGetCPUx86Data: Don't fail on ancient qemus
by Michal Privoznik 19 Nov '13

19 Nov '13

On the domain startup, this function is called to dump some info about the CPUs. At the beginning of the function we check if we aren't running older qemu which is not exposing the CPUs via 'qom-list'. However, we are not checking for even older qemus, which throw 'CommandNotFound' error. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e716fb3..ec3b958 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5528,11 +5528,13 @@ qemuMonitorJSONGetCPUx86Data(qemuMonitorPtr mon, goto cleanup; /* check if device exists */ - if ((data = virJSONValueObjectGet(reply, "error")) && - STREQ_NULLABLE(virJSONValueObjectGetString(data, "class"), - "DeviceNotFound")) { - ret = -2; - goto cleanup; + if ((data = virJSONValueObjectGet(reply, "error"))) { + const char *klass = virJSONValueObjectGetString(data, "class"); + if (STREQ_NULLABLE(klass, "DeviceNotFound") || + STREQ_NULLABLE(klass, "CommandNotFound")) { + ret = -2; + goto cleanup; + } } if (qemuMonitorJSONCheckError(cmd, reply)) -- 1.8.3.2

2 2

[libvirt] ANNOUNCE: libvirt-sandbox "Cholistan" release 0.5.1
by Daniel P. Berrange 19 Nov '13

19 Nov '13

I pleased to announce the a new public release of libvirt-sandbox, version 0.5.0, is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. This release focused on exclusively on bugfixing Changed in this release: - Fix path to systemd binary (prefers dir /lib/systemd not /bin) - Remove obsolete commands from virt-sandbox-service man page - Fix delete of running service container - Allow use of custom root dirs with 'virt-sandbox --root DIR' - Fix 'upgrade' command for virt-sandbox-service generic services - Fix logrotate script to use virsh for listing sandboxed services - Add 'inherit' option for virt-sandbox '-s' security context option, to auto-copy calling process' context - Remove non-existant '-S' option froom virt-sandbox-service man page - Fix line break formatting of man page - Mention LIBVIRT_DEFAULT_URI in virt-sandbox-service man page - Check some return values in libvirt-sandbox-init-qemu - Remove unused variables - Fix crash with partially specified mount option string - Add man page docs for 'ram' mount type - Avoid close of un-opened file descriptor - Fix leak of file handles in init helpers - Log a message if sandbox cleanup fails - Cope with domain being missing when deleting container - Improve stack trace diagnostics in virt-sandbox-service - Fix virt-sandbox-service content copying code when faced with non-regular files. - Improve error reporting if kernel does not exist - Allow kernel version/path/kmod to be set with virt-sandbox - Don't overmount '/root' in QEMU sandboxes by default - Fix nosuid / nodev mount options for tmpfs - Force 9p2000.u protocol version to avoid QEMU bugs - Fix cleanup when failing to start interactive sandbox - Create copy of kernel from /boot to allow relabelling - Bulk re-indent of code - Avoid crash when gateway is missing in network options - Fix symlink target created in multi-user.target.wants - Add '-p PATH' option for virt-sandbox-service clone/delete to match 'create' command option. - Only allow 'lxc:///' URIs with virt-sandbox-service until further notice - Rollback state if cloning a service sandbox fails - Add more kernel modules instead of assuming they are all builtins - Don't complain if some kmods are missing, as they may be builtins - Allow --mount to be repeated with virt-sandbox-service Thanks to everyone who contributed to this release Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] Fix virsh net-info output for consistency
by hliu＠redhat.com 19 Nov '13

19 Nov '13

From: Hao Liu <hliu(a)redhat.com> All *-info virsh commands output a list of comma seperated key-val pairs. But virsh net-info command misses this comma for key "Name" and "UUID". Signed-off-by: Hao Liu <hliu(a)redhat.com> --- tools/virsh-network.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 8ddd5ca..44a676b 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -367,10 +367,10 @@ cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd) if (!(network = vshCommandOptNetwork(ctl, cmd, NULL))) return false; - vshPrint(ctl, "%-15s %s\n", _("Name"), virNetworkGetName(network)); + vshPrint(ctl, "%-15s %s\n", _("Name:"), virNetworkGetName(network)); if (virNetworkGetUUIDString(network, uuid) == 0) - vshPrint(ctl, "%-15s %s\n", _("UUID"), uuid); + vshPrint(ctl, "%-15s %s\n", _("UUID:"), uuid); active = virNetworkIsActive(network); if (active >= 0) -- 1.8.3.1

4 3

[libvirt] [PATCH v2] build: silence a clang warning in virsh.c
by Ryota Ozaki 19 Nov '13

19 Nov '13

This patch shuts up the following warning of clang on Mac OS X: virsh.c:2761:22: error: assigning to 'char *' from 'const char [6]' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] rl_readline_name = "virsh"; ^ ~~~~~~~ The warning happens because rl_readline_name on Mac OS X is still 'char *', while it is 'const char *' on most platforms. So adding a cast to (char *) can suppress the warning, although that is not necessary for other platforms. Tested on Mac OS X 10.8.5 (clang-500.2.75) and Fedora 19 (gcc 4.8.1). Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> --- tools/virsh.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 241c5b8..1edffb3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2757,8 +2757,12 @@ vshReadlineInit(vshControl *ctl) int max_history = 500; const char *histsize_str; - /* Allow conditional parsing of the ~/.inputrc file. */ - rl_readline_name = "virsh"; + /* Allow conditional parsing of the ~/.inputrc file. + * XXX: the cast is necessary for Mac OS X to slient + * clang's warning. On Mac OS X, rl_readline_name is + * char * while on most platforms it's const char *. + */ + rl_readline_name = (char *) "virsh"; /* Tell the completer that we want a crack first. */ rl_attempted_completion_function = vshReadlineCompletion; -- 1.8.4

3 7

[libvirt] [PATCH] maint: fix comment typos.
by Eric Blake 19 Nov '13

19 Nov '13

* src/qemu/qemu_command.c (qemuBuildVolumeString): Fix typo. * src/qemu/qemu_monitor.c (qemuMonitorSend): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/qemu/qemu_command.c | 2 +- src/qemu/qemu_monitor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 966aa0d..6668fed 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3823,7 +3823,7 @@ qemuBuildVolumeString(virConnectPtr conn, } break; case VIR_STORAGE_VOL_NETWORK: - /* Keep the compiler quite, qemuTranslateDiskSourcePool already + /* Keep the compiler quiet, qemuTranslateDiskSourcePool already * reported the unsupported error. */ break; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 87a7798..f7bf49a 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -943,7 +943,7 @@ int qemuMonitorSend(qemuMonitorPtr mon, { int ret = -1; - /* Check whether qemu quited unexpectedly */ + /* Check whether qemu quit unexpectedly */ if (mon->lastError.code != VIR_ERR_OK) { VIR_DEBUG("Attempt to send command while error is set %s", NULLSTR(mon->lastError.message)); -- 1.8.3.1

2 1

[libvirt] Finding Primary or Bootable disk
by Umar Draz 19 Nov '13

19 Nov '13

Hi I am working with php-libvirt, How I can find the primary or bootable disk device of a virtual machine? Br. Umar

2 3

[libvirt] [PATCH] RFC: Support QEMU live uprgade
by Zheng Sheng ZS Zhou 19 Nov '13

19 Nov '13

Hi all, Recently QEMU developers are working on a feature to allow upgrading a live QEMU instance to a new version without restarting the VM. This is implemented as live migration between the old and new QEMU process on the same host [1]. Here is the the use case: 1) Guests are running QEMU release 1.6.1. 2) Admin installs QEMU release 1.6.2 via RPM or deb. 3) Admin starts a new VM using the updated QEMU binary, and asks the old QEMU process to migrate the VM to the newly started VM. I think it will be very useful to support QEMU live upgrade in libvirt. After some investigations, I found migrating to the same host breaks the current migration code. I'd like to propose a new work flow for QEMU live migration. It is to implement the above step 3). I add a new API named virDomainQemuLiveUpgrade, and a new domain command in virsh named qemu-live-upgrade. The work flow of virDomainQemuLiveUpgrade is like following. newDef = deep copy oldVm definition newVm = create VM using newDef, start QEMU process with all vCPUs paused oldVm migrate to newVm using unix socket shutdown oldVm newPid = newVm->pid finalDef = live deep copy of newVm definition Drop the newVm from qemu domain table without shutting down QEMU process Assign finalDef to oldVm oldVm attaches to QEMU process newPid using finalDef resume all vCPUs in oldVm I wrote a RFC patch to demo this work flow. To try my patch, you can firstly apply the patch, build and install libvirt, then create and start a KVM virtual machine, at last run the following command virsh qemu-live-upgrade your_domain_name Check the output of "virsh list" and "ps aux | grep qemu", you will find the virtual machine gets a new id, and a new QEMU process running with different process id. I tested this patch on a Fedora 19 box with QEMU upgraded to 1.6. I'd like to hear your precious opinions on this upgrading flow. I can improve the flow, after we reach an agreement on this, I can start to write a more formal patch. After the upgrading work flow becomes mature, I want to add a "page-flipping" flag to this new API. The reason is that migrating to localhost requires twice host memory as the original VM does during the upgrading. Thus comes the ongoing development of using the new system call vmsplice to move memory pages between two QEMU instances, so that the kernel can just perform page re-mapping from source QEMU process to destination QEMU process in a zero-copy manner. This is expected to reduce memory consumption and speedup the whole procedure. This mechanism is based on Unix domain socket, pipes and FD inter-process passing magic[2]. The page re-mapping mechanism is transparent to libvirt, all we need to trigger this magic is (1) set QEMU migration capability to enable page re-mapping, (2) start destination QEMU process with "-incoming unix:/path/to/socket", (3) use "unix:/path/to/socket" URI when issuing QMP migration command to the source QEMU process. This RFC patch is already using Unix socket to migrate QEMU virtual machine. I'll add code to parse and inspect a "page-flipping" flag, and call QEMU monitor to enable this capability. Thanks very much any comments on this patch! [1] http://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg02916.html [2] http://lists.gnu.org/archive/html/qemu-devel/2013-09/msg04043.html >From 2b659584f2cbe676c843ddeaf198c9a8368ff0ff Mon Sep 17 00:00:00 2001 From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Date: Wed, 30 Oct 2013 15:36:49 +0800 Subject: [PATCH] RFC: Support QEMU live uprgade This patch is to support upgrading QEMU version without restarting the virtual machine. Add new API virDomainQemuLiveUpgrade(), and a new virsh command qemu-live-upgrade. virDomainQemuLiveUpgrade() migrates a running VM to the same host as a new VM with new name and new UUID. Then it shutdown the original VM and drop the new VM definition without shutdown the QEMU process of the new VM. At last it attaches original VM to the new QEMU process. Firstly the admin installs new QEMU package, then he runs virsh qemu-live-upgrade domain_name to trigger our virDomainQemuLiveUpgrade() upgrading flow. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- include/libvirt/libvirt.h.in | 3 + src/driver.h | 4 + src/libvirt.c | 23 +++ src/libvirt_public.syms | 1 + src/qemu/qemu_driver.c | 339 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_migration.h | 3 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 19 ++- tools/virsh-domain.c | 139 ++++++++++++++++++ 10 files changed, 532 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 80b2d78..7c87044 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1331,6 +1331,9 @@ int virDomainMigrateGetMaxSpeed(virDomainPtr domain, unsigned long *bandwidth, unsigned int flags); +virDomainPtr virDomainQemuLiveUpgrade(virDomainPtr domain, + unsigned int flags); + /** * VIR_NODEINFO_MAXCPUS: * @nodeinfo: virNodeInfo instance diff --git a/src/driver.h b/src/driver.h index 8cd164a..1bafa98 100644 --- a/src/driver.h +++ b/src/driver.h @@ -686,6 +686,9 @@ typedef int const char *args, char ***models, unsigned int flags); +typedef virDomainPtr +(*virDrvDomainQemuLiveUpgrade)(virDomainPtr domain, + unsigned int flags); typedef int (*virDrvDomainGetJobInfo)(virDomainPtr domain, @@ -1339,6 +1342,7 @@ struct _virDriver { virDrvDomainMigrateFinish3Params domainMigrateFinish3Params; virDrvDomainMigrateConfirm3Params domainMigrateConfirm3Params; virDrvConnectGetCPUModelNames connectGetCPUModelNames; + virDrvDomainQemuLiveUpgrade domainQemuLiveUpgrade; }; diff --git a/src/libvirt.c b/src/libvirt.c index 90608ab..9e5ff8a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7524,6 +7524,29 @@ error: /** + * virDomainQemuLiveUpgrade: + * @domain: a domain object + * @flags: bitwise-OR of flags + * + * Live upgrade qemu binary version of the domain. + * + * Returns the new domain object if the upgrade was successful, + * or NULL in case of error. + */ +virDomainPtr +virDomainQemuLiveUpgrade(virDomainPtr domain, + unsigned int flags) +{ + VIR_DEBUG("domain=%p, flags=%x", domain, flags); + if (!domain->conn->driver->domainQemuLiveUpgrade) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, __FUNCTION__); + return NULL; + } + return domain->conn->driver->domainQemuLiveUpgrade(domain, flags); +} + + +/** * virNodeGetInfo: * @conn: pointer to the hypervisor connection * @info: pointer to a virNodeInfo structure allocated by the user diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index fe9b497..82f0b37 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -637,6 +637,7 @@ LIBVIRT_1.1.1 { LIBVIRT_1.1.3 { global: virConnectGetCPUModelNames; + virDomainQemuLiveUpgrade; } LIBVIRT_1.1.1; # .... define new API here using predicted next version number .... diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ef1359c..7cd76e0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15705,6 +15705,344 @@ qemuConnectGetCPUModelNames(virConnectPtr conn, } +static virDomainDefPtr +virDomainDefLiveCopy(virDomainDefPtr src, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt) +{ + char *xml; + virDomainDefPtr ret; + unsigned int flags = VIR_DOMAIN_XML_SECURE; + + /* Easiest to clone via a round-trip through XML. */ + if (!(xml = virDomainDefFormat(src, flags))) + return NULL; + + ret = virDomainDefParseString(xml, caps, xmlopt, -1, flags); + + VIR_FREE(xml); + return ret; +} + + +static virDomainDefPtr +qemuLiveUpgradeMiniBegin(virQEMUDriverPtr driver, virDomainObjPtr vm) { + virCapsPtr caps = NULL; + virDomainDefPtr newDef = NULL; + virDomainDefPtr result = NULL; + char *newName = NULL; + + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) + goto cleanup; + + if (!(newDef = virDomainDefCopy(vm->def, caps, driver->xmlopt, true))) + goto cleanup; + + if (virAsprintf(&newName, "%s_qemu_live_upgrade", vm->def->name) < 0) + goto cleanup; + + VIR_FREE(newDef->name); + newDef->name = newName; + + if (-1 == virUUIDGenerate(newDef->uuid)) + goto cleanup; + + result = newDef; + newDef = NULL; + +cleanup: + virDomainDefFree(newDef); + virObjectUnref(caps); + + return result; +} + +static virDomainObjPtr +qemuLiveUpgradeMiniPrepare(virQEMUDriverPtr driver, virConnectPtr conn, + virDomainDefPtr newDef) { + virDomainObjPtr newVm = NULL; + virDomainObjPtr result = NULL; + char *upgradeUri = NULL; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + + newVm = virDomainObjListAdd(driver->domains, newDef, driver->xmlopt, + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, NULL); + if (!newVm) + goto cleanup; + newDef = NULL; + + if (virAsprintf(&upgradeUri, "unix:%s/qemu.live.upgrade.%s.sock", + cfg->libDir, newVm->def->name) < 0) + goto cleanup; + + if (qemuProcessStart(conn, driver, newVm, upgradeUri, -1, NULL, + NULL, VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESTROY) < 0) + goto cleanup; + + result = newVm; + newVm = NULL; + +cleanup: + if (newVm) + qemuDomainRemoveInactive(driver, newVm); + VIR_FREE(upgradeUri); + virDomainDefFree(newDef); + virObjectUnref(cfg); + + if (result) + virObjectUnlock(result); + return result; +} + +static bool +qemuLiveUpgradeMiniPerform(virQEMUDriverPtr driver, virDomainObjPtr vm, + const char *newName) { + char *upgradeSock = NULL; + qemuDomainObjPrivatePtr priv = vm->privateData; + bool result = false; + bool migrate = false; + int r = 0; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + + if (virAsprintf(&upgradeSock, "%s/qemu.live.upgrade.%s.sock", + cfg->libDir, newName) < 0) + goto cleanup; + + if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) + goto cleanup; + r = qemuMonitorMigrateToUnix(priv->mon, 0, upgradeSock); + qemuDomainObjExitMonitor(driver, vm); + migrate = true; + if (r < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + goto cleanup; + } + + if (qemuMigrationWaitForCompletion(driver, vm, QEMU_ASYNC_JOB_NONE, + NULL, true) < 0) + goto cleanup; + + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { + if (qemuMigrationSetOffline(driver, vm) < 0) + goto cleanup; + } + + result = true; + +cleanup: + /* QEMU memory pages has been re-mapped during the migrate, no way to + * continue the original VM */ + if (migrate) + qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED, + QEMU_ASYNC_JOB_NONE); + VIR_FREE(upgradeSock); + virObjectUnref(cfg); + + return result; +} + +static bool +qemuLiveUpgradeMiniFinish(virQEMUDriverPtr driver, virDomainObjPtr newVm, + const char *origName, const unsigned char *origUuid, + virDomainDefPtr *newDef, bool *newMonJSON, + virDomainChrSourceDefPtr *newMonConf, + pid_t *newPid, const char **newPidFile) { + virCapsPtr caps = NULL; + qemuDomainObjPrivatePtr newPriv = newVm->privateData; + bool result = false; + size_t i = 0; + + virDomainDefPtr tmpDef = NULL; + virDomainChrSourceDefPtr tmpMonConf = NULL; + char *tmpPidFile = NULL; + + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) + goto abort; + + newVm->persistent = 0; + qemuProcessAutoDestroyRemove(driver, newVm); + + if (!(tmpDef = virDomainDefLiveCopy(newVm->def, caps, driver->xmlopt))) + goto abort; + + VIR_FREE(tmpDef->name); + if (VIR_STRDUP(tmpDef->name, origName) < 0) { + goto abort; + } + + for (i=0; i < VIR_UUID_BUFLEN; ++i) { + tmpDef->uuid[i] = origUuid[i]; + } + + if (VIR_ALLOC(tmpMonConf) < 0) + goto abort; + + if (virDomainChrSourceDefCopy(tmpMonConf, newPriv->monConfig) < 0) + goto abort; + + if (VIR_STRDUP(tmpPidFile, newPriv->pidfile) < 0) + goto abort; + + if (newPriv->mon) { + qemuMonitorClose(newPriv->mon); + newPriv->mon = NULL; + } + + *newPid = newVm->pid; + *newPidFile = tmpPidFile; + *newDef = tmpDef; + *newMonConf = tmpMonConf; + *newMonJSON = newPriv->monJSON; + result = true; + +cleanup: + virObjectUnref(caps); + + qemuDomainRemoveInactive(driver, newVm); + return result; + +abort: + VIR_FREE(tmpPidFile); + virDomainChrSourceDefFree(tmpMonConf); + virDomainDefFree(tmpDef); + qemuProcessStop(driver, newVm, VIR_DOMAIN_SHUTOFF_MIGRATED, + QEMU_ASYNC_JOB_NONE); + goto cleanup; +} + +static virDomainPtr +qemuLiveUpgradeMiniConfirm(virQEMUDriverPtr driver, virConnectPtr conn, + virDomainDefPtr newDef, bool newMonJSON, + virDomainChrSourceDefPtr newMonConf, + pid_t newPid, const char *newPidFile) { + virDomainPtr newDom = NULL; + virDomainObjPtr newVm = NULL; + int r = 0; + + if (!(newVm = virDomainObjListAdd(driver->domains, newDef, driver->xmlopt, + 0, NULL))) + goto cleanup; + newDef = NULL; + newVm->def->id = -1; + + VIR_SHRINK_N(newVm->def->seclabels, newVm->def->nseclabels, newVm->def->nseclabels); + if (virSecurityManagerGenLabel(driver->securityManager, newVm->def) < 0) + goto cleanup; + r = qemuProcessAttach(conn, driver, newVm, newPid, + newPidFile, newMonConf, newMonJSON); + newMonConf = NULL; + if (r < 0) + goto cleanup; + + if (qemuProcessStartCPUs(driver, newVm, conn, + VIR_DOMAIN_RUNNING_MIGRATED, + QEMU_ASYNC_JOB_NONE) < 0) { + qemuProcessStop(driver, newVm, VIR_DOMAIN_SHUTOFF_FAILED, + VIR_QEMU_PROCESS_STOP_MIGRATED); + goto cleanup; + } + newDom = virGetDomain(conn, newVm->def->name, newVm->def->uuid); + +cleanup: + VIR_FREE(newPidFile); + virDomainChrSourceDefFree(newMonConf); + virDomainDefFree(newDef); + if (newVm) + virObjectUnlock(newVm); + + return newDom; +} + +static virDomainPtr +qemuDomObjQemuLiveUpgrade(virQEMUDriverPtr driver, virConnectPtr conn, + virDomainObjPtr vm, unsigned int flags) { + char *origName = NULL; + unsigned char origUuid[VIR_UUID_BUFLEN]; + size_t i = 0; + virDomainPtr newDom = NULL; + virDomainDefPtr newDef = NULL; + virDomainObjPtr newVm = NULL; + virDomainChrSourceDefPtr newMonConf = NULL; + bool newMonJSON = false; + pid_t newPid = -1; + const char * newPidFile = NULL; + virDomainDefPtr finalDef = NULL; + + VIR_DEBUG("vm=%p, flags=%x", vm, flags); + + if (!(newDef = qemuLiveUpgradeMiniBegin(driver, vm))) + goto cleanup; + + virObjectUnlock(vm); + newVm = qemuLiveUpgradeMiniPrepare(driver, conn, newDef); + virObjectLock(vm); + newDef = NULL; + if (!newVm) { + goto cleanup; + } + + if (!qemuLiveUpgradeMiniPerform(driver, vm, newVm->def->name)) { + goto cleanup; + } + + if (VIR_STRDUP(origName, vm->def->name) < 0) + goto cleanup; + for (i=0; i < VIR_UUID_BUFLEN; ++i) { + origUuid[i] = vm->def->uuid[i]; + } + virObjectUnlock(vm); + vm = NULL; + + if (!qemuLiveUpgradeMiniFinish(driver, newVm, origName, origUuid, + &finalDef, &newMonJSON, &newMonConf, &newPid, + &newPidFile)) + goto cleanup; + newVm = NULL; + + newDom = qemuLiveUpgradeMiniConfirm(driver, conn, finalDef, newMonJSON, + newMonConf, newPid, newPidFile); + finalDef = NULL; + newMonConf = NULL; + newPidFile = NULL; + +cleanup: + VIR_FREE(origName); + if (newVm) + qemuDomainRemoveInactive(driver, newVm); + if (vm) + virObjectUnlock(vm); + + return newDom; +} + +static virDomainPtr +qemuDomainQemuLiveUpgrade(virDomainPtr domain, + unsigned int flags) +{ + virQEMUDriverPtr driver = domain->conn->privateData; + virDomainObjPtr vm = NULL; + + VIR_DEBUG("domain=%p, flags=%x", domain, flags); + + if (!(vm = qemuDomObjFromDomain(domain))) + return NULL; + + if (virDomainQemuLiveUpgradeEnsureACL(domain->conn, vm->def) < 0) { + virObjectUnlock(vm); + return NULL; + } + + return qemuDomObjQemuLiveUpgrade(driver, domain->conn, vm, flags); +} + + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = QEMU_DRIVER_NAME, @@ -15892,6 +16230,7 @@ static virDriver qemuDriver = { .domainMigrateFinish3Params = qemuDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = qemuDomainMigrateConfirm3Params, /* 1.1.0 */ .connectGetCPUModelNames = qemuConnectGetCPUModelNames, /* 1.1.3 */ + .domainQemuLiveUpgrade = qemuDomainQemuLiveUpgrade, /* 1.1.3 */ }; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a3d986f..f859936 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1686,7 +1686,7 @@ qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver, } -static int +int qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, virDomainObjPtr vm, enum qemuDomainAsyncJob asyncJob, virConnectPtr dconn, bool abort_on_error) diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index cafa2a2..48b2009 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -162,6 +162,9 @@ int qemuMigrationConfirm(virConnectPtr conn, int cookieinlen, unsigned int flags, int cancelled); +int qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, virDomainObjPtr vm, + enum qemuDomainAsyncJob asyncJob, + virConnectPtr dconn, bool abort_on_error); bool qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDefPtr def, bool remote, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7181949..cfa70bd 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7013,6 +7013,7 @@ static virDriver remote_driver = { .domainMigrateFinish3Params = remoteDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = remoteDomainMigrateConfirm3Params, /* 1.1.0 */ .connectGetCPUModelNames = remoteConnectGetCPUModelNames, /* 1.1.3 */ + .domainQemuLiveUpgrade = remoteDomainQemuLiveUpgrade, /* 1.1.3 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index f942670..25f35b2 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2849,6 +2849,15 @@ struct remote_connect_get_cpu_model_names_ret { int ret; }; +struct remote_domain_qemu_live_upgrade_args { + remote_nonnull_domain dom; + unsigned int flags; +}; + +struct remote_domain_qemu_live_upgrade_ret { + remote_nonnull_domain domUpgraded; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -5018,5 +5027,13 @@ enum remote_procedure { * @generate: none * @acl: connect:read */ - REMOTE_PROC_CONNECT_GET_CPU_MODEL_NAMES = 312 + REMOTE_PROC_CONNECT_GET_CPU_MODEL_NAMES = 312, + + /** + * @generate: both + * @acl: domain:migrate + * @acl: domain:start + * @acl: domain:write + */ + REMOTE_PROC_DOMAIN_QEMU_LIVE_UPGRADE = 313 }; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 60abd3d..e0c7997 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10451,6 +10451,139 @@ cleanup: return ret; } +/* + * "qemu-live-upgrade" command + */ +static const vshCmdInfo info_qemu_live_upgrade[] = { + {.name = "help", + .data = N_("Live upgrade QEMU binary version of a running domain") + }, + {.name = "desc", + .data = N_("Let the domain make use of a newly upgraded QEMU binary without restart.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_qemu_live_upgrade[] = { + {.name = "domain", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("domain name, id or uuid") + }, + {.name = "page-flipping", + .type = VSH_OT_BOOL, + .help = N_("enable memory page flipping when upgrading the QEMU binray") + }, + {.name = "timeout", + .type = VSH_OT_INT, + .help = N_("force guest to suspend if QEMU live upgrade exceeds timeout (in seconds)") + }, + {.name = "verbose", + .type = VSH_OT_BOOL, + .help = N_("display the progress of uprgade") + }, + {.name = NULL} +}; + +static void +doQemuLiveUpgrade(void *opaque) +{ + char ret = '1'; + virDomainPtr dom = NULL; + virDomainPtr domUpgraded = NULL; + unsigned int flags = 0; + vshCtrlData *data = opaque; + vshControl *ctl = data->ctl; + const vshCmd *cmd = data->cmd; + sigset_t sigmask, oldsigmask; + + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGINT); + if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0) + goto out_sig; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + goto out; + + if ((domUpgraded = virDomainQemuLiveUpgrade(dom, flags))) { + ret = '0'; + } + +out: + pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); +out_sig: + if (domUpgraded) + virDomainFree(domUpgraded); + if (dom) + virDomainFree(dom); + ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); + return; +} + +static void +vshQemuLiveUpgradeTimeout(vshControl *ctl, + virDomainPtr dom, + void *opaque ATTRIBUTE_UNUSED) +{ + vshDebug(ctl, VSH_ERR_DEBUG, "suspending the domain, " + "since QEMU live uprgade timed out\n"); + virDomainSuspend(dom); +} + +static bool +cmdQemuLiveUpgrade(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + int p[2] = {-1, -1}; + virThread workerThread; + bool verbose = false; + bool functionReturn = false; + int timeout = 0; + vshCtrlData data; + int rv; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (vshCommandOptBool(cmd, "verbose")) + verbose = true; + + if ((rv = vshCommandOptInt(cmd, "timeout", &timeout)) < 0 || + (rv > 0 && timeout < 1)) { + vshError(ctl, "%s", _("qemu-live-uprgade: Invalid timeout")); + goto cleanup; + } else if (rv > 0) { + /* Ensure that we can multiply by 1000 without overflowing. */ + if (timeout > INT_MAX / 1000) { + vshError(ctl, "%s", _("qemu-live-uprgade: Timeout is too big")); + goto cleanup; + } + } + + if (pipe(p) < 0) + goto cleanup; + + data.ctl = ctl; + data.cmd = cmd; + data.writefd = p[1]; + + if (virThreadCreate(&workerThread, + true, + doQemuLiveUpgrade, + &data) < 0) + goto cleanup; + functionReturn = vshWatchJob(ctl, dom, verbose, p[0], timeout, + vshQemuLiveUpgradeTimeout, NULL, _("Upgrade")); + + virThreadJoin(&workerThread); + +cleanup: + virDomainFree(dom); + VIR_FORCE_CLOSE(p[0]); + VIR_FORCE_CLOSE(p[1]); + return functionReturn; +} + const vshCmdDef domManagementCmds[] = { {.name = "attach-device", .handler = cmdAttachDevice, @@ -10796,6 +10929,12 @@ const vshCmdDef domManagementCmds[] = { .info = info_qemu_agent_command, .flags = 0 }, + {.name = "qemu-live-upgrade", + .handler = cmdQemuLiveUpgrade, + .opts = opts_qemu_live_upgrade, + .info = info_qemu_live_upgrade, + .flags = 0 + }, {.name = "reboot", .handler = cmdReboot, .opts = opts_reboot, -- 1.8.3.1 _____________________________ Zhou Zheng Sheng / 周征晟 Software Engineer E-mail: zhshzhou(a)cn.ibm.com Telephone: 86-10-82454397

3 10

[libvirt] [PATCH v2]lxc: don't mount dir if ownership couldn't be known
by Chen Hanxiao 19 Nov '13

19 Nov '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we enable userns, we could bind mount some dirs from host to guest, which don't belong to the target mapped uid/gid. Such as we could bind mount root's dirs to guest. What is worse, we could even modify root's files in that bind dir inside container. So if we couldn't know the dir's ownership(without a proper uid/gid mapping), don't mount it. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- v2: add more description src/lxc/lxc_container.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 255c711..4cf209e 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -96,6 +96,8 @@ typedef char lxc_message_t; #define LXC_CONTINUE_MSG 'c' +#define OVERFLOW_UGID 65534 + typedef struct __lxc_child_argv lxc_child_argv_t; struct __lxc_child_argv { virDomainDefPtr config; @@ -1073,6 +1075,22 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, if (virAsprintf(&src, "%s%s", srcprefix, fs->src) < 0) goto cleanup; + if (stat(src, &st) < 0) { + virReportSystemError(errno, _("Unable to stat bind source %s"), + src); + goto cleanup; + } else { + if (OVERFLOW_UGID == st.st_uid || OVERFLOW_UGID == st.st_gid) { + errno = EPERM; + VIR_DEBUG("Unknown st_uid %d, st_gid %d for %s", + st.st_uid, st.st_gid, fs->src); + virReportSystemError(errno, + _("Check the permission of src dir '%s' provided for container") + ,fs->src); + goto cleanup; + } + } + if (stat(fs->dst, &st) < 0) { if (errno != ENOENT) { virReportSystemError(errno, _("Unable to stat bind target %s"), -- 1.8.2.1

3 7

[libvirt] [RFC PATCH] storage: add network-dir as new storage volume type
by Eric Blake 19 Nov '13

19 Nov '13

In the 'directory' and 'netfs' storage pools, a user can see both 'file' and 'dir' storage volume types, to know when they can descend into a subdirectory. But in a network-based storage pool, such as the upcoming 'gluster' pool, we use 'network' instead of 'file', and did not have any counterpart for a directory until this patch. Adding a new volume type 'network-dir' is better than reusing 'dir', because it makes it clear that the only way to access 'network' volumes within that container is through the network mounting (leaving 'dir' for something accessible in the local file system). * include/libvirt/libvirt.h.in (virStorageVolType): Expand enum. * src/qemu/qemu_command.c (qemuBuildVolumeString): Fix client. * src/qemu/qemu_conf.c (qemuTranslateDiskSourcePool): Likewise. * tools/virsh-volume.c (vshVolumeTypeToString): Likewise. * src/storage/storage_backend_fs.c (virStorageBackendFileSystemVolDelete): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- If you do 'virsh vol-list $pool --details', you'll see various types of volumes listed in the output. For 'directory' and 'netfs' pools, telling 'dir' and 'file' apart is important. For my pending 'gluster' work, seeing 'network' everywhere hides that distinction, hence my proposal of adding a new type. But as I prepared this patch for posting, I noticed a bigger problem: we don't expose this information in volume XML, but only in virStorageVolGetInfo(). So, I'm wondering if I should pursue this further by enhancing the <volume> XML to _also_ expose this type (currently 'file', 'dir', 'block', or 'network', and possibly my addition of 'network-dir'), so that callers can get the information via a single call to virStorageVolGetXMLDesc() (which already reports everything else that you can get from virStorageVolGetInfo, and would thus make it a full superset instead of needing both calls to get the full picture). include/libvirt/libvirt.h.in | 2 ++ src/qemu/qemu_command.c | 6 ++++-- src/qemu/qemu_conf.c | 4 +++- src/storage/storage_backend_fs.c | 5 +++-- tools/virsh-volume.c | 7 +++++-- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 146a59b..5e8cba6 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2951,6 +2951,8 @@ typedef enum { VIR_STORAGE_VOL_BLOCK = 1, /* Block based volumes */ VIR_STORAGE_VOL_DIR = 2, /* Directory-passthrough based volume */ VIR_STORAGE_VOL_NETWORK = 3, /* Network volumes like RBD (RADOS Block Device) */ + VIR_STORAGE_VOL_NETWORK_DIR = 4, /* Network accessible directory that can + * contain other network volumes */ #ifdef VIR_ENUM_SENTINELS VIR_STORAGE_VOL_LAST diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6668fed..bf3533b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3780,7 +3780,7 @@ qemuBuildVolumeString(virConnectPtr conn, { int ret = -1; - switch (disk->srcpool->voltype) { + switch ((virStorageVolType) disk->srcpool->voltype) { case VIR_STORAGE_VOL_DIR: if (!disk->readonly) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3823,10 +3823,12 @@ qemuBuildVolumeString(virConnectPtr conn, } break; case VIR_STORAGE_VOL_NETWORK: + case VIR_STORAGE_VOL_NETWORK_DIR: + case VIR_STORAGE_VOL_LAST: /* Keep the compiler quiet, qemuTranslateDiskSourcePool already * reported the unsupported error. */ - break; + goto cleanup; } ret = 0; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 03c9c7d..c9d03b0 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1331,7 +1331,7 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, goto cleanup; } - switch (info.type) { + switch ((virStorageVolType) info.type) { case VIR_STORAGE_VOL_FILE: case VIR_STORAGE_VOL_DIR: if (!(def->src = virStorageVolGetPath(vol))) @@ -1376,6 +1376,8 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, break; case VIR_STORAGE_VOL_NETWORK: + case VIR_STORAGE_VOL_NETWORK_DIR: + case VIR_STORAGE_VOL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Using network volume as disk source is not supported")); goto cleanup; diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 510a3d6..2af6faf 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1137,7 +1137,7 @@ virStorageBackendFileSystemVolDelete(virConnectPtr conn ATTRIBUTE_UNUSED, { virCheckFlags(0, -1); - switch (vol->type) { + switch ((virStorageVolType) vol->type) { case VIR_STORAGE_VOL_FILE: if (unlink(vol->target.path) < 0) { /* Silently ignore failures where the vol has already gone away */ @@ -1159,7 +1159,8 @@ virStorageBackendFileSystemVolDelete(virConnectPtr conn ATTRIBUTE_UNUSED, break; case VIR_STORAGE_VOL_BLOCK: case VIR_STORAGE_VOL_NETWORK: - default: + case VIR_STORAGE_VOL_NETWORK_DIR: + case VIR_STORAGE_VOL_LAST: virReportError(VIR_ERR_NO_SUPPORT, _("removing block or network volumes is not supported: %s"), vol->target.path); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 55a99d0..377a73b 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1,7 +1,7 @@ /* * virsh-volume.c: Commands to manage storage volume * - * Copyright (C) 2005, 2007-2012 Red Hat, Inc. + * Copyright (C) 2005, 2007-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -946,7 +946,7 @@ out: static const char * vshVolumeTypeToString(int type) { - switch (type) { + switch ((virStorageVolType) type) { case VIR_STORAGE_VOL_FILE: return N_("file"); @@ -959,6 +959,9 @@ vshVolumeTypeToString(int type) case VIR_STORAGE_VOL_NETWORK: return N_("network"); + case VIR_STORAGE_VOL_NETWORK_DIR: + return N_("net-dir"); + case VIR_STORAGE_VOL_LAST: break; } -- 1.8.3.1

1 0

Re: [libvirt] Fedora 20: libvirt-guest.service is not working
by Eric Blake 18 Nov '13

18 Nov '13

[adding upstream libvirt, as this topic seems to be getting hot lately] On 11/18/2013 04:34 PM, Mateusz Marzantowicz wrote: > KMV/QEMU guest are not shut down properly during host shutdown > procedure. One of 3 running virtual machines needs about 20-30 seconds > to power off but whole host system (F20) goes off in less than 10 > seconds (at last this works perfectly). There's a good chance that this may be related to one or both of https://bugzilla.redhat.com/show_bug.cgi?id=1031696 https://bugzilla.redhat.com/show_bug.cgi?id=906009 > > Not all guests (chosen randomly) are started again after host system > reboot despite they are configured to do so. > > Because identical configuration worked for me in F17 and F19 I suspect > some regression in libvirtd or systemd (or maybe some other component?) Entirely possible. And would be nice to fix. > > Running /usr/libexec/libvirt-guests.sh stop|start directly from command > line works as expected. > > > # systemctl status libvirt-guests.service > libvirt-guests.service - Suspend Active Libvirt Guests > Loaded: loaded (/usr/lib/systemd/system/libvirt-guests.service; enabled) > Active: active (exited) since wto 2013-11-19 00:05:10 CET; 2min 21s ago > Process: 1616 ExecStart=/usr/libexec/libvirt-guests.sh start > (code=exited, status=0/SUCCESS) > Main PID: 1616 (code=exited, status=0/SUCCESS) > CGroup: /system.slice/libvirt-guests.service > > lis 19 00:05:10 hive.local systemd[1]: Starting Suspend Active Libvirt > Guests... > lis 19 00:05:10 hive.local systemd[1]: Started Suspend Active Libvirt > Guests. > > # cat /etc/sysconfig/libvirt-guests > ON_SHUTDOWN=shutdown > PARALLEL_SHUTDOWN=0 > SHUTDOWN_TIMEOUT=300 > > > Thanks for any suggestions, Alas, I don't have good suggestions on how to fix the problem myself, but hopefully by adding upstream libvirt we can get more eyes looking at the problem. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] Pin guest to memory node on NUMA system
by Shivaprasad G Bhat 18 Nov '13

18 Nov '13

The patch contains the fix for defect 1009880 reported at redhat bugzilla. The root cause is, ever since the subcpusets(vcpu,emulator) were introduced, the paren cpuset cannot be modified to remove the nodes that are in use by the subcpusets. The fix is to break the memory node modification into three steps as to assign new nodes into the parent first. Change the nodes in the child nodes. Then remove the old nodes on the parent node. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c613967..4db692e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8193,7 +8193,11 @@ qemuDomainSetNumaParameters(virDomainPtr dom, } } else if (STREQ(param->field, VIR_DOMAIN_NUMA_NODESET)) { virBitmapPtr nodeset = NULL; + virBitmapPtr old_nodeset = NULL; + virBitmapPtr temp_nodeset = NULL; char *nodeset_str = NULL; + char *old_nodeset_str = NULL; + char *temp_nodeset_str = NULL; if (virBitmapParse(params[i].value.s, 0, &nodeset, @@ -8203,6 +8207,10 @@ qemuDomainSetNumaParameters(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { + size_t j; + virCgroupPtr cgroup_vcpu = NULL; + virCgroupPtr cgroup_emulator = NULL; + if (vm->def->numatune.memory.mode != VIR_DOMAIN_NUMATUNE_MEM_STRICT) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -8222,7 +8230,128 @@ qemuDomainSetNumaParameters(virDomainPtr dom, continue; } + if (virCgroupGetCpusetMems(priv->cgroup, &old_nodeset_str) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to get current system nodeset values")); + virBitmapFree(nodeset); + VIR_FREE(nodeset_str); + ret = -1; + continue; + } + + if (virBitmapParse(old_nodeset_str, 0, &old_nodeset, + VIR_DOMAIN_CPUMASK_LEN) < 0) { + virBitmapFree(nodeset); + VIR_FREE(nodeset_str); + VIR_FREE(old_nodeset_str); + ret = -1; + continue; + } + + if ((temp_nodeset = virBitmapNewCopy(old_nodeset)) == NULL) { + virBitmapFree(nodeset); + VIR_FREE(nodeset_str); + virBitmapFree(old_nodeset); + VIR_FREE(old_nodeset_str); + ret = -1; + continue; + } + virBitmapFree(old_nodeset); + VIR_FREE(old_nodeset_str); + + for (j = 0; j < caps->host.nnumaCell; j++) { + bool result; + if (virBitmapGetBit(nodeset, j, &result) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to get cpuset bit values")); + ret = -1; + break; + } + if (result && (virBitmapSetBit(temp_nodeset, j) < 0)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to set temporary cpuset bit values")); + ret = -1; + break; + } + } + + if (ret) { + virBitmapFree(nodeset); + VIR_FREE(nodeset_str); + virBitmapFree(temp_nodeset); + continue; + } + + if (!(temp_nodeset_str = virBitmapFormat(temp_nodeset))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to format nodeset")); + virBitmapFree(nodeset); + VIR_FREE(nodeset_str); + virBitmapFree(temp_nodeset); + ret = -1; + continue; + } + + if (virCgroupSetCpusetMems(priv->cgroup, temp_nodeset_str) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to set cpuset values")); + virBitmapFree(nodeset); + VIR_FREE(nodeset_str); + virBitmapFree(temp_nodeset); + VIR_FREE(temp_nodeset_str); + ret = -1; + continue; + } + + virBitmapFree(temp_nodeset); + VIR_FREE(temp_nodeset_str); + + for (j = 0; j < priv->nvcpupids; j++) { + if (virCgroupNewVcpu(priv->cgroup, j, false, &cgroup_vcpu) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to get cpuset values for vcpu%d"), j); + ret = -1; + break; + } + if (virCgroupSetCpusetMems(cgroup_vcpu, nodeset_str) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to set cpuset values for vcpu%d"), j); + virCgroupFree(&cgroup_vcpu); + ret = -1; + break; + } + virCgroupFree(&cgroup_vcpu); + } + + if (ret) { + virBitmapFree(nodeset); + VIR_FREE(nodeset_str); + continue; + } + + if (virCgroupNewEmulator(priv->cgroup, false, &cgroup_emulator) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s" + _("Failed to get cpuset values for emulator")); + virBitmapFree(nodeset); + VIR_FREE(nodeset_str); + ret = -1; + continue; + } + + if (virCgroupSetCpusetMems(cgroup_emulator, nodeset_str) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s" + _("Failed to set cpuset values for emulator")); + virBitmapFree(nodeset); + VIR_FREE(nodeset_str); + virCgroupFree(&cgroup_emulator); + ret = -1; + continue; + } + virCgroupFree(&cgroup_emulator); + if (virCgroupSetCpusetMems(priv->cgroup, nodeset_str) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s" + _("Failed to set cpuset")); virBitmapFree(nodeset); VIR_FREE(nodeset_str); ret = -1;

1 0

[libvirt] [PATCHv3] Macro for testing the version you are compiling with
by Doug Goldstein 18 Nov '13

18 Nov '13

Added a macro similar to the GLib's GLIB_CHECK_VERSION so that one can simply do something like: #if LIBVIR_CHECK_VERSION(1,1,3) /* Call function here that appeared in 1.1.3 and newer */ virSomeNewFunction(); #endif --- v3: rename from LIBVIRT_CHECK_VERSION to LIBVIR_CHECK_VERSION v2: Change from Linux kernel style macro to GLib style macro --- include/libvirt/libvirt.h.in | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index d656634..146a59b 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1466,6 +1466,22 @@ VIR_EXPORT_VAR virConnectAuthPtr virConnectAuthPtrDefault; #define LIBVIR_VERSION_NUMBER @LIBVIRT_VERSION_NUMBER@ +/** + * LIBVIR_CHECK_VERSION: + * @major: major component of the version number + * @minor: minor component of the version number + * @micro: micro component of the version number + * + * Macro for developers to easily check what version of the library + * their code is compiling against. + * e.g. + * #if LIBVIR_CHECK_VERSION(1,1,3) + * // some code that only works in 1.1.3 and newer + * #endif + */ +#define LIBVIR_CHECK_VERSION(major, minor, micro) \ + ((major) * 1000000 + (minor) * 1000 + (micro) <= LIBVIR_VERSION_NUMBER) + int virGetVersion (unsigned long *libVer, const char *type, unsigned long *typeVer); -- 1.8.3.2

2 1

[libvirt] [PATCH] Avoid async signal safety problem in glibc's setxid
by Daniel P. Berrange 18 Nov '13

18 Nov '13

The glibc setxid is supposed to be async signal safe, but libc developers confirm that it is not. This causes a problem when libvirt_lxc starts the FUSE thread and then runs clone() to start the container. If the clone() was done before the FUSE thread has completely started up, then the container will hang in setxid after clone(). The fix is to avoid creating any threads until after the container has been clone()'d. By avoiding any threads in the parent, the child is no longer required to run in an async signal safe context, and we thus avoid the glibc bug. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_controller.c | 11 +++++++++-- src/lxc/lxc_fuse.c | 21 +++++++++++++++------ src/lxc/lxc_fuse.h | 1 + 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 232af54..c013147 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1983,6 +1983,12 @@ virLXCControllerSetupFuse(virLXCControllerPtr ctrl) } static int +virLXCControllerStartFuse(virLXCControllerPtr ctrl) +{ + return lxcStartFuse(ctrl->fuse); +} + +static int virLXCControllerSetupConsoles(virLXCControllerPtr ctrl, char **containerTTYPaths) { @@ -2187,6 +2193,9 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerMoveInterfaces(ctrl) < 0) goto cleanup; + if (virLXCControllerStartFuse(ctrl) < 0) + goto cleanup; + if (lxcContainerSendContinue(control[0]) < 0) { virReportSystemError(errno, "%s", _("Unable to send container continue message")); @@ -2199,8 +2208,6 @@ virLXCControllerRun(virLXCControllerPtr ctrl) goto cleanup; } - /* Now the container is fully setup... */ - /* ...and reduce our privileges */ if (lxcControllerClearCapabilities() < 0) goto cleanup; diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 9d12832..88e122e 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -322,12 +322,6 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) goto cleanup1; } - if (virThreadCreate(&fuse->thread, false, lxcFuseRun, - (void *)fuse) < 0) { - lxcFuseDestroy(fuse); - goto cleanup1; - } - ret = 0; cleanup: fuse_opt_free_args(&args); @@ -341,6 +335,17 @@ cleanup2: goto cleanup; } +int lxcStartFuse(virLXCFusePtr fuse) +{ + if (virThreadCreate(&fuse->thread, false, lxcFuseRun, + (void *)fuse) < 0) { + lxcFuseDestroy(fuse); + return -1; + } + + return 0; +} + void lxcFreeFuse(virLXCFusePtr *f) { virLXCFusePtr fuse = *f; @@ -364,6 +369,10 @@ int lxcSetupFuse(virLXCFusePtr *f ATTRIBUTE_UNUSED, return 0; } +int lxcStartFuse(virLXCFusePtr f ATTRIBUTE_UNUSED) +{ +} + void lxcFreeFuse(virLXCFusePtr *f ATTRIBUTE_UNUSED) { } diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h index b3713af..d60492b 100644 --- a/src/lxc/lxc_fuse.h +++ b/src/lxc/lxc_fuse.h @@ -58,6 +58,7 @@ struct virLXCFuse { typedef struct virLXCFuse *virLXCFusePtr; extern int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def); +extern int lxcStartFuse(virLXCFusePtr f); extern void lxcFreeFuse(virLXCFusePtr *f); #endif /* LXC_FUSE_H */ -- 1.8.4.2

4 5

[libvirt] [PATCH] Add hw random number generator (/dev/hwrng) to default qemu cgroup ACL
by Pradipta Kr. Banerjee 18 Nov '13

18 Nov '13

Creating a qemu VM with /dev/hwrng as backed RNG device throws the following error - "Could not open '/dev/hwrng': Operation not permitted" This patch fixes the issue Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- src/qemu/qemu_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index ace7e35..d9ebb30 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -39,7 +39,7 @@ static const char *const defaultDeviceACL[] = { "/dev/null", "/dev/full", "/dev/zero", - "/dev/random", "/dev/urandom", + "/dev/random", "/dev/urandom", "/dev/hwrng", "/dev/ptmx", "/dev/kvm", "/dev/kqemu", "/dev/rtc", "/dev/hpet", "/dev/vfio/vfio", NULL, -- 1.8.3.1

4 6