- Devel - libvirt List Archives

[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 23 Nov '13

23 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 23 Nov '13

23 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 23 Nov '13

23 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