- Devel - libvirt List Archives

[libvirt] [PATCHv2] storage: allow interleave in volume XML
by Eric Blake 25 Nov '13

25 Nov '13

The RNG grammar did not allow arbitrary interleaving, which makes it harder than necessary to create a new volume from handwritten XML. (Compare also to commit caf516db for pools). * docs/schemas/storagevol.rng: Support interleaving. * tests/storagevolxml2xmlin/vol-file-backing.xml: Test it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: correct version (actually applies to libvirt.git, rather than depending on unpublished intermediate commits) reviewer's note: see bottom for easier-to-review schema change docs/schemas/storagevol.rng | 138 +++++++++++++------------ tests/storagevolxml2xmlin/vol-file-backing.xml | 15 +-- 2 files changed, 82 insertions(+), 71 deletions(-) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 5da8e1f..e79bc35 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -13,55 +13,61 @@ <define name='vol'> <element name='volume'> - <element name='name'> - <ref name='volName'/> - </element> - <optional> - <element name='key'> - <text/> + <interleave> + <element name='name'> + <ref name='volName'/> </element> - </optional> - <optional> - <ref name='source'/> - </optional> - <ref name='sizing'/> - <ref name='target'/> - <optional> - <ref name='backingStore'/> - </optional> + <optional> + <element name='key'> + <text/> + </element> + </optional> + <optional> + <ref name='source'/> + </optional> + <ref name='sizing'/> + <ref name='target'/> + <optional> + <ref name='backingStore'/> + </optional> + </interleave> </element> </define> <define name='sizing'> - <optional> - <element name='capacity'> - <ref name='scaledInteger'/> - </element> - </optional> - <optional> - <element name='allocation'> - <ref name='scaledInteger'/> - </element> - </optional> + <interleave> + <optional> + <element name='capacity'> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name='allocation'> + <ref name='scaledInteger'/> + </element> + </optional> + </interleave> </define> <define name='permissions'> <optional> <element name='permissions'> - <element name='mode'> - <ref name='octalMode'/> - </element> - <element name='owner'> - <ref name='unsignedInt'/> - </element> - <element name='group'> - <ref name='unsignedInt'/> - </element> - <optional> - <element name='label'> - <text/> - </element> - </optional> + <interleave> + <element name='mode'> + <ref name='octalMode'/> + </element> + <element name='owner'> + <ref name='unsignedInt'/> + </element> + <element name='group'> + <ref name='unsignedInt'/> + </element> + <optional> + <element name='label'> + <text/> + </element> + </optional> + </interleave> </element> </optional> </define> @@ -103,36 +109,40 @@ <define name='target'> <element name='target'> - <optional> - <element name='path'> - <choice> - <data type='anyURI'/> - <ref name='absFilePath'/> - </choice> - </element> - </optional> - <ref name='format'/> - <ref name='permissions'/> - <ref name='timestamps'/> - <optional> - <ref name='encryption'/> - </optional> - <optional> - <ref name='compat'/> - </optional> - <optional> - <ref name='fileFormatFeatures'/> - </optional> + <interleave> + <optional> + <element name='path'> + <choice> + <data type='anyURI'/> + <ref name='absFilePath'/> + </choice> + </element> + </optional> + <ref name='format'/> + <ref name='permissions'/> + <ref name='timestamps'/> + <optional> + <ref name='encryption'/> + </optional> + <optional> + <ref name='compat'/> + </optional> + <optional> + <ref name='fileFormatFeatures'/> + </optional> + </interleave> </element> </define> <define name='backingStore'> <element name='backingStore'> - <element name='path'> - <ref name='absFilePath'/> - </element> - <ref name='format'/> - <ref name='permissions'/> + <interleave> + <element name='path'> + <ref name='absFilePath'/> + </element> + <ref name='format'/> + <ref name='permissions'/> + </interleave> </element> </define> diff --git a/tests/storagevolxml2xmlin/vol-file-backing.xml b/tests/storagevolxml2xmlin/vol-file-backing.xml index 73e7f28..8610ea4 100644 --- a/tests/storagevolxml2xmlin/vol-file-backing.xml +++ b/tests/storagevolxml2xmlin/vol-file-backing.xml @@ -1,25 +1,26 @@ <volume> - <name>sparse.img</name> +  <key>/var/lib/libvirt/images/sparse.img</key> - <source/> <capacity unit='GB'>10</capacity> - <allocation unit='MiB'>0</allocation> + <source/> <target> - <path>/var/lib/libvirt/images/sparse.img</path> <permissions> - <mode>0</mode> <owner>0744</owner> + <mode>0</mode> <group>0</group> </permissions> + <path>/var/lib/libvirt/images/sparse.img</path> </target> + <allocation unit='MiB'>0</allocation> <backingStore> - <path>/var/lib/virt/images/master.img</path> <format type='vmdk'/> + <path>/var/lib/virt/images/master.img</path> <permissions> <mode>0744</mode> + <label>virt_image_t</label> <owner>1</owner> <group>1</group> - <label>virt_image_t</label> </permissions> </backingStore> + <name>sparse.img</name> </volume> -- 1.8.3.1 As promised, the easier rng change view: diff --git c/docs/schemas/storagevol.rng w/docs/schemas/storagevol.rng index 5da8e1f..e79bc35 100644 --- c/docs/schemas/storagevol.rng +++ w/docs/schemas/storagevol.rng @@ -13,6 +13,7 @@ <define name='vol'> <element name='volume'> + <interleave> <element name='name'> <ref name='volName'/> </element> @@ -29,10 +30,12 @@ <optional> <ref name='backingStore'/> </optional> + </interleave> </element> </define> <define name='sizing'> + <interleave> <optional> <element name='capacity'> <ref name='scaledInteger'/> @@ -43,11 +46,13 @@ <ref name='scaledInteger'/> </element> </optional> + </interleave> </define> <define name='permissions'> <optional> <element name='permissions'> + <interleave> <element name='mode'> <ref name='octalMode'/> </element> @@ -62,6 +67,7 @@ <text/> </element> </optional> + </interleave> </element> </optional> </define> @@ -103,6 +109,7 @@ <define name='target'> <element name='target'> + <interleave> <optional> <element name='path'> <choice> @@ -123,16 +130,19 @@ <optional> <ref name='fileFormatFeatures'/> </optional> + </interleave> </element> </define> <define name='backingStore'> <element name='backingStore'> + <interleave> <element name='path'> <ref name='absFilePath'/> </element> <ref name='format'/> <ref name='permissions'/> + </interleave> </element> </define>

2 2

[libvirt] [PATCH 0/4] Add support for VirtualBox 4.3 APIs
by Ryota Ozaki 25 Nov '13

25 Nov '13

This patch set adds support for VirtualBox 4.3 APIs. The first two patches clean up existing code to make it easy to add new code. The third patch imports the header file of 4.3 APIs. The last patch actually adds code to support 4.3 APIs. This patch set doesn't add any new features introduced by new APIs, but just fixes incompatibilies since API 4.2. This patch set is tested on Mac OS X 10.8.5 and Fedora 19. ozaki-r Ryota Ozaki (4): vbox: cleanup vboxAttachUSB vbox: pull vboxHostDeviceGetXMLDesc out from vboxDomainGetXMLDesc vbox: import vbox_CAPI_v4_3.h from SDK vbox: add support for 4.3 APIs src/Makefile.am | 3 +- src/vbox/vbox_CAPI_v4_3.h | 10210 ++++++++++++++++++++++++++++++++++++++++++++ src/vbox/vbox_V4_3.c | 13 + src/vbox/vbox_driver.c | 8 + src/vbox/vbox_tmpl.c | 414 +- 5 files changed, 10483 insertions(+), 165 deletions(-) create mode 100644 src/vbox/vbox_CAPI_v4_3.h create mode 100644 src/vbox/vbox_V4_3.c -- 1.8.4

2 11

[libvirt] [PATCH] maint: next release is 1.2.0
by Eric Blake 25 Nov '13

25 Nov '13

I didn't find any other instances with: git grep '1\.1\.5' * src/test/test_driver.c (testDriver): Tweak version info. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/test/test_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 469223e..c1f1cd4 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7193,7 +7193,7 @@ static virDriver testDriver = { .domainRevertToSnapshot = testDomainRevertToSnapshot, /* 1.1.4 */ .domainSnapshotDelete = testDomainSnapshotDelete, /* 1.1.4 */ - .connectBaselineCPU = testConnectBaselineCPU, /* 1.1.5 */ + .connectBaselineCPU = testConnectBaselineCPU, /* 1.2.0 */ }; static virNetworkDriver testNetworkDriver = { -- 1.8.3.1

1 0

[libvirt] [PATCH] LXC: add securetty related note in Device nodes
by Gao feng 25 Nov '13

25 Nov '13

Tell user how to resolve the problem that fail to log in the container. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- docs/drvlxc.html.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index ca488f7..d5a4410 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -164,6 +164,14 @@ numbered incrementally from there. </p> <p> +Since /dev/ttyN and /dev/console are linked to the pts devices. The +tty device of login program is pts device. the pam module securetty +may prevent root user from logging in container. If you want root +user to log in container successfully, add the pts device to the file +/etc/securetty of container. +</p> + +<p> Further block or character devices will be made available to containers depending on their configuration. </p> -- 1.8.3.1

2 1

[libvirt] [PATCH v2]lxc: don't do duplicate work when getting pagesize
by Chen Hanxiao 25 Nov '13

25 Nov '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Don't do duplicate work when getting pagesize. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- v2: remove redundant debug log src/lxc/lxc_container.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 2bdf957..00bbaf7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -144,6 +144,7 @@ int lxcContainerHasReboot(void) int cmd, v; int status; char *tmp; + int stacksize = getpagesize() * 4; if (virFileReadAll("/proc/sys/kernel/ctrl-alt-del", 10, &buf) < 0) return -1; @@ -160,10 +161,10 @@ int lxcContainerHasReboot(void) VIR_FREE(buf); cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF; - if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0) + if (VIR_ALLOC_N(stack, stacksize) < 0) return -1; - childStack = stack + (getpagesize() * 4); + childStack = stack + stacksize; cpid = clone(lxcContainerRebootChild, childStack, flags, &cmd); VIR_FREE(stack); @@ -2031,6 +2032,7 @@ int lxcContainerStart(virDomainDefPtr def, /* allocate a stack for the container */ if (VIR_ALLOC_N(stack, stacksize) < 0) return -1; + stacktop = stack + stacksize; cflags = CLONE_NEWPID|CLONE_NEWNS|CLONE_NEWUTS|CLONE_NEWIPC|SIGCHLD; @@ -2078,6 +2080,7 @@ int lxcContainerAvailable(int features) int cpid; char *childStack; char *stack; + int stacksize = getpagesize() * 4; if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; @@ -2085,12 +2088,10 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; - if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0) { - VIR_DEBUG("Unable to allocate stack"); + if (VIR_ALLOC_N(stack, stacksize) < 0) return -1; - } - childStack = stack + (getpagesize() * 4); + childStack = stack + stacksize; cpid = clone(lxcContainerDummyChild, childStack, flags, NULL); VIR_FREE(stack); -- 1.8.2.1

2 1

[libvirt] [test-API][PATCH] add new patch for testing pinemulator API
by Xuesong Zhang 25 Nov '13

25 Nov '13

--- cases/pinemulator.conf | 46 +++++++++++++++++++++++++ repos/domain/pinemulator.py | 84 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100755 cases/pinemulator.conf create mode 100755 repos/domain/pinemulator.py diff --git a/cases/pinemulator.conf b/cases/pinemulator.conf new file mode 100755 index 0000000..2f270f3 --- /dev/null +++ b/cases/pinemulator.conf @@ -0,0 +1,46 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + +domain:pinemulator + guestname + $defaultname + cpulist + 0-2 + +domain:pinemulator + guestname + $defaultname + cpulist + 3 + +domain:pinemulator + guestname + $defaultname + cpulist + 0,2 + +domain:destroy + guestname + $defaultname + + +domain:undefine + guestname + $defaultname + +options cleanup=enable \ No newline at end of file diff --git a/repos/domain/pinemulator.py b/repos/domain/pinemulator.py new file mode 100755 index 0000000..8d7b800 --- /dev/null +++ b/repos/domain/pinemulator.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python +""" Query or change the pinning of domain's emulator threads to + host physical CPUs.""" + + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'cpulist',) +optional_params = {} + +def check_pinemulator(guestname, maxcpu, pininfo_after): + """check emulator status of the running virtual machine + """ + + cmd = "cat /var/run/libvirt/qemu/%s.pid" % guestname + status, pid = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get the pid of domain %s" % guestname) + return 1 + + cmd = "grep Cpus_allowed_list /proc/%s/task/%s/status" % (pid[0], pid[0]) + status, output = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get Cpus_allowed_list") + return 1 + + cpu_allowed_list = output[0] + cpulistcheck = cpu_allowed_list.split('\t')[1] + pininfo_in_process = str(utils.param_to_tuple(cpulistcheck, maxcpu)) + + if cmp(pininfo_in_process, pininfo_after): + logger.error("domain emulator pin failed") + return 1 + else: + logger.info("domain emulator pin successed") + return 0 + + +def pinemulator(params): + """Dynamically change the real CPUs which can be allocated to the + emulator process of a domain. This function requires privileged + access to the hypervisor. """ + global logger + logger = params['logger'] + guestname = params['guestname'] + cpulist = params['cpulist'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given cpulist is %s" % cpulist) + + maxcpu = utils.get_host_cpus() + logger.info("%s physical cpu on host" % maxcpu) + + cpumap = utils.param_to_tuple(cpulist, maxcpu) + if not cpumap: + logger.error("cpulist: Invalid format") + return 1 + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + + pininfo_original = str(domobj.emulatorPinInfo()) + logger.info("the original emulator pin of the domain is: %s" % \ + pininfo_original) + + logger.info("pin domain emulator to host cpu %s" % cpulist) + domobj.pinEmulator(cpumap) + + pininfo_after = str(domobj.emulatorPinInfo()) + logger.info("the revised emulator pin of the domain is: %s" % \ + pininfo_after) + + ret = check_pinemulator(guestname, maxcpu, pininfo_after) + return ret + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 -- 1.8.3.1

2 2

[libvirt] [PATCH libvirt-python v3 00/40] Split python binding into separate repo
by Daniel P. Berrange 25 Nov '13

25 Nov '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This patch series is a followup to https://www.redhat.com/archives/libvir-list/2013-November/msg00712.html This series is what I consider ready to declare final, ready for the real GIT repo split to be done. Starting from libvirt GIT master as of commit bae383f29194b9c61f9ab245f493ce7d654868d1 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Fri Nov 22 14:32:23 2013 +0000 I did the following $ git clone libvirt libvirt-python $ cd libvirt-python $ git mv examples/python python/examples $ git mv examples/domain-events/events-python/event-test.py python/examples $ git commit $ git filter-branch --subdirectory-filter python --tag-name-filter cat -- --all $ git for-each-ref --format="%(refname)" refs/original/ | xargs -n 1 git update-ref -d $ git reflog expire --expire=now --all $ git gc --prune=now Then applied the following 40 patches using git am -3 You should now have a repo that's a couple of MB in size, showing only the files from python/ dir, in the root. The tags have been re-written to show content from the python/ directory. All the GPG signatures from tags are removed, since they are invalid after rewriting history. This was previously agreed to be the right way to handle this. The build system uses python distutils instead of autoconf/automake. It still uses the code generator as before though, pulling the XML files from /usr/share/libvirt/api (or whever you installed libvirt, as indicated by pkg-config). created a simple autobuild.sh to do an end-to-end build, including the RPM generation. Or you can just do python setup.py build ('make' equiv) python setup.py test ('make check' equiv) python setup.py rpm ('make rpm' equiv) python setup.py clean ('make clean' equiv) Historically libvirt python only worked with the exact matching libvirt binary. With this series, it is now possible to compile against any version back to 0.9.11. It is not possible to go back further than this, since the libvirt-api.xml file we need was not installed into /usr/share prior to 0.9.11. As such I removed Doug's patches which dealt with 0.9.6->0.9.10 Fortunately it seems 0.9.11 is in fact sufficient for OpenStack's targetted distros. The full GIT tree is git clone git://fedorapeople.org/~berrange/libvirt-python-v9.git Please take a moment to examine this. Unless bugs are found, this GIT repo will be moved as-is onto libvirt.org GIT. For doing releases, the following process would be needed ...build and install the new libvirt release RPM first... $ cd libvirt-python.git $ git tag -s -m 'Release 1.2.0' v1.2.0 $ ./autobuild.sh $ git push master v1.2.0 Now the 'dist/libvirt-python-X.y.z.tar.gz' file should be copied to http://libvirt.org/sources/python/ and also uploaded to PyPI Distutils can do the upload, but is deprecated since it passes your passwd in cleartext over the net :-( Instead OpenStack guys recommend use of twine https://pypi.python.org/pypi/twine eg $ twine upload dist/libvirt-python-x.y.z.tar.gz Unfortunately 'twine' isn't in Fedora repos, but is easy to install it locally using 'pip install twine' Daniel Daniel P. Berrange (20): Remove obsolete Makefile.am Update generator for new code layout Update header file includes Import STREQ macro from libvirt Add decl of MIN macro Import gnulib's xalloc_oversized macro Import gnulib's ignore_value macro Import code annotation macros from libvirt Import VIR_ALLOC / VIR_ALLOC_N / VIR_REALLOC_N functions Remove use of virStrcpyStatic Import VIR_FORCE_CLOSE macro from libvirt Add build/ to python module path for sanitytest.py Add execute permission for sanitytest.py Setup distutils build system VIR_DOMAIN_EVENT_ID_BALLOON_CHANGED appeared in 0.10.0 virDomainQemuAgentCommand appeared in 0.10.0 VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK appeared in 1.0.0 VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED appeared in 1.1.1 Relax min required libvirt to version 0.9.11 Ensure API overrides only used if API exists Doug Goldstein (20): Import LIBVIR_CHECK_VERSION macro from libvirt Import some virTypedParams* APIs from libvirt 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 virDomainListAllSnapshots API appeared in 0.9.13 virConnectListAllDomains API appeared in 0.9.13 virDomainSnapshotListAllChildren API appeared in 0.9.13 virConnect{Unr,R}egisterCloseCallback API appeared in 0.10.0 virDomainPinEmulator and virDomainGetEmulatorPinInfo APIs appeared in 0.10.0 virConnectListAll* APIs appeared in 0.10.2 virNode{Get,Set}MemoryParameters API appeared in 0.10.2 virStoragePoolListAllVolumes API appeared in 0.10.2 virNodeGetCPUMap API appeared in 1.0.0 virDomainGetJobStats API appeared in 1.0.3 virDomainMigrateGetCompressionCache API appeared in 1.0.3 virTypedParams* API appeared in 1.0.2 and used in 1.1.0 virDomainMigrate3 and virDomainMigrateToURI3 appeared in 1.1.0 virDomainCreateXMLWithFiles and virDomainCreateWithFiles APIs appeared in 1.1.1 virConnectGetCPUModelNames API appeared in 1.1.3 .gitignore | 4 + AUTHORS.in | 12 ++ COPYING | 339 ++++++++++++++++++++++++++++++++ COPYING.LESSER | 502 ++++++++++++++++++++++++++++++++++++++++++++++++ MANIFEST.in | 35 ++++ Makefile.am | 173 ----------------- NEWS | 9 + autobuild.sh | 24 +++ examples/Makefile.am | 21 -- generator.py | 94 +++++---- libvirt-lxc-override.c | 9 +- libvirt-override.c | 222 ++++++++++++++------- libvirt-python.spec.in | 34 ++++ libvirt-qemu-override.c | 13 +- libvirt-utils.c | 186 ++++++++++++++++++ libvirt-utils.h | 209 ++++++++++++++++++++ sanitytest.py | 4 + setup.py | 296 ++++++++++++++++++++++++++++ typewrappers.c | 5 +- 19 files changed, 1866 insertions(+), 325 deletions(-) create mode 100644 .gitignore create mode 100644 AUTHORS.in create mode 100644 COPYING create mode 100644 COPYING.LESSER create mode 100644 MANIFEST.in delete mode 100644 Makefile.am create mode 100644 NEWS create mode 100755 autobuild.sh delete mode 100644 examples/Makefile.am create mode 100644 libvirt-python.spec.in create mode 100644 libvirt-utils.c create mode 100644 libvirt-utils.h mode change 100644 => 100755 sanitytest.py create mode 100644 setup.py -- 1.8.3.1

4 44

[libvirt] [PATCH]lxc: don't do duplicate work when getting pagesize
by Chen Hanxiao 25 Nov '13

25 Nov '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Don't do duplicate work when getting pagesize. With some debug logs added. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 255c711..e85d01c 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -144,6 +144,7 @@ int lxcContainerHasReboot(void) int cmd, v; int status; char *tmp; + int stacksize = getpagesize() * 4; if (virFileReadAll("/proc/sys/kernel/ctrl-alt-del", 10, &buf) < 0) return -1; @@ -160,10 +161,12 @@ int lxcContainerHasReboot(void) VIR_FREE(buf); cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF; - if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0) + if (VIR_ALLOC_N(stack, stacksize) < 0) { + VIR_DEBUG("Unable to allocate stack"); return -1; + } - childStack = stack + (getpagesize() * 4); + childStack = stack + stacksize; cpid = clone(lxcContainerRebootChild, childStack, flags, &cmd); VIR_FREE(stack); @@ -2011,8 +2014,10 @@ int lxcContainerStart(virDomainDefPtr def, }; /* allocate a stack for the container */ - if (VIR_ALLOC_N(stack, stacksize) < 0) + if (VIR_ALLOC_N(stack, stacksize) < 0) { + VIR_DEBUG("Unable to allocate stack"); return -1; + } stacktop = stack + stacksize; cflags = CLONE_NEWPID|CLONE_NEWNS|CLONE_NEWUTS|CLONE_NEWIPC|SIGCHLD; @@ -2060,6 +2065,7 @@ int lxcContainerAvailable(int features) int cpid; char *childStack; char *stack; + int stacksize = getpagesize() * 4; if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; @@ -2067,12 +2073,12 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; - if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0) { + if (VIR_ALLOC_N(stack, stacksize) < 0) { VIR_DEBUG("Unable to allocate stack"); return -1; } - childStack = stack + (getpagesize() * 4); + childStack = stack + stacksize; cpid = clone(lxcContainerDummyChild, childStack, flags, NULL); VIR_FREE(stack); -- 1.8.2.1

2 3

[libvirt] [PATCH 1/1] qemu: Remove default memory balloon for PPC64
by Li Zhang 25 Nov '13

25 Nov '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> It doesn't need to add a default memory balloon for PPC64. Only if users want it, it can be added explicitly. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 12 ------------ src/qemu/qemu_domain.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8dc7e43..a1e5387 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -11989,18 +11989,6 @@ qemuParseCommandLine(virCapsPtr qemuCaps, def->videos[def->nvideos++] = vid; } - /* - * having a balloon is the default, define one with type="none" to avoid it - */ - if (!def->memballoon) { - virDomainMemballoonDefPtr memballoon; - if (VIR_ALLOC(memballoon) < 0) - goto error; - memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; - - def->memballoon = memballoon; - } - VIR_FREE(nics); if (virDomainDefAddImplicitControllers(def) < 0) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 346fec3..0744e89 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -724,13 +724,17 @@ qemuDomainDefPostParse(virDomainDefPtr def, break; case VIR_ARCH_ARMV7L: - addDefaultUSB = false; - addDefaultMemballoon = false; - break; + addDefaultUSB = false; + addDefaultMemballoon = false; + break; + + case VIR_ARCH_PPC64: + addPCIRoot = true; + addDefaultMemballoon = false; + break; case VIR_ARCH_ALPHA: case VIR_ARCH_PPC: - case VIR_ARCH_PPC64: case VIR_ARCH_PPCEMB: case VIR_ARCH_SH4: case VIR_ARCH_SH4EB: -- 1.8.2.1

3 3

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 24 Nov '13

24 Nov '13

Among others, this fixes getgroups for MacOS and fpending for Cygwin. * .gnulib: Update to latest. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing prior to freeze under the gnulib rule. * .gnulib 8f74258...831b84c (16): > quotearg: don't attempt to store 1 << 31 into an "int" > error: depend on stdio > doc: Improve wording in relocatable-maint.texi. > Fix indentation in previous patch. > * lib/getgroups.c (posix_getgroups, getgroups) [__APPLE__]: > base64: provide a fast path for encoding well sized buffers > extern-inline: port better to OS X 10.9 > fpending: fix typo > fpending: fix regression on DragonFly BSD > hash: relax license to LGPLv2+, for libguestfs > intprops: port to Oracle Studio c99 > obstack: pacify HP C > maint.mk: prefer gpgv2 over gpgv > isnan: port to VAX > gnulib-tool: protect against CDPATH > maint.mk: restore functionality removed by recent change .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 8f74258..831b84c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 8f7425866463f994538584d1dd7211603b8b0550 +Subproject commit 831b84c59ef413c57a36b67344467d66a8a2ba70 -- 1.8.3.1

1 0

[libvirt] Libvirt, nwfilter, openvswitch
by Jan De Landtsheer 23 Nov '13

23 Nov '13

Hello, I _was_ trying to set up an nwfilter for our networking set-up with VXLAN and openvswitch, where we use VXLAN as carrier for separate networks (unlike OpenStack gre-tunnels). But with OVS, ebtables do not work, and the basic setup of nwfilter rules are based on this premise... or so I understand... Now.. Is there a way to define nwfilter rules _without_ ebtables ? What I would like to do is quite simple (block out dhcp{4,6} services from VM's, and ipv6 router advertisements ) Thanks

5 10

[libvirt] Fwd: Re: [Qemu-devel] [edk2 PATCH] OvmfPkg: split the variable store to a separate file
by Eric Blake 22 Nov '13

22 Nov '13

[Forwarding with Laszlo's permission - if ever you wonder whether your work on libvirt makes a difference, it does!] -------- Original Message -------- Message-ID: <528FCF54.6060203(a)redhat.com> Date: Fri, 22 Nov 2013 22:40:36 +0100 From: Laszlo Ersek <lersek(a)redhat.com> Subject: Re: [Qemu-devel] [edk2 PATCH] OvmfPkg: split the variable store to a separate file On 11/22/13 21:51, Jordan Justen wrote: > On Fri, Nov 22, 2013 at 10:43 AM, Laszlo Ersek <lersek(a)redhat.com> wrote: >> OTOH building all three FDs per default might be confusing for >> end-users. We know for a fact that they usually don't read the README >> (or not thoroughly enough). If we only give them one output file per >> default, that's less potential for confusion. > > If it will just add confusion, then perhaps it is something best left > out of the README. And at that point, since splitting it is so easy, > the value of having it in OVMF is debatable. > >> But I can certainly post a version where all three files are built per >> default, if that's what you prefer (and aren't opposed to the idea in >> general). > > I'm not opposed to it, but I would like to wait to see what QEMU does. OK. Let's see where the qemu patch goes (I'll have to fix the comment typo that Eric found), and if it is accepted (maybe with modifications), we can return to the OVMF patch. > Many of these scenarios were discussed in the past on qemu-devel, but > a single -pflash was the only thing that stuck. But (thanks to you) we now have a flash driver in OVMF that works *in practice*. The discussion about multiple -pflash flags is not academic any longer. (Hm, sorry, that's maybe too strong -- I can't really say if the discussion used to be academic before. But it cannot have been this practical.) We also know that the libvirt developers prefer the split file. Plus: > This has made me just > focus on making the single file pflash work. You also can't deny that > the QEMU command line gets ugly real fast. We're in violent agreement on that -- which emphasizes the need for good libvirt support all the more. Seriously, I refuse to work with the qemu command line day to day. I have an elaborate wrapper script that I insert between qemu and libvirt (specified in the <emulator> libvirt domain XML) that post-processes the arguments composed by libvirt. I need this to test out features that libvirt doesn't yet support. For example, I can set various filenames in the <loader> element -- it specifies the argument to the -bios option. In the script I check the argument against various patterns, and I can turn it into: - -bios "$ARG" - -pflash "$ARG" - -pflash "$ARG" -pflash "$(manipulate "$ARG")" The script handles CSM vs. pure-UEFI for Windows 2008, it can honor upstream vs. RHEL qemu differences, it can turn off the iPXE virtio-net driver. In the single -pflash option case, it does refresh the code part in the VM's copy of OVMF (with dd) from my most recent build. It sets a name-dependent output file for the debug port. Etc. Maintaining this script over months has paid off orders of magnitude better than working with the raw qemu command line would have. (I can compare: on my (occasionally used) AMD desktop that runs Debian I have not bothered to install libvirt, and each time I need to modify the forty line qemu command that I keep in a script file, I cringe. And I can't bring myself to install a second guest.) The convenience/efficiency libvirt gives me is critical. Changing boot order, adding or removing devices, starting & stopping -- these are very fast in virt-manager. Editing the configuration with virsh is nice (and it has some level of automatic verification when you save and exit). Comparing guest configs against each other (using the XMLs) is very convenient. And so on. I depend on these every day, but I need to modify the wrapper script only occasionally. Libvirt still allows me to send custom monitor commands, and I can set it to log all of its *own* commands that it sends to the monitor or the guest agent. I've always wondered how other developers (for example, you :)) can exist without libvirt at all! That is why "keep the qemu command line simple" (== approx. "two -pflash options are inconvenient") is no concern of mine. That ship has sailed. Thanks, Laszlo

1 0

[libvirt] [PATCH] storage: allow interleave in volume XML
by Eric Blake 22 Nov '13

22 Nov '13

The RNG grammar did not allow arbitrary interleaving, which makes it harder than necessary to create a new volume from handwritten XML. (Compare also to commit caf516db for pools). * docs/schemas/storagevol.rng: Support interleaving. * tests/storagevolxml2xmlin/vol-file-backing.xml: Test it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- reviewer's note: Look after the '-- ' trailer for a smaller version of the patch generated with 'git diff -w'; that version won't apply, but makes it easier to see the real changes rather than getting lost in indentation. docs/schemas/storagevol.rng | 92 ++++++++++++++------------ tests/storagevolxml2xmlin/vol-file-backing.xml | 15 +++-- 2 files changed, 57 insertions(+), 50 deletions(-) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index ff7a952..e79bc35 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -12,8 +12,8 @@ <define name='vol'> - <interleave> - <element name='volume'> + <element name='volume'> + <interleave> <element name='name'> <ref name='volName'/> </element> @@ -30,8 +30,8 @@ <optional> <ref name='backingStore'/> </optional> - </element> - </interleave> + </interleave> + </element> </define> <define name='sizing'> @@ -52,20 +52,22 @@ <define name='permissions'> <optional> <element name='permissions'> - <element name='mode'> - <ref name='octalMode'/> - </element> - <element name='owner'> - <ref name='unsignedInt'/> - </element> - <element name='group'> - <ref name='unsignedInt'/> - </element> - <optional> - <element name='label'> - <text/> - </element> - </optional> + <interleave> + <element name='mode'> + <ref name='octalMode'/> + </element> + <element name='owner'> + <ref name='unsignedInt'/> + </element> + <element name='group'> + <ref name='unsignedInt'/> + </element> + <optional> + <element name='label'> + <text/> + </element> + </optional> + </interleave> </element> </optional> </define> @@ -107,36 +109,40 @@ <define name='target'> <element name='target'> - <optional> - <element name='path'> - <choice> - <data type='anyURI'/> - <ref name='absFilePath'/> - </choice> - </element> - </optional> - <ref name='format'/> - <ref name='permissions'/> - <ref name='timestamps'/> - <optional> - <ref name='encryption'/> - </optional> - <optional> - <ref name='compat'/> - </optional> - <optional> - <ref name='fileFormatFeatures'/> - </optional> + <interleave> + <optional> + <element name='path'> + <choice> + <data type='anyURI'/> + <ref name='absFilePath'/> + </choice> + </element> + </optional> + <ref name='format'/> + <ref name='permissions'/> + <ref name='timestamps'/> + <optional> + <ref name='encryption'/> + </optional> + <optional> + <ref name='compat'/> + </optional> + <optional> + <ref name='fileFormatFeatures'/> + </optional> + </interleave> </element> </define> <define name='backingStore'> <element name='backingStore'> - <element name='path'> - <ref name='absFilePath'/> - </element> - <ref name='format'/> - <ref name='permissions'/> + <interleave> + <element name='path'> + <ref name='absFilePath'/> + </element> + <ref name='format'/> + <ref name='permissions'/> + </interleave> </element> </define> diff --git a/tests/storagevolxml2xmlin/vol-file-backing.xml b/tests/storagevolxml2xmlin/vol-file-backing.xml index 73e7f28..8610ea4 100644 --- a/tests/storagevolxml2xmlin/vol-file-backing.xml +++ b/tests/storagevolxml2xmlin/vol-file-backing.xml @@ -1,25 +1,26 @@ <volume> - <name>sparse.img</name> +  <key>/var/lib/libvirt/images/sparse.img</key> - <source/> <capacity unit='GB'>10</capacity> - <allocation unit='MiB'>0</allocation> + <source/> <target> - <path>/var/lib/libvirt/images/sparse.img</path> <permissions> - <mode>0</mode> <owner>0744</owner> + <mode>0</mode> <group>0</group> </permissions> + <path>/var/lib/libvirt/images/sparse.img</path> </target> + <allocation unit='MiB'>0</allocation> <backingStore> - <path>/var/lib/virt/images/master.img</path> <format type='vmdk'/> + <path>/var/lib/virt/images/master.img</path> <permissions> <mode>0744</mode> + <label>virt_image_t</label> <owner>1</owner> <group>1</group> - <label>virt_image_t</label> </permissions> </backingStore> + <name>sparse.img</name> </volume> -- 1.8.3.1 As promised above, the docs/schemas change in an easier format: diff --git c/docs/schemas/storagevol.rng w/docs/schemas/storagevol.rng index ff7a952..e79bc35 100644 --- c/docs/schemas/storagevol.rng +++ w/docs/schemas/storagevol.rng @@ -12,8 +12,8 @@ <define name='vol'> - <interleave> <element name='volume'> + <interleave> <element name='name'> <ref name='volName'/> </element> @@ -30,8 +30,8 @@ <optional> <ref name='backingStore'/> </optional> - </element> </interleave> + </element> </define> <define name='sizing'> @@ -52,6 +52,7 @@ <define name='permissions'> <optional> <element name='permissions'> + <interleave> <element name='mode'> <ref name='octalMode'/> </element> @@ -66,6 +67,7 @@ <text/> </element> </optional> + </interleave> </element> </optional> </define> @@ -107,6 +109,7 @@ <define name='target'> <element name='target'> + <interleave> <optional> <element name='path'> <choice> @@ -127,16 +130,19 @@ <optional> <ref name='fileFormatFeatures'/> </optional> + </interleave> </element> </define> <define name='backingStore'> <element name='backingStore'> + <interleave> <element name='path'> <ref name='absFilePath'/> </element> <ref name='format'/> <ref name='permissions'/> + </interleave> </element> </define>

1 1

[libvirt] [PATCH] virsh domxml-from-native to treat SCSI as the bus type for pseries by default
by Shivaprasad G Bhat 22 Nov '13

22 Nov '13

From: Shivaprasad G Bhat <shivaprasadbhat(a)gmail.com> The bus type IDE being enum Zero, the bus type on pseries system appears as IDE for all the -hda/-cdrom and for disk drives with if="none" type. Pseries platform needs this to appear as SCSI instead of IDE. The ide being not supported, the explicit requests for ide devices will return an error. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 66 +++++++++++++++++++- tests/qemuargv2xmltest.c | 1 .../qemuxml2argv-pseries-disk.args | 5 ++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 40 ++++++++++++ 4 files changed, 108 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8dc7e43..21b5108 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10032,6 +10032,7 @@ error: static virDomainDiskDefPtr qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, const char *val, + virDomainDefPtr dom, int nvirtiodisk, bool old_style_ceph_args) { @@ -10055,7 +10056,11 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (VIR_ALLOC(def) < 0) goto cleanup; - def->bus = VIR_DOMAIN_DISK_BUS_IDE; + if (((dom->os.arch == VIR_ARCH_PPC64) && + dom->os.machine && STREQ(dom->os.machine, "pseries"))) + def->bus = VIR_DOMAIN_DISK_BUS_SCSI; + else + def->bus = VIR_DOMAIN_DISK_BUS_IDE; def->device = VIR_DOMAIN_DISK_DEVICE_DISK; def->type = VIR_DOMAIN_DISK_TYPE_FILE; @@ -10140,9 +10145,15 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, def->type = VIR_DOMAIN_DISK_TYPE_FILE; } } else if (STREQ(keywords[i], "if")) { - if (STREQ(values[i], "ide")) + if (STREQ(values[i], "ide")) { def->bus = VIR_DOMAIN_DISK_BUS_IDE; - else if (STREQ(values[i], "scsi")) + if (((dom->os.arch == VIR_ARCH_PPC64) && + dom->os.machine && STREQ(dom->os.machine, "pseries"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("pseries systems do not support ide devices '%s'"), val); + goto error; + } + } else if (STREQ(values[i], "scsi")) def->bus = VIR_DOMAIN_DISK_BUS_SCSI; else if (STREQ(values[i], "virtio")) def->bus = VIR_DOMAIN_DISK_BUS_VIRTIO; @@ -11368,6 +11379,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps, disk->type = VIR_DOMAIN_DISK_TYPE_FILE; if (STREQ(arg, "-cdrom")) { disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; + if (((def->os.arch == VIR_ARCH_PPC64) && + def->os.machine && STREQ(def->os.machine, "pseries"))) + disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; if (VIR_STRDUP(disk->dst, "hdc") < 0) goto error; disk->readonly = true; @@ -11381,6 +11395,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps, disk->bus = VIR_DOMAIN_DISK_BUS_IDE; else disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; + if (((def->os.arch == VIR_ARCH_PPC64) && + def->os.machine && STREQ(def->os.machine, "pseries"))) + disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; } if (VIR_STRDUP(disk->dst, arg + 1) < 0) goto error; @@ -11672,7 +11689,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, } } else if (STREQ(arg, "-drive")) { WANT_VALUE(); - if (!(disk = qemuParseCommandLineDisk(xmlopt, val, + if (!(disk = qemuParseCommandLineDisk(xmlopt, val, def, nvirtiodisk, ceph_args != NULL))) goto error; @@ -11858,6 +11875,47 @@ qemuParseCommandLine(virCapsPtr qemuCaps, } } else if (STREQ(arg, "-S")) { /* ignore, always added by libvirt */ + } else if (STREQ(arg, "-device")) { + /* something we can't fully parse. Check if supported and + * add it to the qemu namespace + * cmdline/environment advanced options and hope for the best + */ + bool unsupported = false; + WANT_VALUE() + + if ((def->os.arch == VIR_ARCH_PPC64) && + def->os.machine && STREQ(def->os.machine, "pseries")) { + int nkws; + char **kws; + char **vals; + size_t j; + + if (!qemuParseKeywords(val, &kws, &vals, &nkws, 1)) { + for (j = 0; j < nkws; j++) { + if (STREQLEN(kws[j], "ide", 3) || + (STREQ(kws[j], "if") && vals[j] && + STREQ(vals[j], "ide"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("pseries systems do not support ide devices '%s'"), val); + unsupported = true; + break; + } + } + for (j = 0; j < nkws; j++) { + VIR_FREE(kws[j]); + VIR_FREE(vals[j]); + } + VIR_FREE(kws); + VIR_FREE(vals); + } + } + + if (unsupported || VIR_REALLOC_N(cmd->args, cmd->num_args+2) < 0) + goto error; + if (VIR_STRDUP(cmd->args[cmd->num_args++], arg) < 0) + goto error; + if (VIR_STRDUP(cmd->args[cmd->num_args++], val) < 0) + goto error; } else { /* something we can't yet parse. Add it to the qemu namespace * cmdline/environment advanced options and hope for the best diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 6dd8bb0..0bf4c37 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -249,6 +249,7 @@ mymain(void) DO_TEST("hyperv"); DO_TEST("pseries-nvram"); + DO_TEST("pseries-disk"); DO_TEST("nosharepages"); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args new file mode 100644 index 0000000..5fc0938 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-S -M pseries -m 512 -smp 1 \ +-no-acpi -boot c -usb \ +-boot c -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml new file mode 100644 index 0000000..dbbd6aa --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml @@ -0,0 +1,40 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>87eedafe-eedc-4336-8130-ed9fe5dc90c8</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='scsi'/> + <readonly/> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <graphics type='sdl'/> + <video> + <model type='cirrus' vram='9216' heads='1'/> + </video> + <memballoon model='virtio'/> + </devices> +</domain>

3 2

[libvirt] Planning for next release
by Daniel Veillard 22 Nov '13

22 Nov '13

If we want to land a release on Mon Dec 2, I would suggest entering freeze next week. The amount of patches since 1.1.4 is not very large so we could start the freeze say on Wed 27, but IMHO it all depennds if Dan patches about splitting out the python bindings gets in for that release. If yes I would probably prefer to freeze one more day (start Tues 26), and bump release name to 1.2.0 as this is a significant change from an user perspective, otherwise 1.1.5 and freeze next Wed. Opinions ? Dan do you think you can/want to land this set in the coming week ? Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

5 10

[libvirt] [PATCH] Mostly revert "python: remove virConnectGetCPUModelNames from globals"
by Daniel P. Berrange 22 Nov '13

22 Nov '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This reverts commit 6b90d7428d72e92db292a9228c44701bfd5003c9. The original problem was that libvirt_virConnectGetCPUModelNames was listed twice in the exports table, once automatically from the generator and once from the manual override. We merely needed to list it in the skip_impl list, and not delete the manually written code entirely. --- python/libvirt-override.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 2f520c1..6546dd1 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2276,6 +2276,58 @@ libvirt_virConnectGetVersion(PyObject *self ATTRIBUTE_UNUSED, return PyInt_FromLong(hvVersion); } +PyObject * +libvirt_virConnectGetCPUModelNames(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + int c_retval; + virConnectPtr conn; + PyObject *rv = NULL, *pyobj_conn; + char **models = NULL; + size_t i; + int flags = 0; + const char *arch = NULL; + + if (!PyArg_ParseTuple(args, (char *)"Osi:virConnectGetCPUModelNames", + &pyobj_conn, &arch, &flags)) + return NULL; + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + + c_retval = virConnectGetCPUModelNames(conn, arch, &models, flags); + + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval == -1) + return VIR_PY_INT_FAIL; + + if ((rv = PyList_New(c_retval)) == NULL) + goto error; + + for (i = 0; i < c_retval; i++) { + PyObject *str; + if ((str = PyString_FromString(models[i])) == NULL) + goto error; + + PyList_SET_ITEM(rv, i, str); + } + +done: + if (models) { + for (i = 0; i < c_retval; i++) + VIR_FREE(models[i]); + VIR_FREE(models); + } + + return rv; + +error: + Py_XDECREF(rv); + rv = VIR_PY_INT_FAIL; + goto done; +} + static PyObject * libvirt_virConnectGetLibVersion(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -7176,6 +7228,7 @@ static PyMethodDef libvirtMethods[] = { #include "libvirt-export.c" {(char *) "virGetVersion", libvirt_virGetVersion, METH_VARARGS, NULL}, {(char *) "virConnectGetVersion", libvirt_virConnectGetVersion, METH_VARARGS, NULL}, + {(char *) "virConnectGetCPUModelNames", libvirt_virConnectGetCPUModelNames, METH_VARARGS, NULL}, {(char *) "virConnectGetLibVersion", libvirt_virConnectGetLibVersion, METH_VARARGS, NULL}, {(char *) "virConnectOpenAuth", libvirt_virConnectOpenAuth, METH_VARARGS, NULL}, {(char *) "virConnectListDomainsID", libvirt_virConnectListDomainsID, METH_VARARGS, NULL}, -- 1.8.3.1

2 1

[libvirt] [PATCH] Don't start a nested job in qemuMigrationPrepareAny
by Ján Tomko 22 Nov '13

22 Nov '13

This nested job is canceled by the first ExitMonitor call (even though it was not created by the corresponding EnterMonitor call), and again in qemuMigrationPrepareAny if qemuProcessStart failed. This can lead to a crash if the vm object was disposed of before calling qemuDomainRemoveInactive: 0 ..62bc in virClassIsDerivedFrom (klass=0xdeadbeef, parent=0x7ffce4cdd270) at util/virobject.c:166 1 ..6666 in virObjectIsClass at util/virobject.c:362 2 ..66b4 in virObjectLock at util/virobject.c:314 3 ..477e in virDomainObjListRemove at conf/domain_conf.c:2359 4 ..7a64 in qemuDomainRemoveInactive at qemu/qemu_domain.c:2087 5 ..956c in qemuMigrationPrepareAny at qemu/qemu_migration.c:2469 This was added by commit e4e2822, exposed by 5a4c237 and c7ac251. https://bugzilla.redhat.com/show_bug.cgi?id=1018267 --- src/qemu/qemu_migration.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e87ea85..ef6f1c5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2358,10 +2358,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, goto endjob; } - if (qemuDomainObjBeginNestedJob(driver, vm, - QEMU_ASYNC_JOB_MIGRATION_IN) < 0) - goto endjob; - /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ @@ -2370,8 +2366,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, VIR_QEMU_PROCESS_START_PAUSED | VIR_QEMU_PROCESS_START_AUTODESTROY) < 0) { virDomainAuditStart(vm, "migrated", false); - if (!qemuDomainObjEndJob(driver, vm)) - vm = NULL; goto endjob; } @@ -2474,7 +2468,7 @@ stop: qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0); endjob: - if (vm && !qemuMigrationJobFinish(driver, vm)) { + if (!qemuMigrationJobFinish(driver, vm)) { vm = NULL; } goto cleanup; -- 1.8.3.2

2 2

[libvirt] [PATCH] util: Make port allocator data more up-to-date
by Martin Kletzander 22 Nov '13

22 Nov '13

There are few places where we know about port getting opened even though it was not allocated on any virPortAllocator (or we know it was reserved like this). We cannot notify the virPortAllocator that the port is open because of that (since the port may be out of range) and in that case, we are stuck with old data. This also fixes the issue that if you have autoport='no' and port='-1', the port never gets returned (introduced by 7b4a630484); the case when we don't know whether to release the port or not. There may be also other places where the port is being released even though it might have been set statically out of range by the user. In that case we report an error, but that shouldn't stop APIs releasing ports (e.g. destroy). Moreover, the return value is not checked sometimes and we're stuck with an error in the logs and also set as a lastError. To make this behave the best I can imagine, we'd have to have a single virPortAllocator with configurable ranges (ports shared between allocators), but that's an idea for another day. In this patch, I'm modifyping the virPortAllocatorRelease() function to be safe for all kinds of parameters, making it a no-op in case of out-of-range ports and warning in case virBitmapClearBit() returns an error (which is just a sanity code in combination with the range check). Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/libxl/libxl_driver.c | 13 ++++--------- src/qemu/qemu_process.c | 32 +++++++++++++++++++++----------- src/util/virportallocator.c | 33 +++++++++------------------------ src/util/virportallocator.h | 4 ++-- tests/virportallocatortest.c | 5 +---- 5 files changed, 37 insertions(+), 50 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 1b42f14..26e2d3a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -279,15 +279,10 @@ libxlVmCleanup(libxlDriverPrivatePtr driver, if (virAtomicIntDecAndTest(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); - if ((vm->def->ngraphics == 1) && - vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && - vm->def->graphics[0]->data.vnc.autoport) { - vnc_port = vm->def->graphics[0]->data.vnc.port; - if (vnc_port >= LIBXL_VNC_PORT_MIN) { - if (virPortAllocatorRelease(driver->reservedVNCPorts, - vnc_port) < 0) - VIR_DEBUG("Could not mark port %d as unused", vnc_port); - } + if (vm->def->ngraphics == 1 && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + virPortAllocatorRelease(driver->reservedVNCPorts, + vm->def->graphics[0]->data.vnc.port); } /* Remove any cputune settings */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a26c079..dfaf95f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4331,25 +4331,35 @@ retry: qemuProcessRemoveDomainStatus(driver, vm); - /* Remove VNC and Spice ports from port reservation bitmap, but only if - they were reserved by the driver (autoport=yes) - */ + /* Remove remote ports from all port allocators, even when + * autoport isn't set, because they might have been auto-allocated + * anyway. It also helps keeping the allocator data a tad more + * updated. + */ for (i = 0; i < vm->def->ngraphics; ++i) { virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; - if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - if (graphics->data.vnc.autoport) { - virPortAllocatorRelease(driver->remotePorts, - graphics->data.vnc.port); - } + switch ((enum virDomainGraphicsType) graphics->type) { + case VIR_DOMAIN_GRAPHICS_TYPE_VNC: + virPortAllocatorRelease(driver->remotePorts, + graphics->data.vnc.port); virPortAllocatorRelease(driver->webSocketPorts, graphics->data.vnc.websocket); - } - if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - graphics->data.spice.autoport) { + break; + + case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: virPortAllocatorRelease(driver->remotePorts, graphics->data.spice.port); virPortAllocatorRelease(driver->remotePorts, graphics->data.spice.tlsPort); + break; + + case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + case VIR_DOMAIN_GRAPHICS_TYPE_RDP: + case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + /* Nothing has been allocated */ + + case VIR_DOMAIN_GRAPHICS_TYPE_LAST: + break; } } diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 694f191..f7f3755 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -27,11 +27,12 @@ #include "viralloc.h" #include "virbitmap.h" -#include "virportallocator.h" -#include "virthread.h" #include "virerror.h" #include "virfile.h" +#include "virlog.h" +#include "virportallocator.h" #include "virstring.h" +#include "virthread.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -172,33 +173,17 @@ cleanup: return ret; } -int virPortAllocatorRelease(virPortAllocatorPtr pa, - unsigned short port) +void virPortAllocatorRelease(virPortAllocatorPtr pa, + unsigned short port) { - int ret = -1; - if (!port) - return 0; + return; virObjectLock(pa); - if (port < pa->start || - port > pa->end) { - virReportInvalidArg(port, "port %d must be in range (%d, %d)", - port, pa->start, pa->end); - goto cleanup; - } - - if (virBitmapClearBit(pa->bitmap, - port - pa->start) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to release port %d"), - port); - goto cleanup; - } + if (port >= pa->start && port <= pa->end && + virBitmapClearBit(pa->bitmap, port - pa->start) < 0) + VIR_WARN("Problem releasing port %d from range '%s'", port, pa->name); - ret = 0; -cleanup: virObjectUnlock(pa); - return ret; } diff --git a/src/util/virportallocator.h b/src/util/virportallocator.h index c8aa6de..ba7c504 100644 --- a/src/util/virportallocator.h +++ b/src/util/virportallocator.h @@ -35,7 +35,7 @@ virPortAllocatorPtr virPortAllocatorNew(const char *name, int virPortAllocatorAcquire(virPortAllocatorPtr pa, unsigned short *port); -int virPortAllocatorRelease(virPortAllocatorPtr pa, - unsigned short port); +void virPortAllocatorRelease(virPortAllocatorPtr pa, + unsigned short port); #endif /* __VIR_PORT_ALLOCATOR_H__ */ diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 721356e..0d41c98 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -165,10 +165,7 @@ static int testAllocReuse(const void *args ATTRIBUTE_UNUSED) goto cleanup; } - - if (virPortAllocatorRelease(alloc, p2) < 0) - goto cleanup; - + virPortAllocatorRelease(alloc, p2); if (virPortAllocatorAcquire(alloc, &p4) < 0) goto cleanup; if (p4 != 5902) { -- 1.8.4.3

3 3

[libvirt] [PATCH] spec: Don't save/restore running VMs on libvirt-client update
by Cole Robinson 22 Nov '13

22 Nov '13

Restarting an active libvirt-guests.service is the equivalent of doing: /usr/libexec/libvirt-guests.sh stop /usr/libexec/libvirt-guests.sh start Which in a default configuration will managedsave every running VM, and then restore them. Certainly not something we should do every time the libvirt-client RPM is updated. Just drop the try-restart attempt, I don't know what purpose it serves anyways. https://bugzilla.redhat.com/show_bug.cgi?id=962225 --- libvirt.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index a5b01df..0d50ccd 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1714,9 +1714,8 @@ fi # If the package is allowed to autostart: /bin/systemctl --no-reload enable libvirt-guests.service >/dev/null 2>&1 ||: -# Run these because the SysV package being removed won't do them +# Run this because the SysV package being removed won't do them /sbin/chkconfig --del libvirt-guests >/dev/null 2>&1 || : -/bin/systemctl try-restart libvirt-guests.service >/dev/null 2>&1 || : %endif %if %{with_sanlock} -- 1.8.4.2

2 2

[libvirt] [PATCH] spec: Restrict virt-login-shell usage
by Jiri Denemark 22 Nov '13

22 Nov '13

https://bugzilla.redhat.com/show_bug.cgi?id=1033614 As virt-login-shell is an SUID binary, we should restrict its usage to just the users chosen by an administrator to use virt-login-shell as their login shell. This can easily be done by making the binary executable only by users from a new virtlogin group. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index a5b01df..864fbf4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1727,6 +1727,12 @@ if getent group sanlock > /dev/null ; then fi %endif +%if %{with_lxc} +%pre login-shell +getent group virtlogin >/dev/null || groupadd -r virtlogin +exit 0 +%endif + %files %defattr(-, root, root) @@ -2072,7 +2078,7 @@ fi %if %{with_lxc} %files login-shell -%attr(4755, root, root) %{_bindir}/virt-login-shell +%attr(4750, root, virtlogin) %{_bindir}/virt-login-shell %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf %{_mandir}/man1/virt-login-shell.1* %endif -- 1.8.4.4

2 2

[libvirt] [PATCH 0/2] Network events feature
by Cédric Bosdonnat 22 Nov '13

22 Nov '13

These changes are all about bringing events for network object like the ones existing for domains. This feature is needed for virt-manager to refresh its UI when networks are started/destroyed/defined/undefined. The first commit is a refactoring of the domain events internal functions to extract the reusable parts of them. The second commit adds network events based on those now-common event functions. The network events are implemented in the test and bridge network drivers ATM. Cédric Bosdonnat (2): virDomainEvent refactoring to separate generic things from domain ones Added network events API and unit tests .gitignore | 2 + daemon/libvirtd.h | 1 + daemon/remote.c | 175 +++- include/libvirt/libvirt.h.in | 85 ++ python/generator.py | 2 + python/libvirt-override-virConnect.py | 34 + python/libvirt-override.c | 150 ++++ src/Makefile.am | 6 + src/conf/domain_event.c | 1431 ++++++--------------------------- src/conf/domain_event.h | 134 ++- src/conf/object_event.c | 1008 +++++++++++++++++++++++ src/conf/object_event.h | 114 +++ src/conf/object_event_private.h | 167 ++++ src/driver.h | 14 + src/libvirt.c | 133 +++ src/libvirt_private.syms | 18 +- src/libvirt_public.syms | 6 + src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_driver.c | 28 +- src/lxc/lxc_conf.h | 2 +- src/lxc/lxc_driver.c | 38 +- src/lxc/lxc_process.c | 12 +- src/network/bridge_driver.c | 91 ++- src/network/bridge_driver_platform.h | 3 + src/parallels/parallels_utils.h | 2 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 50 +- src/qemu/qemu_hotplug.c | 10 +- src/qemu/qemu_migration.c | 12 +- src/qemu/qemu_process.c | 48 +- src/remote/remote_driver.c | 173 +++- src/remote/remote_protocol.x | 46 +- src/test/test_driver.c | 166 ++-- src/uml/uml_conf.h | 2 +- src/uml/uml_driver.c | 26 +- src/vbox/vbox_tmpl.c | 20 +- src/xen/xen_driver.c | 10 +- src/xen/xen_driver.h | 4 +- src/xen/xen_inotify.c | 8 +- src/xen/xs_internal.c | 4 +- tests/Makefile.am | 7 + tests/objecteventtest.c | 228 ++++++ tests/qemuhotplugtest.c | 2 +- 45 files changed, 2974 insertions(+), 1510 deletions(-) create mode 100644 src/conf/object_event.c create mode 100644 src/conf/object_event.h create mode 100644 src/conf/object_event_private.h create mode 100644 tests/objecteventtest.c -- 1.8.4.2

3 7

[libvirt] [PATCH v2] sasl: Fix authentication when using PLAIN mechanism
by Christophe Fergeau 22 Nov '13

22 Nov '13

With some authentication mechanism (PLAIN for example), sasl_client_start() can return SASL_OK, which translates to virNetSASLSessionClientStart() returning VIR_NET_SASL_COMPLETE. cyrus-sasl documentation is a bit vague as to what to do in such situation, but upstream clarified this a bit in http://asg.andrew.cmu.edu/archive/message.php?mailbox=archive.cyrus-sasl&ms… When we got VIR_NET_SASL_COMPLETE after virNetSASLSessionClientStart() and if the remote also tells us that authentication is complete, then we should end the authentication procedure rather than forcing a call to virNetSASLSessionClientStep(). Without this patch, when trying to use SASL PLAIN, I get: error :authentication failed : Failed to step SASL negotiation: -1 (SASL(-1): generic failure: Unable to find a callback: 32775) This patch is based on a spice-gtk patch by Dietmar Maurer. --- Changes since v1: - adjust comment before the for(;;) code block - add comment before the if (complete && ...) test as this is what is done for these tests in this block. src/remote/remote_driver.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7181949..38da119 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4122,9 +4122,16 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, complete, serverinlen, serverin); /* Loop-the-loop... - * Even if the server has completed, the client must *always* do at least one step - * in this loop to verify the server isn't lying about something. Mutual auth */ + * Even if the server has completed, the client must loop until sasl_client_start() or + * sasl_client_step() return SASL_OK to verify the server isn't lying + * about something. Mutual auth + * */ for (;;) { + /* Previous server call showed completion & sasl_client_start() + * told us we are locally complete too */ + if (complete && err == VIR_NET_SASL_COMPLETE) + break; + restep: if ((err = virNetSASLSessionClientStep(sasl, serverin, -- 1.8.4.2

2 1

[libvirt] [PATCH] m4: use -Wl,-pie instead of -pie for clang
by Ryota Ozaki 22 Nov '13

22 Nov '13

clang doesn't support -pie option (as of clang 3.3): clang: error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument] We have to use -Wl,-pie instead. (ref. https://bugs.ruby-lang.org/issues/5697) The new code checks -pie first, and if it fails, checks -Wl,-pie next. By doing so, we can handle both cases. The patch is tested on Mac OS X 10.8.5 and Fedora 19. Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> --- m4/virt-compile-pie.m4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/m4/virt-compile-pie.m4 b/m4/virt-compile-pie.m4 index cceb495..11cf0af 100644 --- a/m4/virt-compile-pie.m4 +++ b/m4/virt-compile-pie.m4 @@ -27,7 +27,14 @@ AC_DEFUN([LIBVIRT_COMPILE_PIE],[ *) gl_COMPILER_OPTION_IF([-fPIE -DPIE], [ PIE_CFLAGS="-fPIE -DPIE" - PIE_LDFLAGS="-pie" + gl_COMPILER_OPTION_IF(["-pie"], [ + PIE_LDFLAGS="-pie" + ], [ + dnl clang requires -Wl,-pie instead of -pie + gl_COMPILER_OPTION_IF(["-Wl,-pie"], [ + PIE_LDFLAGS="-Wl,-pie" + ]) + ]) ]) esac AC_SUBST([PIE_CFLAGS]) -- 1.8.4

1 0

[libvirt] [PATCH] sasl: Fix authentication when using PLAIN mechanism
by Christophe Fergeau 22 Nov '13

22 Nov '13

With some authentication mechanism (PLAIN for example), sasl_client_start() can return SASL_OK, which translates to virNetSASLSessionClientStart() returning VIR_NET_SASL_COMPLETE. cyrus-sasl documentation is a bit vague as to what to do in such situation, but upstream clarified this a bit in http://asg.andrew.cmu.edu/archive/message.php?mailbox=archive.cyrus-sasl&ms… When we got VIR_NET_SASL_COMPLETE after virNetSASLSessionClientStart() and if the remote also tells us that authentication is complete, then we should end the authentication procedure rather than forcing a call to virNetSASLSessionClientStep(). Without this patch, when trying to use SASL PLAIN, I get: error :authentication failed : Failed to step SASL negotiation: -1 (SASL(-1): generic failure: Unable to find a callback: 32775) This patch is based on a spice-gtk patch by Dietmar Maurer. --- src/remote/remote_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7181949..e15eeaf 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4125,6 +4125,9 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, * Even if the server has completed, the client must *always* do at least one step * in this loop to verify the server isn't lying about something. Mutual auth */ for (;;) { + if (complete && err == VIR_NET_SASL_COMPLETE) + break; + restep: if ((err = virNetSASLSessionClientStep(sasl, serverin, -- 1.8.4.2

2 3

[libvirt] [PATCH] build: Don't fail on '< ' or '> ' with old xmllint
by Martin Kletzander 22 Nov '13

22 Nov '13

Older xmllint version don't allow such characters in datatype anyURI. In order not to change too much, I'm suggesting making a choice of anyURI or 'absPathName' which should be fine (checked with upstream and that old xmllint, both work fine). Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as a build-breaker docs/schemas/storagevol.rng | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 8bc5907..5da8e1f 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -105,7 +105,10 @@ <element name='target'> <optional> <element name='path'> - <data type='anyURI'/> + <choice> + <data type='anyURI'/> + <ref name='absFilePath'/> + </choice> </element> </optional> <ref name='format'/> -- 1.8.4.3

1 0

[libvirt] [PATCH] storage: use valid XML for awkward volume names
by Eric Blake 22 Nov '13

22 Nov '13

$ touch /var/lib/libvirt/images/'a<b>c' $ virsh pool-refresh default $ virsh vol-dumpxml 'a<b>c' default | head -n2 <volume> <name>a<b>c</name> Oops. That's not valid XML. And when we fix the XML generation, it fails RelaxNG validation. I'm also tired of seeing <key>(null)</key> in the example output for volume xml; while we used NULLSTR() to avoid a NULL deref rather than relying on glibc's printf extension behavior, it's even better if we avoid the issue in the first place. Note that this patch allows pretty much any volume name that can appear in a directory (excluding . and .. because those are special), but does nothing to change the current (unenforced) RelaxNG claim that pool names will consist only of letters, numbers, _, -, and +. Tightening the C code to match RelaxNG patterns and/or relaxing the grammar to match the C code for pool names is a task for another day (but remember, we DID recently tighten C code for domain names to exclude a leading '.'). * src/conf/storage_conf.c (virStoragePoolSourceFormat) (virStoragePoolDefFormat, virStorageVolTargetDefFormat) (virStorageVolDefFormat): Escape user-controlled strings. (virStorageVolDefParseXML): Parse key, for use in unit tests. * docs/schemas/basictypes.rng (volName): Relax definition. * tests/storagepoolxml2xmltest.c (mymain): Test it. * tests/storagevolxml2xmltest.c (mymain): Likewise. * tests/storagepoolxml2xmlin/pool-dir-naming.xml: New file. * tests/storagepoolxml2xmlout/pool-dir-naming.xml: Likewise. * tests/storagevolxml2xmlin/vol-file-naming.xml: Likewise. * tests/storagevolxml2xmlout/vol-file-naming.xml: Likewise. * tests/storagevolxml2xmlout/vol-*.xml: Fix fallout. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/schemas/basictypes.rng | 9 ++- src/conf/storage_conf.c | 72 ++++++++++------------ tests/storagepoolxml2xmlin/pool-dir-naming.xml | 18 ++++++ tests/storagepoolxml2xmlout/pool-dir-naming.xml | 18 ++++++ tests/storagepoolxml2xmltest.c | 1 + tests/storagevolxml2xmlin/vol-file-backing.xml | 1 + tests/storagevolxml2xmlin/vol-file-naming.xml | 20 ++++++ tests/storagevolxml2xmlout/vol-file-backing.xml | 2 +- tests/storagevolxml2xmlout/vol-file-naming.xml | 17 +++++ tests/storagevolxml2xmlout/vol-file.xml | 1 - tests/storagevolxml2xmlout/vol-logical-backing.xml | 2 +- tests/storagevolxml2xmlout/vol-logical.xml | 2 +- tests/storagevolxml2xmlout/vol-partition.xml | 2 +- tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml | 2 +- tests/storagevolxml2xmlout/vol-qcow2-1.1.xml | 2 +- tests/storagevolxml2xmlout/vol-qcow2-lazy.xml | 2 +- tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml | 2 +- tests/storagevolxml2xmlout/vol-qcow2.xml | 2 +- tests/storagevolxml2xmlout/vol-sheepdog.xml | 1 - tests/storagevolxml2xmltest.c | 1 + 20 files changed, 125 insertions(+), 52 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-dir-naming.xml create mode 100644 tests/storagepoolxml2xmlout/pool-dir-naming.xml create mode 100644 tests/storagevolxml2xmlin/vol-file-naming.xml create mode 100644 tests/storagevolxml2xmlout/vol-file-naming.xml diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 7fbfa53..268bc5a 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -291,8 +291,15 @@ </define> <define name='volName'> +  <data type='string'> - <param name="pattern">[a-zA-Z0-9_\+\-\.]+</param> + <param name="pattern">[^/]+</param> + <except> + <choice> + <value>.</value> + <value>..</value> + </choice> + </except> </data> </define> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 33e4caf..8b378c2 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1056,7 +1056,8 @@ virStoragePoolSourceFormat(virBufferPtr buf, virBufferAddLit(buf, " <source>\n"); if ((options->flags & VIR_STORAGE_POOL_SOURCE_HOST) && src->nhost) { for (i = 0; i < src->nhost; i++) { - virBufferAsprintf(buf, " <host name='%s'", src->hosts[i].name); + virBufferEscapeString(buf, " <host name='%s'", + src->hosts[i].name); if (src->hosts[i].port) virBufferAsprintf(buf, " port='%d'", src->hosts[i].port); virBufferAddLit(buf, "/>\n"); @@ -1067,8 +1068,8 @@ virStoragePoolSourceFormat(virBufferPtr buf, src->ndevice) { for (i = 0; i < src->ndevice; i++) { if (src->devices[i].nfreeExtent) { - virBufferAsprintf(buf, " <device path='%s'>\n", - src->devices[i].path); + virBufferEscapeString(buf, " <device path='%s'>\n", + src->devices[i].path); for (j = 0; j < src->devices[i].nfreeExtent; j++) { virBufferAsprintf(buf, " <freeExtent start='%llu' end='%llu'/>\n", src->devices[i].freeExtents[j].start, @@ -1076,15 +1077,14 @@ virStoragePoolSourceFormat(virBufferPtr buf, } virBufferAddLit(buf, " </device>\n"); } else { - virBufferAsprintf(buf, " <device path='%s'/>\n", - src->devices[i].path); + virBufferEscapeString(buf, " <device path='%s'/>\n", + src->devices[i].path); } } } - if ((options->flags & VIR_STORAGE_POOL_SOURCE_DIR) && - src->dir) - virBufferAsprintf(buf, " <dir path='%s'/>\n", src->dir); + if (options->flags & VIR_STORAGE_POOL_SOURCE_DIR) + virBufferEscapeString(buf, " <dir path='%s'/>\n", src->dir); if ((options->flags & VIR_STORAGE_POOL_SOURCE_ADAPTER)) { if (src->adapter.type == VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST || @@ -1104,9 +1104,8 @@ virStoragePoolSourceFormat(virBufferPtr buf, } } - if ((options->flags & VIR_STORAGE_POOL_SOURCE_NAME) && - src->name) - virBufferAsprintf(buf, " <name>%s</name>\n", src->name); + if (options->flags & VIR_STORAGE_POOL_SOURCE_NAME) + virBufferEscapeString(buf, " <name>%s</name>\n", src->name); if ((options->flags & VIR_STORAGE_POOL_SOURCE_INITIATOR_IQN) && src->initiator.iqn) { @@ -1129,11 +1128,12 @@ virStoragePoolSourceFormat(virBufferPtr buf, if (src->authType == VIR_STORAGE_POOL_AUTH_CHAP || src->authType == VIR_STORAGE_POOL_AUTH_CEPHX) { - virBufferAsprintf(buf, " <auth type='%s' username='%s'>\n", - virStoragePoolAuthTypeTypeToString(src->authType), - (src->authType == VIR_STORAGE_POOL_AUTH_CHAP ? - src->auth.chap.username : - src->auth.cephx.username)); + virBufferAsprintf(buf, " <auth type='%s' ", + virStoragePoolAuthTypeTypeToString(src->authType)); + virBufferEscapeString(buf, "username='%s'>\n", + (src->authType == VIR_STORAGE_POOL_AUTH_CHAP ? + src->auth.chap.username : + src->auth.cephx.username)); virBufferAddLit(buf, " <secret"); if (src->auth.cephx.secret.uuidUsable) { @@ -1149,13 +1149,8 @@ virStoragePoolSourceFormat(virBufferPtr buf, virBufferAddLit(buf, " </auth>\n"); } - if (src->vendor != NULL) { - virBufferEscapeString(buf, " <vendor name='%s'/>\n", src->vendor); - } - - if (src->product != NULL) { - virBufferEscapeString(buf, " <product name='%s'/>\n", src->product); - } + virBufferEscapeString(buf, " <vendor name='%s'/>\n", src->vendor); + virBufferEscapeString(buf, " <product name='%s'/>\n", src->product); virBufferAddLit(buf, " </source>\n"); @@ -1182,7 +1177,7 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) goto cleanup; } virBufferAsprintf(&buf, "<pool type='%s'>\n", type); - virBufferAsprintf(&buf, " <name>%s</name>\n", def->name); + virBufferEscapeString(&buf, " <name>%s</name>\n", def->name); virUUIDFormat(def->uuid, uuid); virBufferAsprintf(&buf, " <uuid>%s</uuid>\n", uuid); @@ -1203,8 +1198,7 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) def->type != VIR_STORAGE_POOL_SHEEPDOG) { virBufferAddLit(&buf, " <target>\n"); - if (def->target.path) - virBufferAsprintf(&buf, " <path>%s</path>\n", def->target.path); + virBufferEscapeString(&buf, " <path>%s</path>\n", def->target.path); virBufferAddLit(&buf, " <permissions>\n"); virBufferAsprintf(&buf, " <mode>0%o</mode>\n", @@ -1214,9 +1208,8 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) virBufferAsprintf(&buf, " <group>%d</group>\n", (int) def->target.perms.gid); - if (def->target.perms.label) - virBufferAsprintf(&buf, " <label>%s</label>\n", - def->target.perms.label); + virBufferEscapeString(&buf, " <label>%s</label>\n", + def->target.perms.label); virBufferAddLit(&buf, " </permissions>\n"); virBufferAddLit(&buf, " </target>\n"); @@ -1282,8 +1275,8 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, goto error; } - /* Auto-generated so deliberately ignore */ - /* ret->key = virXPathString("string(./key)", ctxt); */ + /* Normally generated by pool refresh, but useful for unit tests */ + ret->key = virXPathString("string(./key)", ctxt); capacity = virXPathString("string(./capacity)", ctxt); unit = virXPathString("string(./capacity/@unit)", ctxt); @@ -1485,11 +1478,11 @@ static int virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferPtr buf, virStorageVolTargetPtr def, - const char *type) { + const char *type) +{ virBufferAsprintf(buf, " <%s>\n", type); - if (def->path) - virBufferAsprintf(buf, " <path>%s</path>\n", def->path); + virBufferEscapeString(buf, " <path>%s</path>\n", def->path); if (options->formatToString) { const char *format = (options->formatToString)(def->format); @@ -1511,8 +1504,7 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, (unsigned int) def->perms.gid); - if (def->perms.label) - virBufferAsprintf(buf, " <label>%s</label>\n", + virBufferEscapeString(buf, " <label>%s</label>\n", def->perms.label); virBufferAddLit(buf, " </permissions>\n"); @@ -1572,8 +1564,8 @@ virStorageVolDefFormat(virStoragePoolDefPtr pool, return NULL; virBufferAddLit(&buf, "<volume>\n"); - virBufferAsprintf(&buf, " <name>%s</name>\n", def->name); - virBufferAsprintf(&buf, " <key>%s</key>\n", NULLSTR(def->key)); + virBufferEscapeString(&buf, " <name>%s</name>\n", def->name); + virBufferEscapeString(&buf, " <key>%s</key>\n", def->key); virBufferAddLit(&buf, " <source>\n"); if (def->source.nextent) { @@ -1585,8 +1577,8 @@ virStorageVolDefFormat(virStoragePoolDefPtr pool, if (thispath != NULL) virBufferAddLit(&buf, " </device>\n"); - virBufferAsprintf(&buf, " <device path='%s'>\n", - def->source.extents[i].path); + virBufferEscapeString(&buf, " <device path='%s'>\n", + def->source.extents[i].path); } virBufferAsprintf(&buf, diff --git a/tests/storagepoolxml2xmlin/pool-dir-naming.xml b/tests/storagepoolxml2xmlin/pool-dir-naming.xml new file mode 100644 index 0000000..aa043be --- /dev/null +++ b/tests/storagepoolxml2xmlin/pool-dir-naming.xml @@ -0,0 +1,18 @@ +<pool type='dir'> + <name>virtimages</name> + <uuid>70a7eb15-6c34-ee9c-bf57-69e8e5ff3fb2</uuid> + <capacity>0</capacity> + <allocation>0</allocation> + <available>0</available> + <source> + </source> + <target> + <path>///var/////lib/libvirt/<images>//</path> + <permissions> + <mode>0700</mode> + <owner>-1</owner> + <group>-1</group> + <label>some_label_t</label> + </permissions> + </target> +</pool> diff --git a/tests/storagepoolxml2xmlout/pool-dir-naming.xml b/tests/storagepoolxml2xmlout/pool-dir-naming.xml new file mode 100644 index 0000000..536f58c --- /dev/null +++ b/tests/storagepoolxml2xmlout/pool-dir-naming.xml @@ -0,0 +1,18 @@ +<pool type='dir'> + <name>virtimages</name> + <uuid>70a7eb15-6c34-ee9c-bf57-69e8e5ff3fb2</uuid> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <available unit='bytes'>0</available> + <source> + </source> + <target> + <path>/var/lib/libvirt/<images></path> + <permissions> + <mode>0700</mode> + <owner>-1</owner> + <group>-1</group> + <label>some_label_t</label> + </permissions> + </target> +</pool> diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 743e1cb..a81cf99 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -85,6 +85,7 @@ mymain(void) ret = -1 DO_TEST("pool-dir"); + DO_TEST("pool-dir-naming"); DO_TEST("pool-fs"); DO_TEST("pool-logical"); DO_TEST("pool-logical-nopath"); diff --git a/tests/storagevolxml2xmlin/vol-file-backing.xml b/tests/storagevolxml2xmlin/vol-file-backing.xml index d23349e..73e7f28 100644 --- a/tests/storagevolxml2xmlin/vol-file-backing.xml +++ b/tests/storagevolxml2xmlin/vol-file-backing.xml @@ -1,5 +1,6 @@ <volume> <name>sparse.img</name> + <key>/var/lib/libvirt/images/sparse.img</key> <source/> <capacity unit='GB'>10</capacity> <allocation unit='MiB'>0</allocation> diff --git a/tests/storagevolxml2xmlin/vol-file-naming.xml b/tests/storagevolxml2xmlin/vol-file-naming.xml new file mode 100644 index 0000000..9a33e2b --- /dev/null +++ b/tests/storagevolxml2xmlin/vol-file-naming.xml @@ -0,0 +1,20 @@ +<volume> + <name><sparse>.img</name> + <source/> + <capacity unit="TiB">1</capacity> + <allocation unit="bytes">0</allocation> + <target> + <path>/var/lib/libvirt/images/<sparse>.img</path> + <permissions> + <mode>0</mode> + <owner>0744</owner> + <group>0</group> + <label>virt_image_t</label> + </permissions> + <timestamps> + <atime>1341933637.273190990</atime> + <mtime>1341930622.047245868</mtime> + <ctime>1341930622.047245868</ctime> + </timestamps> + </target> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-file-backing.xml b/tests/storagevolxml2xmlout/vol-file-backing.xml index c0f152e..8d2fb57 100644 --- a/tests/storagevolxml2xmlout/vol-file-backing.xml +++ b/tests/storagevolxml2xmlout/vol-file-backing.xml @@ -1,6 +1,6 @@ <volume> <name>sparse.img</name> - <key>(null)</key> + <key>/var/lib/libvirt/images/sparse.img</key> <source> </source> <capacity unit='bytes'>10000000000</capacity> diff --git a/tests/storagevolxml2xmlout/vol-file-naming.xml b/tests/storagevolxml2xmlout/vol-file-naming.xml new file mode 100644 index 0000000..7022b02 --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-file-naming.xml @@ -0,0 +1,17 @@ +<volume> + <name><sparse>.img</name> + <source> + </source> + <capacity unit='bytes'>1099511627776</capacity> + <allocation unit='bytes'>0</allocation> + <target> + <path>/var/lib/libvirt/images/<sparse>.img</path> + <format type='raw'/> + <permissions> + <mode>00</mode> + <owner>744</owner> + <group>0</group> + <label>virt_image_t</label> + </permissions> + </target> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-file.xml b/tests/storagevolxml2xmlout/vol-file.xml index a3d6473..b97dd50 100644 --- a/tests/storagevolxml2xmlout/vol-file.xml +++ b/tests/storagevolxml2xmlout/vol-file.xml @@ -1,6 +1,5 @@ <volume> <name>sparse.img</name> - <key>(null)</key> <source> </source> <capacity unit='bytes'>1099511627776</capacity> diff --git a/tests/storagevolxml2xmlout/vol-logical-backing.xml b/tests/storagevolxml2xmlout/vol-logical-backing.xml index 6b010e3..bf34b08 100644 --- a/tests/storagevolxml2xmlout/vol-logical-backing.xml +++ b/tests/storagevolxml2xmlout/vol-logical-backing.xml @@ -1,6 +1,6 @@ <volume> <name>Swap</name> - <key>(null)</key> + <key>r4xkCv-MQhr-WKIT-R66x-Epn2-e8hG-1Z5gY0</key> <source> </source> <capacity unit='bytes'>2080374784</capacity> diff --git a/tests/storagevolxml2xmlout/vol-logical.xml b/tests/storagevolxml2xmlout/vol-logical.xml index 7bf309e..e9b4e4b 100644 --- a/tests/storagevolxml2xmlout/vol-logical.xml +++ b/tests/storagevolxml2xmlout/vol-logical.xml @@ -1,6 +1,6 @@ <volume> <name>Swap</name> - <key>(null)</key> + <key>r4xkCv-MQhr-WKIT-R66x-Epn2-e8hG-1Z5gY0</key> <source> </source> <capacity unit='bytes'>2080374784</capacity> diff --git a/tests/storagevolxml2xmlout/vol-partition.xml b/tests/storagevolxml2xmlout/vol-partition.xml index 271964f..9be1cf1 100644 --- a/tests/storagevolxml2xmlout/vol-partition.xml +++ b/tests/storagevolxml2xmlout/vol-partition.xml @@ -1,6 +1,6 @@ <volume> <name>sda1</name> - <key>(null)</key> + <key>/dev/sda1</key> <source> </source> <capacity unit='bytes'>106896384</capacity> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml b/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml index a7b5fed..fd3d606 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml @@ -1,6 +1,6 @@ <volume> <name>OtherDemo.img</name> - <key>(null)</key> + <key>/var/lib/libvirt/images/OtherDemo.img</key> <source> </source> <capacity unit='bytes'>5368709120</capacity> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml b/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml index b7df8a6..99fb5ac 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml @@ -1,6 +1,6 @@ <volume> <name>OtherDemo.img</name> - <key>(null)</key> + <key>/var/lib/libvirt/images/OtherDemo.img</key> <source> </source> <capacity unit='bytes'>5368709120</capacity> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml b/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml index 92b7875..3708ea7 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml @@ -1,6 +1,6 @@ <volume> <name>OtherDemo.img</name> - <key>(null)</key> + <key>/var/lib/libvirt/images/OtherDemo.img</key> <source> </source> <capacity unit='bytes'>5368709120</capacity> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml b/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml index e2da702..f6a2e21 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml @@ -1,6 +1,6 @@ <volume> <name>OtherDemo.img</name> - <key>(null)</key> + <key>/var/lib/libvirt/images/OtherDemo.img</key> <source> </source> <capacity unit='bytes'>5368709120</capacity> diff --git a/tests/storagevolxml2xmlout/vol-qcow2.xml b/tests/storagevolxml2xmlout/vol-qcow2.xml index f931a62..b9adcb4 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2.xml @@ -1,6 +1,6 @@ <volume> <name>OtherDemo.img</name> - <key>(null)</key> + <key>/var/lib/libvirt/images/OtherDemo.img</key> <source> </source> <capacity unit='bytes'>5368709120</capacity> diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevolxml2xmlout/vol-sheepdog.xml index 2f19af8..bd5d6d8 100644 --- a/tests/storagevolxml2xmlout/vol-sheepdog.xml +++ b/tests/storagevolxml2xmlout/vol-sheepdog.xml @@ -1,6 +1,5 @@ <volume> <name>test2</name> - <key>(null)</key> <source> </source> <capacity unit='bytes'>1024</capacity> diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 1fd01f1..e1db465 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -110,6 +110,7 @@ mymain(void) while (0); DO_TEST("pool-dir", "vol-file"); + DO_TEST("pool-dir", "vol-file-naming"); DO_TEST("pool-dir", "vol-file-backing"); DO_TEST("pool-dir", "vol-qcow2"); DO_TEST("pool-dir", "vol-qcow2-1.1"); -- 1.8.3.1

2 3

[libvirt] [PATCH] virDomainReboot: Document that migration might be unsafe
by Michal Privoznik 21 Nov '13

21 Nov '13

https://bugzilla.redhat.com/show_bug.cgi?id=744967 If a domain is rebooting and a migrate API is called meanwhile we would have to transfer the fakeReboot attribute to the destination in order to prevent domain doing plain shutdown over there. We shouldn't try to do anything clever about it other than documenting this as known limitation. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index ae05300..c4c6d5c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3434,6 +3434,11 @@ error: * To use guest agent (VIR_DOMAIN_REBOOT_GUEST_AGENT) the domain XML * must have <channel> configured. * + * Due to a implementation limitations in some drivers (the qemu driver, + * for instance) it is not advised to migrate or save a guest that is + * rebooting as a result of this API. Migrating such guest can lead to a + * plain shutdown on the destination. + * * Returns 0 in case of success and -1 in case of failure. */ int -- 1.8.4.4

2 1

Re: [libvirt] [PATCH v3] virsh domxml-from-native to treat SCSI as the bus type for pseries by default
by Shivaprasad bhat 21 Nov '13

21 Nov '13

This is supposedly the v3 of the patch. Jan, Cole, I have added the test case as suggested. Kindly review. Thanks, Shiva On Fri, Nov 22, 2013 at 1:36 AM, Shivaprasad G Bhat < sbhat(a)linux.vnet.ibm.com> wrote: > From: Shivaprasad G Bhat <shivaprasadbhat(a)gmail.com> > > The bus type IDE being enum Zero, the bus type on pseries system appears > as IDE for all the -hda/-cdrom and for disk drives with if="none" type. > Pseries platform needs this to appear as SCSI instead of IDE. The ide being > not supported, the explicit requests for ide devices will return an error. > > Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> > --- > src/qemu/qemu_command.c | 66 > +++++++++++++++++++- > tests/qemuargv2xmltest.c | 1 > .../qemuxml2argv-pseries-disk.args | 5 ++ > .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 40 ++++++++++++ > 4 files changed, 108 insertions(+), 4 deletions(-) > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml > > diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c > index 8dc7e43..21b5108 100644 > --- a/src/qemu/qemu_command.c > +++ b/src/qemu/qemu_command.c > @@ -10032,6 +10032,7 @@ error: > static virDomainDiskDefPtr > qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, > const char *val, > + virDomainDefPtr dom, > int nvirtiodisk, > bool old_style_ceph_args) > { > @@ -10055,7 +10056,11 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr > xmlopt, > if (VIR_ALLOC(def) < 0) > goto cleanup; > > - def->bus = VIR_DOMAIN_DISK_BUS_IDE; > + if (((dom->os.arch == VIR_ARCH_PPC64) && > + dom->os.machine && STREQ(dom->os.machine, "pseries"))) > + def->bus = VIR_DOMAIN_DISK_BUS_SCSI; > + else > + def->bus = VIR_DOMAIN_DISK_BUS_IDE; > def->device = VIR_DOMAIN_DISK_DEVICE_DISK; > def->type = VIR_DOMAIN_DISK_TYPE_FILE; > > @@ -10140,9 +10145,15 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr > xmlopt, > def->type = VIR_DOMAIN_DISK_TYPE_FILE; > } > } else if (STREQ(keywords[i], "if")) { > - if (STREQ(values[i], "ide")) > + if (STREQ(values[i], "ide")) { > def->bus = VIR_DOMAIN_DISK_BUS_IDE; > - else if (STREQ(values[i], "scsi")) > + if (((dom->os.arch == VIR_ARCH_PPC64) && > + dom->os.machine && STREQ(dom->os.machine, > "pseries"))) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("pseries systems do not support ide > devices '%s'"), val); > + goto error; > + } > + } else if (STREQ(values[i], "scsi")) > def->bus = VIR_DOMAIN_DISK_BUS_SCSI; > else if (STREQ(values[i], "virtio")) > def->bus = VIR_DOMAIN_DISK_BUS_VIRTIO; > @@ -11368,6 +11379,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps, > disk->type = VIR_DOMAIN_DISK_TYPE_FILE; > if (STREQ(arg, "-cdrom")) { > disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; > + if (((def->os.arch == VIR_ARCH_PPC64) && > + def->os.machine && STREQ(def->os.machine, "pseries"))) > + disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; > if (VIR_STRDUP(disk->dst, "hdc") < 0) > goto error; > disk->readonly = true; > @@ -11381,6 +11395,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps, > disk->bus = VIR_DOMAIN_DISK_BUS_IDE; > else > disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; > + if (((def->os.arch == VIR_ARCH_PPC64) && > + def->os.machine && STREQ(def->os.machine, > "pseries"))) > + disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; > } > if (VIR_STRDUP(disk->dst, arg + 1) < 0) > goto error; > @@ -11672,7 +11689,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, > } > } else if (STREQ(arg, "-drive")) { > WANT_VALUE(); > - if (!(disk = qemuParseCommandLineDisk(xmlopt, val, > + if (!(disk = qemuParseCommandLineDisk(xmlopt, val, def, > nvirtiodisk, > ceph_args != NULL))) > goto error; > @@ -11858,6 +11875,47 @@ qemuParseCommandLine(virCapsPtr qemuCaps, > } > } else if (STREQ(arg, "-S")) { > /* ignore, always added by libvirt */ > + } else if (STREQ(arg, "-device")) { > + /* something we can't fully parse. Check if supported and > + * add it to the qemu namespace > + * cmdline/environment advanced options and hope for the best > + */ > + bool unsupported = false; > + WANT_VALUE() > + > + if ((def->os.arch == VIR_ARCH_PPC64) && > + def->os.machine && STREQ(def->os.machine, "pseries")) { > + int nkws; > + char **kws; > + char **vals; > + size_t j; > + > + if (!qemuParseKeywords(val, &kws, &vals, &nkws, 1)) { > + for (j = 0; j < nkws; j++) { > + if (STREQLEN(kws[j], "ide", 3) || > + (STREQ(kws[j], "if") && vals[j] && > + STREQ(vals[j], "ide"))) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("pseries systems do not > support ide devices '%s'"), val); > + unsupported = true; > + break; > + } > + } > + for (j = 0; j < nkws; j++) { > + VIR_FREE(kws[j]); > + VIR_FREE(vals[j]); > + } > + VIR_FREE(kws); > + VIR_FREE(vals); > + } > + } > + > + if (unsupported || VIR_REALLOC_N(cmd->args, cmd->num_args+2) > < 0) > + goto error; > + if (VIR_STRDUP(cmd->args[cmd->num_args++], arg) < 0) > + goto error; > + if (VIR_STRDUP(cmd->args[cmd->num_args++], val) < 0) > + goto error; > } else { > /* something we can't yet parse. Add it to the qemu namespace > * cmdline/environment advanced options and hope for the best > diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c > index 6dd8bb0..0bf4c37 100644 > --- a/tests/qemuargv2xmltest.c > +++ b/tests/qemuargv2xmltest.c > @@ -249,6 +249,7 @@ mymain(void) > DO_TEST("hyperv"); > > DO_TEST("pseries-nvram"); > + DO_TEST("pseries-disk"); > > DO_TEST("nosharepages"); > > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args > b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args > new file mode 100644 > index 0000000..5fc0938 > --- /dev/null > +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args > @@ -0,0 +1,5 @@ > +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test > QEMU_AUDIO_DRV=none \ > +/usr/bin/qemu-system-ppc64 \ > +-S -M pseries -m 512 -smp 1 \ > +-no-acpi -boot c -usb \ > +-boot c -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml > b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml > new file mode 100644 > index 0000000..dbbd6aa > --- /dev/null > +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml > @@ -0,0 +1,40 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>87eedafe-eedc-4336-8130-ed9fe5dc90c8</uuid> > + <memory unit='KiB'>524288</memory> > + <currentMemory unit='KiB'>524288</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='ppc64' machine='pseries'>hvm</type> > + <boot dev='hd'/> > + </os> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-ppc64</emulator> > + <disk type='block' device='disk'> > + <driver name='qemu' type='raw'/> > + <source dev='/dev/HostVG/QEMUGuest1'/> > + <target dev='hda' bus='scsi'/> > + <address type='drive' controller='0' bus='0' target='0' unit='0'/> > + </disk> > + <disk type='file' device='cdrom'> > + <driver name='qemu' type='raw'/> > + <source file='/root/boot.iso'/> > + <target dev='hdc' bus='scsi'/> > + <readonly/> > + <address type='drive' controller='0' bus='0' target='0' unit='2'/> > + </disk> > + <controller type='usb' index='0'/> > + <controller type='scsi' index='0'/> > + <controller type='pci' index='0' model='pci-root'/> > + <input type='mouse' bus='ps2'/> > + <graphics type='sdl'/> > + <video> > + <model type='cirrus' vram='9216' heads='1'/> > + </video> > + <memballoon model='virtio'/> > + </devices> > +</domain> > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

[libvirt] [libvirt-python PATCHv2 00/44] Split Python bindings into its own repo
by Doug Goldstein 21 Nov '13

21 Nov '13

This patch series is a follow up to: https://www.redhat.com/archives/libvir-list/2013-November/msg00416.html https://www.redhat.com/archives/libvir-list/2013-November/msg00620.html It includes all of Dan's patches and builds on his work and incorporates all reviews from Eric. The goal is to split the Python bindings out into their own git repo. These patches do not apply to current libvirt.git. You must follow Dan's steps for creating the new repo and initialize it based on the history of the current python/ subdirectory. Assuming your current checkout of libvirt is in a directory 'libvirt', then $ git clone libvirt libvirt-python $ cd libvirt-python $ git filter-branch --subdirectory-filter python --tag-name-filter cat -- --all $ git for-each-ref --format="%(refname)" refs/original/ | xargs -n 1 git update-ref -d $ git reflog expire --expire=now --all $ git gc --prune=now You should now have a repo that's a couple of MB in size, showing only the files from python/ dir, in the root. The tags have been re-written to show content from the python/ directory. All the GPG signatures from tags are removed, since they are invalid after rewriting history. This was previously agreed to be the right way to handle this. The build system uses python distutils instead of autoconf/automake. It still uses the code generator as before though, pulling the XML files from /usr/share/libvirt/api (or whever you installed libvirt, as indicated by pkg-config). created a simple autobuild.sh to do an end-to-end build, including the RPM generation. Or you can just do python setup.py build ('make' equiv) python setup.py test ('make check' equiv) python setup.py rpm ('make rpm' equiv) python setup.py clean ('make clean' equiv) Historically libvirt python only worked with the exact matching libvirt binary. Before releasing this, I think we need to make it possible to compile libvirt-python against any recent-ish libvirt version. This shouldn't actually be too hard - the generator will take care of most of it. All we need do is fix up the -override.c files to make use of version checks to hide APIs not present in older libvirt. The RPM is designed to be drop in compatible/identical to/with the existing libvirt-python RPM, so users should notice no difference in any way when upgrading. If you don't want to try the filter-branch steps yourself, you can clone this complete series + repo from: git clone https://github.com/cardoe/libvirt-python.git Notice how the history is intact right back to the first commit of the python bindings. NOTE: We need to pull in the following directories and this does not do that. * examples/python * examples/domain-events/events-python Daniel P. Berrange (14): Remove obsolete Makefile.am Update generator for new code layout Update header file includes Import STREQ macro from libvirt Add decl of MIN macro Import gnulib's xalloc_oversized macro Import gnulib's ignore_value macro Import code annotation macros from libvirt Import VIR_ALLOC / VIR_ALLOC_N / VIR_REALLOC_N functions Remove use of virStrcpyStatic Import VIR_FORCE_CLOSE macro from libvirt Add build/ to python module path for sanitytest.py Add execute permission for sanitytest.py Setup distutils build system Doug Goldstein (30): Import LIBVIR_CHECK_VERSION macro from libvirt Import some virTypedParams* APIs from libvirt Add missing attributes to setup.py 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 virDomainSnapshotListChildrenNames API appeared in 0.9.7 virDomain{Get,Set}BlockIoTune APIs appeared in 0.9.8 virDomain{Get,Set}InterfaceParameters APIs appeared in 0.9.9 virDomain{Get,Set}NumaParameters APIs appeared in 0.9.9 virDomainGetCPUStats API appeared in 0.9.10 virDomainGetDiskErrors API appeared in 0.9.10 virDomainListAllSnapshots API appeared in 0.9.13 virConnectListAllDomains API appeared in 0.9.13 virDomainSnapshotListAllChildren API appeared in 0.9.13 virConnect{Unr,R}egisterCloseCallback API appeared in 0.10.0 virDomainPinEmulator and virDomainGetEmulatorPinInfo APIs appeared in 0.10.0 virConnectListAll* APIs appeared in 0.10.2 virNode{Get,Set}MemoryParameters API appeared in 0.10.2 virStoragePoolListAllVolumes API appeared in 0.10.2 VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK appeared in 1.0.0 virNodeGetCPUMap API appeared in 1.0.0 virTypedParams* API appeared in 1.0.2 virDomainGetJobStats API appeared in 1.0.3 virDomainMigrateGetCompressionCache API appeared in 1.0.3 virDomainMigrate3 and virDomainMigrateToURI3 appeared in 1.1.0 virDomainCreateXMLWithFiles and virDomainCreateWithFiles APIs appeared in 1.1.1 VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED appeared in 1.1.1 virConnectGetCPUModelNames API appeared in 1.1.3 Simplify out of memory error case .gitignore | 4 + AUTHORS.in | 12 ++ COPYING | 339 ++++++++++++++++++++++++++++++++ COPYING.LESSER | 502 ++++++++++++++++++++++++++++++++++++++++++++++++ MANIFEST.in | 27 +++ Makefile.am | 173 ----------------- NEWS | 9 + autobuild.sh | 24 +++ generator.py | 79 +++----- libvirt-lxc-override.c | 9 +- libvirt-override.c | 240 ++++++++++++++++------- libvirt-python.spec.in | 34 ++++ libvirt-qemu-override.c | 8 +- libvirt-utils.c | 181 +++++++++++++++++ libvirt-utils.h | 209 ++++++++++++++++++++ sanitytest.py | 4 + setup.py | 291 ++++++++++++++++++++++++++++ typewrappers.c | 5 +- 18 files changed, 1846 insertions(+), 304 deletions(-) create mode 100644 .gitignore create mode 100644 AUTHORS.in create mode 100644 COPYING create mode 100644 COPYING.LESSER create mode 100644 MANIFEST.in delete mode 100644 Makefile.am create mode 100644 NEWS create mode 100755 autobuild.sh create mode 100644 libvirt-python.spec.in create mode 100644 libvirt-utils.c create mode 100644 libvirt-utils.h mode change 100644 => 100755 sanitytest.py create mode 100644 setup.py -- 1.8.3.2

1 52

[libvirt] [PATCH] qemuMigrationIsAllowed: Forbid migration of rebooting domain
by Michal Privoznik 21 Nov '13

21 Nov '13

https://bugzilla.redhat.com/show_bug.cgi?id=744967 If a domain is rebooting and a migrate API is called meanwhile we would have to transfer the fakeReboot attribute to the destination in order to prevent domain doing plain shutdown over there. What about forbidding this silly corner case instead? Same goes for saving a domain to a file. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_migration.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e87ea85..6dffbb1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1399,6 +1399,14 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, size_t i; if (vm) { + qemuDomainObjPrivatePtr priv = vm->privateData; + + if (priv->fakeReboot) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is rebooting")); + return false; + } + if (qemuProcessAutoDestroyActive(driver, vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is marked for auto destroy")); -- 1.8.4.4

2 1

[libvirt] [libvirt-sandbox] GVirSandboxConfigNetwork: Fix small finalize() leak
by Christophe Fergeau 21 Nov '13

21 Nov '13

The content of the 'addrs' and 'routes' lists is freed, but the list themselves were not g_list_free()'ed --- libvirt-sandbox/libvirt-sandbox-config-network.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.c b/libvirt-sandbox/libvirt-sandbox-config-network.c index 555a360..eb6a569 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network.c @@ -131,7 +131,9 @@ static void gvir_sandbox_config_network_finalize(GObject *object) g_free(priv->source); g_free(priv->mac); g_list_foreach(priv->addrs, (GFunc)g_object_unref, NULL); + g_list_free(priv->addrs); g_list_foreach(priv->routes, (GFunc)g_object_unref, NULL); + g_list_free(priv->routes); G_OBJECT_CLASS(gvir_sandbox_config_network_parent_class)->finalize(object); } -- 1.8.4.2

2 1

[libvirt] [PATCH v2 1/1] qemu: Remove default memory balloon for PPC64
by Li Zhang 21 Nov '13

21 Nov '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> It doesn't need to add a default memory balloon for PPC64. Only if users want it, it can be added explicitly. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- v2 -> v1: * Fix one qemuargv2xmltest failure src/qemu/qemu_command.c | 12 ------------ src/qemu/qemu_domain.c | 12 ++++++++---- tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml | 1 - 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8dc7e43..a1e5387 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -11989,18 +11989,6 @@ qemuParseCommandLine(virCapsPtr qemuCaps, def->videos[def->nvideos++] = vid; } - /* - * having a balloon is the default, define one with type="none" to avoid it - */ - if (!def->memballoon) { - virDomainMemballoonDefPtr memballoon; - if (VIR_ALLOC(memballoon) < 0) - goto error; - memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; - - def->memballoon = memballoon; - } - VIR_FREE(nics); if (virDomainDefAddImplicitControllers(def) < 0) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 346fec3..0744e89 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -724,13 +724,17 @@ qemuDomainDefPostParse(virDomainDefPtr def, break; case VIR_ARCH_ARMV7L: - addDefaultUSB = false; - addDefaultMemballoon = false; - break; + addDefaultUSB = false; + addDefaultMemballoon = false; + break; + + case VIR_ARCH_PPC64: + addPCIRoot = true; + addDefaultMemballoon = false; + break; case VIR_ARCH_ALPHA: case VIR_ARCH_PPC: - case VIR_ARCH_PPC64: case VIR_ARCH_PPCEMB: case VIR_ARCH_SH4: case VIR_ARCH_SH4EB: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml index d001ee7..567d993 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml @@ -16,7 +16,6 @@ <emulator>/usr/bin/qemu-system-ppc64</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> - <memballoon model='virtio'/> <nvram> <address type='spapr-vio' reg='0x4000'/> </nvram> -- 1.8.2.1

2 2

[libvirt] [PATCH] python: remove virConnectGetCPUModelNames from globals
by Doug Goldstein 21 Nov '13

21 Nov '13

Commit de51dc9c9aed0e615c8b301cccb89f4859324eb0 primarily added virConnectGetCPUModelNames as libvirt.getCPUModelNames(conn, arch) instead of libvirt.virConnect.getCPUModelNames(arch) so revert the code that does the former while leaving the code that does the later. --- So to test this do the following before building this: $ python >>> import libvirt >>> "getCPUModelNames" in dir(libvirt) True >>> "getCPUModelNames" in dir(libvirt.virConnect) True >>> conn = libvirt.open() >>> libvirt.getCPUModelNames(conn, "x86_64") ['486', 'pentium', 'pentium2', 'pentium3', 'pentiumpro', 'coreduo', 'n270', 'core2duo', 'qemu32', 'kvm32', 'cpu64-rhel5', 'cpu64-rhel6', 'kvm64', 'qemu64', 'Conroe', 'Penryn', 'Nehalem', 'Westmere', 'SandyBridge', 'Haswell', 'athlon', 'phenom', 'Opteron_G1', 'Opteron_G2', 'Opteron_G3', 'Opteron_G4', 'Opteron_G5'] >>> conn.getCPUModelNames("x86_64") ['486', 'pentium', 'pentium2', 'pentium3', 'pentiumpro', 'coreduo', 'n270', 'core2duo', 'qemu32', 'kvm32', 'cpu64-rhel5', 'cpu64-rhel6', 'kvm64', 'qemu64', 'Conroe', 'Penryn', 'Nehalem', 'Westmere', 'SandyBridge', 'Haswell', 'athlon', 'phenom', 'Opteron_G1', 'Opteron_G2', 'Opteron_G3', 'Opteron_G4', 'Opteron_G5'] Then build this and assuming you're in the top level of libvirt: $ python >>> import sys >>> sys.path.insert(0, 'python/') >>> import libvirt .... repeat the steps above and watch the case libvirt.getCPUModelNames fail --- --- python/generator.py | 1 - python/libvirt-override.c | 53 ---------------------------------------------- python/libvirt-override.py | 11 ---------- 3 files changed, 65 deletions(-) diff --git a/python/generator.py b/python/generator.py index 87ecf5a..0e86bed 100755 --- a/python/generator.py +++ b/python/generator.py @@ -250,7 +250,6 @@ lxc_functions_failed = [] qemu_functions_failed = [] functions_skipped = [ "virConnectListDomains", - "virConnectGetCPUModelNames", ] lxc_functions_skipped = [] qemu_functions_skipped = [] diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 747c877..bd7a610 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2276,58 +2276,6 @@ libvirt_virConnectGetVersion(PyObject *self ATTRIBUTE_UNUSED, return PyInt_FromLong(hvVersion); } -PyObject * -libvirt_virConnectGetCPUModelNames(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) -{ - int c_retval; - virConnectPtr conn; - PyObject *rv = NULL, *pyobj_conn; - char **models = NULL; - size_t i; - int flags = 0; - const char *arch = NULL; - - if (!PyArg_ParseTuple(args, (char *)"Osi:virConnectGetCPUModelNames", - &pyobj_conn, &arch, &flags)) - return NULL; - conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); - - LIBVIRT_BEGIN_ALLOW_THREADS; - - c_retval = virConnectGetCPUModelNames(conn, arch, &models, flags); - - LIBVIRT_END_ALLOW_THREADS; - - if (c_retval == -1) - return VIR_PY_INT_FAIL; - - if ((rv = PyList_New(c_retval)) == NULL) - goto error; - - for (i = 0; i < c_retval; i++) { - PyObject *str; - if ((str = PyString_FromString(models[i])) == NULL) - goto error; - - PyList_SET_ITEM(rv, i, str); - } - -done: - if (models) { - for (i = 0; i < c_retval; i++) - VIR_FREE(models[i]); - VIR_FREE(models); - } - - return rv; - -error: - Py_XDECREF(rv); - rv = VIR_PY_INT_FAIL; - goto done; -} - static PyObject * libvirt_virConnectGetLibVersion(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -7228,7 +7176,6 @@ static PyMethodDef libvirtMethods[] = { #include "libvirt-export.c" {(char *) "virGetVersion", libvirt_virGetVersion, METH_VARARGS, NULL}, {(char *) "virConnectGetVersion", libvirt_virConnectGetVersion, METH_VARARGS, NULL}, - {(char *) "virConnectGetCPUModelNames", libvirt_virConnectGetCPUModelNames, METH_VARARGS, NULL}, {(char *) "virConnectGetLibVersion", libvirt_virConnectGetLibVersion, METH_VARARGS, NULL}, {(char *) "virConnectOpenAuth", libvirt_virConnectOpenAuth, METH_VARARGS, NULL}, {(char *) "virConnectListDomainsID", libvirt_virConnectListDomainsID, METH_VARARGS, NULL}, diff --git a/python/libvirt-override.py b/python/libvirt-override.py index 3471a43..ccfec48 100644 --- a/python/libvirt-override.py +++ b/python/libvirt-override.py @@ -207,14 +207,3 @@ def virEventAddTimeout(timeout, cb, opaque): ret = libvirtmod.virEventAddTimeout(timeout, cbData) if ret == -1: raise libvirtError ('virEventAddTimeout() failed') return ret - -def getCPUModelNames(conn, arch, flags=0): - """ - get the list of supported CPU models. - @conn: virConnect connection - @arch: Architecture - @flags: extra flags; not used yet, so callers should always pass 0. - """ - ret = libvirtmod.virConnectGetCPUModelNames(conn._o, arch, flags) - if ret == None: raise libvirtError ('virConnectGetCPUModelNames() failed', conn=self) - return ret -- 1.8.3.2

2 1

[libvirt] [PATCH] docs: delete extra character
by Wangyufei (A) 21 Nov '13

21 Nov '13

delete extra character 'p' from the comment of virInterfaceCreate Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> --- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ae05300..9355d33 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -12801,7 +12801,7 @@ error: * interface was defined (that is, if virInterfaceChangeBegin() had * been called), the interface will be brought back down (and then * undefined) if virInterfaceChangeRollback() is called. -p * + * * Returns 0 in case of success, -1 in case of error */ int -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 1

[libvirt] [PATCH 0/3 v3] qemu: Hotplug SCSI controllers/hostdevs
by Eric Farman 21 Nov '13

21 Nov '13

Today, hotplug of a SCSI hostdev relies on the presence of an existing SCSI controller, which can be defined in the initial domain XML. Hotplug of a SCSI controller relies on the presence of a PCI bus, which does not work in all environments. These patches correct this behavior, in order to allow hotplug (and unplug) work without incident. Changes from v2->v3: - Patch 2: Combine attach code within QEMU_CAPS_DEVICE check - Patch 2: Restructure detach to cover ..._TYPE_NONE controllers Changes from v1->v2: - Patch 2: Check for VIR_..._TYPE_NONE on controller->info.type - Patch 2: Check device address for TYPE_CCW controllers during detach - Patch 1: Fixed an indentation change that was missed Eric Farman (3): qemu: Rename controller hotplug functions to not be PCI-specific qemu: Separate calls based on controller bus type qemu: Auto-generate controller for hotplugged hostdev src/qemu/qemu_driver.c | 4 +-- src/qemu/qemu_hotplug.c | 62 +++++++++++++++++++++++++++++++++++------------ src/qemu/qemu_hotplug.h | 12 ++++----- 3 files changed, 54 insertions(+), 24 deletions(-) -- 1.7.9.5

2 4

[libvirt] [PATCH] storage: Returns earlier if source adapter of the scsi pool is a HBA
by Osier Yang 21 Nov '13

21 Nov '13

It makes no sense to go forward to get the parent host number of a HBA, and treat the HBA as a vHBA with trying to delete it. --- src/storage/storage_backend_scsi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 1426121..6f86ffc 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -667,6 +667,14 @@ deleteVport(virStoragePoolSourceAdapter adapter) if (adapter.type != VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST) return 0; + /* It must be a HBA instead of a vHBA as long as "parent" + * is NULL. "createVport" guaranteed "parent" for a vHBA + * cannot be NULL, it's either specified in XML, or detected + * automatically. + */ + if (!adapter.data.fchost.parent) + return 0; + if (!(virGetFCHostNameByWWN(NULL, adapter.data.fchost.wwnn, adapter.data.fchost.wwpn))) return -1; -- 1.8.1.4

2 2

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

20 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. A test case was added to qemuxml2argvtest for this change. Signed-off-by: Clark Laughlin <clark.laughlin(a)linaro.org> --- Resend with test case added --- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_domain.c | 3 ++ .../qemuxml2argv-arm-virt-virtio.args | 14 +++++++ .../qemuxml2argv-arm-virt-virtio.xml | 45 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.xml 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"; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args new file mode 100644 index 0000000..5206ad8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args @@ -0,0 +1,14 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-arm -S -M virt -m 1024 -smp 1 -nographic \ +-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ +-boot c -kernel /arm.kernel -initrd /arm.initrd -append \ +'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ +-dtb /arm.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ +-drive file=/arm.raw,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ +-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ +-device virtconsole,chardev=charconsole1,id=console1 \ +-device virtio-balloon-device,id=balloon0 \ +-object rng-random,id=rng0,filename=/dev/random \ +-device virtio-rng-device,rng=rng0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.xml new file mode 100644 index 0000000..913c96e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.xml @@ -0,0 +1,45 @@ +<domain type="qemu"> + <name>armtest</name> + <uuid>496d7ea8-9739-544b-4ebd-ef08be936e6a</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch="armv7l" machine="virt">hvm</type> + <kernel>/arm.kernel</kernel> + <initrd>/arm.initrd</initrd> + <dtb>/arm.dtb</dtb> + <cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0</cmdline> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset="utc"/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-arm</emulator> + <disk type='file' device='disk'> + <source file='/arm.raw'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + </interface> + <console type='pty'/> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='virtio'/> +  + <rng model='virtio'> + <backend model='random'>/dev/random</backend> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b14e713..fde78bc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1103,6 +1103,11 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("arm-virt-virtio", + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + virObjectUnref(driver.config); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 1.8.1.2

2 1

[libvirt] [PATCH 0/3 RESEND] qemu: Hotplug SCSI controllers/hostdevs
by Eric Farman 20 Nov '13

20 Nov '13

(Resending, as this has perhaps been lost during the release of 1.1.3. I've rebased this patch series onto today's git repository.) Today, hotplug of a SCSI hostdev relies on the presence of an existing SCSI controller, which can be defined in the initial domain XML. Hotplug of a SCSI controller relies on the presence of a PCI bus, which does not work in all environments. These patches correct this behavior, in order to allow hotplug (and unplug) work without incident. Reviewed-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Eric Farman (3): qemu: Rename controller hotplug functions to not be PCI-specific qemu: Separate calls based on controller bus type qemu: Auto-generate controller for hotplugged hostdev src/qemu/qemu_driver.c | 4 +-- src/qemu/qemu_hotplug.c | 62 ++++++++++++++++++++++++++++++++--------------- src/qemu/qemu_hotplug.h | 12 ++++----- 3 files changed, 50 insertions(+), 28 deletions(-) -- 1.7.9.5

4 15

Re: [libvirt] [Users] Time keeping in Windows VM
by Dan Kenigsberg 20 Nov '13

20 Nov '13

On Tue, Nov 19, 2013 at 04:36:24PM +0000, Martin Goldstone wrote: > Hi all, > > We're currently experiencing an issue in our production oVirt 3.2.2 > environment (on CentOS 6.4) with time keeping on our Windows guests. It > seems to have appeared around the time of the recent DST change. It's taken > us a while to get to the bottom of this as some machines were created in > the wrong timezone, which muddied the waters a bit. > > It appears that when Windows automatically updated time in the VMs, this > new offset from UTC was not stored correctly, and the next time the host > was shutdown and started back up, the clock was set incorrectly. We > eventually managed to get this to be consistently reproducible: Set the > clock an hour ahead; power off VM; power it back on; set the clock an hour > back (ie return it to the original time), power off and power back on; > observe that the clock has now shifted to an hour before the original time. > This can be observed in the vm_dynamic table on the database. > > To be honest, I don't think that this an oVirt problem, as I've done some > limited testing on another host using virt-manager/libvirt. If I edit the > xml to set the clock offset to variable, using UTC as the basis and setting > the adjustment to 3600 (mimicking how it would have been before the DST > change), when I change the time in the VM back by an hour (as Windows would > do automatically at DST change), the xml shows a new offset of -3600, so it > seems when the clock is changed the offset it's putting in the XML is the > offset based on the time from when the VM was started, not the offset from > UTC. I believe that you are seeing "Bug 956741 - When RHEL VMs are powered off/on time is off by as much as 3 hrs when system comes back up". http://libvirt.org/html/libvirt-libvirt.html#virConnectDomainEventRTCChange… says that utcoffset is relative to UTC. If it's not so, it's a bug (either in the doc or in the code) so I'm copying libvir-list. Which libvirt and qemu versions do you have? > > Does anyone have any suggestions? At the moment, the only things I can > think of doing are either a) shutting down each VM and setting their offset > to 0 in the vm_dynamic table before starting the back up again or b) > setting the time forward and back an appropriate amount of time so that the > offset becomes 0, shutting the VM down and powering it back on again.

3 2

[libvirt] [PATCH 00/11] enforce comma style
by Eric Blake 20 Nov '13

20 Nov '13

This series was started in part by the current attempts to split out libvirt-python (and consistently using LIBVIR_CHECK_VERSION), and in part by seeing odd spacing in storage_conf.c (which annoyed me enough on my work on gluster). Eric Blake (11): maint: fix comma style issues: nwfilter maint: fix comma style issues: conf maint: fix comma style issues: xen maint: fix comma style issues: qemu maint: fix comma style issues: tests, tools maint: fix comma style issues: util maint: fix comma style issues: python maint: fix comma style issues: vbox maint: fix comma style issues: remaining drivers maint: fix comma style issues: remaining code maint: enforce comma style usage HACKING | 25 ++++++++ build-aux/bracket-spacing.pl | 15 +++-- docs/hacking.html.in | 31 ++++++++++ python/libvirt-override.c | 12 ++-- src/conf/capabilities.c | 2 +- src/conf/domain_conf.c | 4 +- src/conf/network_conf.c | 6 +- src/conf/nwfilter_conf.c | 92 +++++++++++++++-------------- src/conf/storage_conf.c | 97 ++++++++++++++++--------------- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_container.c | 2 +- src/network/bridge_driver.c | 2 +- src/node_device/node_device_hal.c | 4 +- src/node_device/node_device_udev.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 40 ++++++------- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_driver.c | 4 +- src/openvz/openvz_util.c | 3 +- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_monitor.c | 12 ++-- src/remote/remote_driver.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- src/test/test_driver.c | 12 ++-- src/util/vircommand.c | 4 +- src/util/virlog.c | 2 +- src/util/virnetdevbandwidth.c | 4 +- src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevvportprofile.c | 2 +- src/util/virnetlink.c | 2 +- src/util/virpci.c | 3 +- src/util/virsysinfo.c | 2 +- src/util/virusb.c | 2 +- src/vbox/vbox_tmpl.c | 27 ++++----- src/xen/xend_internal.c | 2 +- src/xen/xs_internal.c | 4 +- src/xenapi/xenapi_driver.c | 10 ++-- src/xenapi/xenapi_utils.c | 30 +++++----- src/xenxs/xen_sxpr.c | 2 +- src/xenxs/xen_xm.c | 2 +- tests/sysinfotest.c | 3 +- tests/viratomictest.c | 4 +- tests/vircgroupmock.c | 2 +- tools/virsh-domain.c | 2 +- tools/virsh-volume.c | 9 +-- 48 files changed, 290 insertions(+), 216 deletions(-) -- 1.8.3.1

2 23

[libvirt] [PATCH] python: Move examples to python/ for repo breakout
by Doug Goldstein 20 Nov '13

20 Nov '13

In anticipation of the python bindings moving to their own repo and in an effort to preserve history, move the examples within the python/ directory. --- Makefile.am | 3 +-- configure.ac | 2 +- {examples/python => python/examples}/Makefile.am | 1 + {examples/python => python/examples}/README | 0 {examples/python => python/examples}/consolecallback.py | 0 {examples/python => python/examples}/dominfo.py | 0 {examples/python => python/examples}/domrestore.py | 0 {examples/python => python/examples}/domsave.py | 0 {examples/python => python/examples}/domstart.py | 0 {examples/python => python/examples}/esxlist.py | 0 .../domain-events/events-python => python/examples}/event-test.py | 0 {examples/python => python/examples}/topology.py | 0 12 files changed, 3 insertions(+), 3 deletions(-) rename {examples/python => python/examples}/Makefile.am (97%) rename {examples/python => python/examples}/README (100%) rename {examples/python => python/examples}/consolecallback.py (100%) rename {examples/python => python/examples}/dominfo.py (100%) rename {examples/python => python/examples}/domrestore.py (100%) rename {examples/python => python/examples}/domsave.py (100%) rename {examples/python => python/examples}/domstart.py (100%) rename {examples/python => python/examples}/esxlist.py (100%) rename {examples/domain-events/events-python => python/examples}/event-test.py (100%) rename {examples/python => python/examples}/topology.py (100%) diff --git a/Makefile.am b/Makefile.am index 192a378..b84507d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ GENHTML = genhtml SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ python tests po examples/domain-events/events-c examples/hellolibvirt \ - examples/dominfo examples/domsuspend examples/python examples/apparmor \ + examples/dominfo examples/domsuspend python/examples examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap ACLOCAL_AMFLAGS = -I m4 @@ -40,7 +40,6 @@ EXTRA_DIST = \ Makefile.nonreentrant \ autogen.sh \ cfg.mk \ - examples/domain-events/events-python \ run.in \ AUTHORS.in \ $(XML_EXAMPLES) diff --git a/configure.ac b/configure.ac index 6003871..05a0394 100644 --- a/configure.ac +++ b/configure.ac @@ -2614,6 +2614,7 @@ AC_CONFIG_FILES([\ po/Makefile.in \ include/libvirt/Makefile include/libvirt/libvirt.h \ python/Makefile \ + python/examples/Makefile \ daemon/Makefile \ tools/Makefile \ tests/Makefile \ @@ -2622,7 +2623,6 @@ AC_CONFIG_FILES([\ examples/domsuspend/Makefile \ examples/dominfo/Makefile \ examples/openauth/Makefile \ - examples/python/Makefile \ examples/hellolibvirt/Makefile \ examples/systemtap/Makefile \ examples/xml/nwfilter/Makefile]) diff --git a/examples/python/Makefile.am b/python/examples/Makefile.am similarity index 97% rename from examples/python/Makefile.am rename to python/examples/Makefile.am index 7823c20..0e197d0 100644 --- a/examples/python/Makefile.am +++ b/python/examples/Makefile.am @@ -18,4 +18,5 @@ EXTRA_DIST= \ README \ consolecallback.py \ topology.py \ + event-test.py \ dominfo.py domrestore.py domsave.py domstart.py esxlist.py diff --git a/examples/python/README b/python/examples/README similarity index 100% rename from examples/python/README rename to python/examples/README diff --git a/examples/python/consolecallback.py b/python/examples/consolecallback.py similarity index 100% rename from examples/python/consolecallback.py rename to python/examples/consolecallback.py diff --git a/examples/python/dominfo.py b/python/examples/dominfo.py similarity index 100% rename from examples/python/dominfo.py rename to python/examples/dominfo.py diff --git a/examples/python/domrestore.py b/python/examples/domrestore.py similarity index 100% rename from examples/python/domrestore.py rename to python/examples/domrestore.py diff --git a/examples/python/domsave.py b/python/examples/domsave.py similarity index 100% rename from examples/python/domsave.py rename to python/examples/domsave.py diff --git a/examples/python/domstart.py b/python/examples/domstart.py similarity index 100% rename from examples/python/domstart.py rename to python/examples/domstart.py diff --git a/examples/python/esxlist.py b/python/examples/esxlist.py similarity index 100% rename from examples/python/esxlist.py rename to python/examples/esxlist.py diff --git a/examples/domain-events/events-python/event-test.py b/python/examples/event-test.py similarity index 100% rename from examples/domain-events/events-python/event-test.py rename to python/examples/event-test.py diff --git a/examples/python/topology.py b/python/examples/topology.py similarity index 100% rename from examples/python/topology.py rename to python/examples/topology.py -- 1.8.3.2

1 0

[libvirt] [PATCH] python: add virConnectGetCPUModelNames to skip_impl
by Doug Goldstein 20 Nov '13

20 Nov '13

In commit de51dc9c9, we removed virConnectGetCPUModelNames from skip_impl but without this the module will always generate a symbol for libvirt_virConnectGetCPUModelNames which we don't always want. CC: Giuseppe Scrivano <gscrivan(a)redhat.com> --- I don't really understand the generator enough to know why this was removed but without this change the module will always generate the symbol. Maybe someone more knowledgable with the code can explain? I've CC'd the original author as well. --- python/generator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/generator.py b/python/generator.py index 87ecf5a..99bf965 100755 --- a/python/generator.py +++ b/python/generator.py @@ -450,6 +450,7 @@ skip_impl = ( 'virNodeGetCPUMap', 'virDomainMigrate3', 'virDomainMigrateToURI3', + 'virConnectGetCPUModelNames', ) lxc_skip_impl = ( -- 1.8.3.2

2 2

[libvirt] [PATCH] libvirt-guests: Run only after libvirtd (bug 906009)
by Cole Robinson 20 Nov '13

20 Nov '13

Possible fix for occasional libvirt-guests failure at boot time. --- tools/libvirt-guests.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index d41bf2b..8153418 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=syslog.target network.target libvirtd.service [Service] EnvironmentFile=-/etc/sysconfig/libvirt-guests -- 1.8.4.2

2 3

[libvirt] [PATCH] spec: fix libvirt-docs subpackage on RHEL
by Michael Chapman 20 Nov '13

20 Nov '13

RHEL's rpmbuild wipes the docdir for a (sub-)package if any %doc directives are present, prior to copying in the marked documentation. This means we can't prepopulate this directory with the HTML documentation during the %install phase. Instead, move the HTML documentation to a temporary directory during %install and mark the contents of this temporary directory with %doc. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- libvirt.spec.in | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 72815f4..a5b01df 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1491,8 +1491,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %endif -mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \ - $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} +# Copied into libvirt-docs subpackage eventually +mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} libvirt-docs %if %{with_dtrace} %ifarch %{power64} s390x x86_64 ia64 alpha sparc64 @@ -1732,12 +1732,7 @@ fi %files docs %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README TODO - -# Website -%dir %{_datadir}/doc/libvirt-docs-%{version} -%dir %{_datadir}/doc/libvirt-docs-%{version}/html -%{_datadir}/doc/libvirt-docs-%{version}/html/* +%doc AUTHORS ChangeLog.gz NEWS README TODO libvirt-docs/* # API docs %dir %{_datadir}/gtk-doc/html/libvirt/ -- 1.8.4.2

2 5

[libvirt] [PATCH 0/2] Test JSON parsing with invalid input
by Ján Tomko 20 Nov '13

20 Nov '13

Ján Tomko (2): Test if JSON parser fails on invalid input Error out on unterminated arrays and objects in JSON parser src/util/virjson.c | 9 ++++++++- tests/jsontest.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) -- 1.8.1.5

2 5

[libvirt] [PATCH] Remove redundant braces
by Ján Tomko 20 Nov '13

20 Nov '13

--- Pushed as trivial. src/util/virjson.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index f0a06ab..7044e11 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1018,9 +1018,8 @@ cleanup: if (parser.nstate) { size_t i; - for (i = 0; i < parser.nstate; i++) { + for (i = 0; i < parser.nstate; i++) VIR_FREE(parser.state[i].key); - } VIR_FREE(parser.state); } -- 1.8.3.2

1 0

[libvirt] [PATCH] vbox: fix segfault on virsh dumpxml with the existence of USB filters
by Ryota Ozaki 20 Nov '13

20 Nov '13

A USB filter is stored in a hostdev. The original code doesn't allocate hostdev->info that is expected to be allocated with hostdev. So use virDomainHostdevDefAlloc() to allocate both as we expect. Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> --- src/vbox/vbox_tmpl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 3807a6d..f4cd5cf 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -3333,7 +3333,8 @@ sharedFoldersCleanup: deviceFilter->vtbl->GetActive(deviceFilter, &active); if (active) { - if (VIR_ALLOC(def->hostdevs[USBFilterCount]) >= 0) { + def->hostdevs[USBFilterCount] = virDomainHostdevDefAlloc(); + if (def->hostdevs[USBFilterCount]) { PRUnichar *vendorIdUtf16 = NULL; char *vendorIdUtf8 = NULL; unsigned vendorId = 0; -- 1.8.4

2 2

[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