- Devel - libvirt List Archives

[libvirt] [RFC] Version numbers outside of releases
by Andrea Bolognani 01 Jun '17

01 Jun '17

Our current practice when it comes to bumping the version number for libvirt is to do so immediately after a release, eg. right after 3.4.0 is released later today someone will push a commit that changes configure.ac to use 3.5.0 instead. As a consequence, builds made from master will always carry the release number of the *upcoming* release, so from a versioning point of view there is no way to tell eg. 3.4.0-rc2 or even the final 3.4.0 release apart from a random build made at a random time from master during 3.4.0's development cycle. In particular, when creating RPMs from a git clone, you'll end up having to use either 'dnf install' or 'dnf reinstall' depending on whether or not you already installed any build during the current development cycle. I suggest we change our habits slightly: * right after X.Y.0 has been released, bump the version number to X.Y.90; * bump the version number to X.Y.91 for rc1, X.Y.92 for rc2 and so on; * only bump the version number to X.Y+1.0 as the release is being prepared, then go back to the first step and move on with development. This would make sure each step in the development cycle gets its own version number, and as a pleasant side effect you'll always be able to install newer builds using 'dnf install'. Comments welcome! :) -- Andrea Bolognani / Red Hat / Virtualization

3 4

[libvirt] [PATCH] qemu: Fix serial stub console allocation
by Erik Skultety 01 Jun '17

01 Jun '17

When adding the aliased serial stub console, the structure wasn't properly allocated (VIR_ALLOC instead of virDomainChrDefNew) which then resulted in SIGSEGV in virDomainChrSourceIsEqual during a serial device coldplug. https://bugzilla.redhat.com/show_bug.cgi?id=1434278 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_hotplug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4a7d99725..34ddb95f8 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1810,7 +1810,7 @@ qemuDomainChrPreInsert(virDomainDefPtr vmdef, if (!vmdef->consoles && VIR_ALLOC(vmdef->consoles) < 0) return -1; - if (VIR_ALLOC(vmdef->consoles[0]) < 0) { + if (!(vmdef->consoles[0] = virDomainChrDefNew(NULL))) { VIR_FREE(vmdef->consoles); return -1; } @@ -1841,7 +1841,7 @@ qemuDomainChrInsertPreAllocCleanup(virDomainDefPtr vmdef, /* Remove the stub console added by qemuDomainChrPreInsert */ if (vmdef->nserials == 0 && vmdef->nconsoles == 1 && chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) { - VIR_FREE(vmdef->consoles[0]); + virDomainChrDefFree(vmdef->consoles[0]); VIR_FREE(vmdef->consoles); vmdef->nconsoles = 0; } -- 2.13.0

2 2

[libvirt] [PATCH] Fix closing XML element in news file
by Daniel P. Berrange 01 Jun '17

01 Jun '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a trivial build fix docs/news.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index 6ff01ca..e95fe72 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -108,7 +108,7 @@ <description> Endpoint devices support new <code>mdev</code> capability and their parents now report the supported types in new - <code>mdev_types</mdev> capability. + <code>mdev_types</code> capability. </description> </change> <change> -- 2.9.3

1 0

[libvirt] [PATCH v3 0/2] Check for <memoryBacking/>
by Michal Privoznik 01 Jun '17

01 Jun '17

v3 of: https://www.redhat.com/archives/libvir-list/2017-May/msg00939.html diff to v2: - moved xmlopt argument further the argument list in virDomainSnapshotRedefinePrep - drop couple of checks in qemuDomainABIStabilityCheck Patch 1/2 has been ACKed. But just conditionally. So I'm sending it again to see if I haven't missed anything. Michal Privoznik (2): virDomainXMLOption: Introduce virDomainABIStabilityDomain virQEMUDriverDomainABIStability: Check for memoryBacking src/conf/domain_conf.c | 19 ++++++++++++++++--- src/conf/domain_conf.h | 16 ++++++++++++++-- src/conf/snapshot_conf.c | 3 ++- src/conf/snapshot_conf.h | 1 + src/libvirt_private.syms | 2 ++ src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 4 +++- src/lxc/lxc_conf.c | 3 ++- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_conf.c | 3 ++- src/qemu/qemu_domain.c | 23 +++++++++++++++++++++++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 5 +++-- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 6 ++++-- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- tests/bhyveargv2xmltest.c | 3 ++- tests/qemuargv2xmltest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/sexpr2xmltest.c | 2 +- tests/testutils.c | 4 ++-- tests/vmx2xmltest.c | 2 +- tests/xlconfigtest.c | 2 +- tests/xmconfigtest.c | 2 +- tests/xml2sexprtest.c | 2 +- tests/xml2vmxtest.c | 2 +- 34 files changed, 97 insertions(+), 36 deletions(-) -- 2.13.0

3 5

[libvirt] [PATCH] Add some news items for the 3.4.0 release
by Martin Kletzander 01 Jun '17

01 Jun '17

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- I could not be bothered to split the patches. Also, please review whatever you know about as this is just a compilation of stuff from the git log. docs/news.xml | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 165 insertions(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index 649350a904d3..d34e8beae4c0 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -45,6 +45,38 @@ sparseness. </description> </change> + <change> + <summary> + I/O APIC type can be specified for QEMU/KVM domains + </summary> + <description> + The <code>ioapic</code> tag was added to domain + <code>features</code>, so the type of the I/O APIC can now + be specified (e.g. putting it in userspace for KVM domains). + </description> + </change> + <change> + <summary> + Repository now has new README.md file + </summary> + <description> + The new file uses markdown syntax, so it looks better on + github and possibly other web pages, but it has also more + useful information. The old README is now symlink to the + new file. + </description> + </change> + <change> + <summary> + The reason for VM shutdown is reported, if known + </summary> + <description> + QEMU 2.10 will be able to report the reason for shutting + down (whether that was caused by the guest or not), and + libvirt is prepared for that and reports that information in + its shutdown event as well, if it is known. + </description> + </change> </section> <section title="Improvements"> <change> @@ -67,10 +99,142 @@ is for CCW devices, most common on the S390 architecture. The second is for fibre channel-backed SCSI devices and exposes the fc_remote_port sub-capability to SCSI target devices. - </description> + </description> + </change> + <change> + <summary> + Node devices now report Mediated device capabilities + </summary> + <description> + Endpoint devices support new <code>mdev</code> capability + and their parents now report the supported types in new + <code>mdev_types</mdev> capability. + </description> + </change> + <change> + <summary> + Capabilities now report information about host caches + </summary> + <description> + If supported in the kernel, host capabilities will now list + L3 caches. The code for other levels was added as well, but + only L3 caches are reported currently. + </description> + </change> + <change> + <summary> + POWER9 CPU model was added + </summary> + <description> + It is now properly reported in host capabilities. + </description> + </change> + <change> + <summary> + libxl: NUMA sibling distances are now reported in host capabilities + </summary> + </change> + <change> + <summary> + Support for VMDK files with version 3 + </summary> + <description> + VMDK version 3 files are now properly detected. + </description> + </change> + <change> + <summary> + Interrupt remapping and Extended interrupt mode for IOMMU devices + </summary> + <description> + These two new features can now be controlled with new + <code><driver intremap='on/off' eim='on/off'/></code> + tag for <code>iommu</code> devices. + </description> + </change> + <change> + <summary> + Graphics in libxl domains now have default addresses + </summary> + <description> + Even though there were default addresses before this change, + they were not saved in the XML. It is now possible to see + and control the listen addresses properly. + </description> + </change> + <change> + <summary> + Default USB controllers are now added for devices in libxl domains + </summary> + <description> + Even though they were added automatically when USB device + was attached, they could've been missing in some other + cases. The logic is now fixed so there are always USB + controllers, even if there was none of them in the specified + XML. + </description> + </change> + <change> + <summary> + Limits for RPC messages were increased + </summary> + <description> + Hitting the RPC limits we have is easier every day, so they + were increased once again and some guessing logic was + improved as well. It is now possible to get more stats than + ever using the <code>virConnectGetAllDomainStats()</code> + call and push through even bigger requests and replies for + all APIs. + </description> </change> </section> <section title="Bug fixes"> + <change> + <summary> + PCIe 4.0 cards now report proper link speeds + </summary> + <description> + It could happen that the link speed for PCIe devices was not + properly reported or the nodedev-dumpxml just failed. That + was due to mistake in the field width, but should now work + properly. + </description> + </change> + <change> + <summary> + qemu: Do not report errors on shutdown + </summary> + <description> + For some users, in some rare cases, it could happen that + there was an error message "internal error: End of file from + qemu monitor" in the logs even though no problem happened. + The detection of these false positives was improved and such + errors should not show any more. + </description> + </change> + <change> + <summary> + User-specified UNIX socket paths for virtio channels should not be reset + </summary> + <description> + It could happen, in some cases, that libvirt would mistake a + user-specified path for its own generated one and thus + remove it from the XML. The detection of such addresses was + improved now. + </description> + </change> + <change> + <summary> + Fix address reservation during RNG hot-plug + </summary> + <description> + When error occurred in a specific point in time during the + hot-plug of an RNG device, it could happen that an address + was released even though another device was already using + it, making it possible to hot-plug another device with that + address, effectively having duplicated addresses in the XML. + </description> + </change> </section> </release> <release version="v3.3.0" date="2017-05-05"> -- 2.13.0

3 6

[libvirt] [PATCH go-xml] Add support for device sound
by zhenwei.pi 01 Jun '17

01 Jun '17

--- domain.go | 11 +++++++++++ domain_test.go | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/domain.go b/domain.go index de47c07..bf0b851 100644 --- a/domain.go +++ b/domain.go @@ -283,6 +283,16 @@ type DomainMemBalloon struct { Address *DomainAddress `xml:"address"` } +type DomainSoundCodec struct { + Type string `xml:"type,attr"` +} + +type DomainSound struct { + Model string `xml:"model,attr"` + Codec *DomainSoundCodec `xml:"codec"` + Address *DomainAddress `xml:"address"` +} + type DomainDeviceList struct { Controllers []DomainController `xml:"controller"` Disks []DomainDisk `xml:"disk"` @@ -295,6 +305,7 @@ type DomainDeviceList struct { Videos []DomainVideo `xml:"video"` Channels []DomainChardev `xml:"channel"` MemBalloon *DomainMemBalloon `xml:"memballoon"` + Sounds []DomainSound `xml:"sound"` } type DomainMemory struct { diff --git a/domain_test.go b/domain_test.go index 2c7173b..7990627 100644 --- a/domain_test.go +++ b/domain_test.go @@ -45,6 +45,7 @@ var ifaceAddr = Address{0, 0, 4, 0} var videoAddr = Address{0, 0, 5, 0} var fsAddr = Address{0, 0, 6, 0} var balloonAddr = Address{0, 0, 7, 0} +var duplexAddr = Address{0, 0, 8, 0} var serialPort uint = 0 @@ -276,6 +277,21 @@ var domainTestData = []struct { }, }, }, + Sounds: []DomainSound{ + DomainSound{ + Model: "ich6", + Codec: &DomainSoundCodec{ + Type: "duplex", + }, + Address: &DomainAddress{ + Type: "pci", + Domain: &duplexAddr.Domain, + Bus: &duplexAddr.Bus, + Slot: &duplexAddr.Slot, + Function: &duplexAddr.Function, + }, + }, + }, }, }, Expected: []string{ @@ -295,6 +311,10 @@ var domainTestData = []struct { ` <memballoon model="virtio">`, ` <address type="pci" domain="0" bus="0" slot="7" function="0"></address>`, ` </memballoon>`, + ` <sound model="ich6">`, + ` <codec type="duplex"></codec>`, + ` <address type="pci" domain="0" bus="0" slot="8" function="0"></address>`, + ` </sound>`, ` </devices>`, `</domain>`, }, -- 2.7.4

2 1

[libvirt] [PATCH V3] CI: also run tests using updated distro(s)
by claudioandre.br＠gmail.com 31 May '17

31 May '17

From: Claudio André <claudioandre.br(a)gmail.com> It is possible to test libvirt using other distros in Travis via Docker; including (but not limited to) Fedora and Ubuntu. --- https://travis-ci.org/claudioandre/libvirt/builds/237995646 .travis.yml | 19 ++++++------- tests/travis-ci.sh | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 10 deletions(-) create mode 100755 tests/travis-ci.sh diff --git a/.travis.yml b/.travis.yml index 5a3e765..e4d4888 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ sudo: false language: c dist: precise -compiler: - - gcc cache: ccache addons: apt: @@ -62,15 +60,14 @@ git: before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew install gnutls libgcrypt yajl gettext rpcgen ; fi -# the custom PATH is just to pick up OS-X homebrew & its harmless on Linux -before_script: - - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/rpcgen/bin:$PATH" ./autogen.sh script: - - VIR_TEST_DEBUG=1 make -j3 && make -j3 syntax-check && make -j3 check + - tests/travis-ci.sh # Environments here are run in addition to the main environment defined above matrix: include: + - compiler: gcc + dist: precise - compiler: clang dist: precise - compiler: clang @@ -79,10 +76,12 @@ matrix: dist: trusty - compiler: clang os: osx - script: - # many unit tests fail & so does syntax-check, so skip for now - # one day we must fix it though.... - - make -j3 + - services: docker + env: IMAGE=ubuntu:17.04 CC=gcc + dist: trusty + - services: docker + env: IMAGE=ubuntu:17.04 CC=clang + dist: trusty after_failure: - echo '============================================================================' diff --git a/tests/travis-ci.sh b/tests/travis-ci.sh new file mode 100755 index 0000000..e63d509 --- /dev/null +++ b/tests/travis-ci.sh @@ -0,0 +1,80 @@ +#!/bin/bash -e + +function do_Install_Dependencies(){ + echo + echo '-- Installing Dependencies --' + + if [[ $DISTRO = "ubuntu:17.04" ]]; then + apt-get update -qq + apt-get -y -qq install \ + build-essential git clang autoconf libtool libcmpicppimpl0 gettext \ + xsltproc autopoint libxml2-dev libncurses5-dev libreadline-dev \ + zlib1g-dev libgnutls28-dev libgcrypt11-dev libavahi-client-dev libsasl2-dev \ + libxen-dev lvm2 libgcrypt11-dev libparted0-dev libdevmapper-dev uuid-dev \ + libudev-dev libpciaccess-dev libcap-ng-dev libnl-3-dev libnl-route-3-dev \ + libyajl-dev libpcap0.8-dev libnuma-dev libnetcf-dev libaudit-dev \ + libxml2-utils libapparmor-dev dnsmasq-base librbd-dev w3c-markup-validator kmod > /dev/null + else + echo "Please, change 'tests/travis-ci.sh' to add the needed dependencies for $DISTRO." + exit 1 + fi +} + + +function do_Show_Info(){ + echo + echo '-- Environment --' + echo "Running on Docker: $DISTRO" + id + uname -a + + if [[ -n $CC ]]; then + echo + echo '-- Compiler in use --' + "$CC" --version + fi + + echo -en 'travis_fold:start:printenv\r' + echo '-- Environment Variables --' + printenv + echo -en 'travis_fold:end:printenv\r' +} + + +# ----------- Build and Test libvirt ----------- + +if [[ -n $IMAGE ]]; then + # Run docker using the selected image; then build and test + docker run --privileged --cap-add=ALL -v /lib/modules:/lib/modules \ + -v "$(pwd)":/cwd -e CC=$CC -e DISTRO=$IMAGE "$IMAGE" sh -e -c " \ + cd /cwd; \ + tests/travis-ci.sh" + exit $? +fi + +if [[ -n $DISTRO ]]; then + do_Install_Dependencies + do_Show_Info +fi + +# Build and test +if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then + echo -en 'travis_fold:start:autogen\r' + echo '-- Running ./autogen.sh --' + # The custom PATH is just to pick up OS-X homebrew + PATH="/usr/local/opt/gettext/bin:/usr/local/opt/rpcgen/bin:$PATH" ./autogen.sh + echo -en 'travis_fold:end:autogen\r' + + # many unit tests fail & so does syntax-check, so skip for now + # one day we must fix it though.... + make -j3 +else + echo -en 'travis_fold:start:autogen\r' + echo '-- Running ./autogen.sh --' + ./autogen.sh + echo -en 'travis_fold:end:autogen\r' + + VIR_TEST_DEBUG=1 make -j3 && make -j3 syntax-check && make -j3 check +fi + +exit $? -- 2.11.0

1 0

[libvirt] [PATCH V2] CI: also run tests using updated distro(s)
by claudioandre.br＠gmail.com 31 May '17

31 May '17

From: Claudio André <claudioandre.br(a)gmail.com> It is possible to test libvirt using other distros in Travis via Docker; including (but not limited to) Fedora and Ubuntu. --- See it in action at https://travis-ci.org/claudioandre/libvirt/builds/237687907 .travis.yml | 23 ++++++++++-------- tests/travis-ci.sh | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 10 deletions(-) create mode 100755 tests/travis-ci.sh diff --git a/.travis.yml b/.travis.yml index 5a3e765..3ed2093 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ sudo: false language: c dist: precise -compiler: - - gcc cache: ccache addons: apt: @@ -62,15 +60,14 @@ git: before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew install gnutls libgcrypt yajl gettext rpcgen ; fi -# the custom PATH is just to pick up OS-X homebrew & its harmless on Linux -before_script: - - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/rpcgen/bin:$PATH" ./autogen.sh script: - - VIR_TEST_DEBUG=1 make -j3 && make -j3 syntax-check && make -j3 check + - tests/travis-ci.sh # Environments here are run in addition to the main environment defined above matrix: include: + - compiler: gcc + dist: precise - compiler: clang dist: precise - compiler: clang @@ -79,10 +76,16 @@ matrix: dist: trusty - compiler: clang os: osx - script: - # many unit tests fail & so does syntax-check, so skip for now - # one day we must fix it though.... - - make -j3 + - services: docker + env: IMAGE=ubuntu:17.04 CCO=gcc + dist: trusty + - services: docker + env: IMAGE=ubuntu:17.04 CCO=clang + dist: trusty + + allow_failures: + - env: IMAGE=ubuntu:17.04 CCO=gcc + - env: IMAGE=ubuntu:17.04 CCO=clang after_failure: - echo '============================================================================' diff --git a/tests/travis-ci.sh b/tests/travis-ci.sh new file mode 100755 index 0000000..07ec85d --- /dev/null +++ b/tests/travis-ci.sh @@ -0,0 +1,70 @@ +#!/bin/bash -e + +function do_Install_Dependencies(){ + echo + echo '-- Installing Dependencies --' + + apt-get update -qq + apt-get -y -qq install \ + build-essential git clang autoconf libtool libcmpicppimpl0 gettext \ + xsltproc autopoint libxml2-dev libncurses5-dev libreadline-dev \ + zlib1g-dev libgnutls28-dev libgcrypt11-dev libavahi-client-dev libsasl2-dev \ + libxen-dev lvm2 libgcrypt11-dev libparted0-dev libdevmapper-dev uuid-dev \ + libudev-dev libpciaccess-dev libcap-ng-dev libnl-3-dev libnl-route-3-dev \ + libyajl-dev libpcap0.8-dev libnuma-dev libnetcf-dev libaudit-dev \ + libxml2-utils libapparmor-dev dnsmasq-base librbd-dev w3c-markup-validator kmod > /dev/null +} + + +function do_Show_Info(){ + echo + echo '-- Environment --' + echo "Running on Docker: $DISTRO" + id + uname -a +} + + +function do_Show_Compiler(){ + + if [[ -n $CC ]]; then + echo + echo '-- Compiler in use --' + "$CC" --version + fi +} + + +# ----------- Build and Test libvirt ----------- + +if [[ -n $IMAGE ]]; then + # Run docker using the selected image; then build and test + docker run --privileged --cap-add=ALL -v /lib/modules:/lib/modules \ + -v "$(pwd)":/cwd -e CC=$CCO -e DISTRO=$IMAGE "$IMAGE" sh -e -c " \ + cd /cwd; \ + tests/travis-ci.sh" + exit $? +fi + +if [[ -n $DISTRO ]]; then + do_Show_Info + do_Install_Dependencies + do_Show_Compiler +fi + +echo -en 'travis_fold:start:autogen\r' + echo '-- Running ./autogen.sh --' + # The custom PATH is just to pick up OS-X homebrew & its harmless on Linux + PATH="/usr/local/opt/gettext/bin:/usr/local/opt/rpcgen/bin:$PATH" ./autogen.sh +echo -en 'travis_fold:end:autogen\r' + +# Build and test +if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then + # many unit tests fail & so does syntax-check, so skip for now + # one day we must fix it though.... + make -j3 +else + VIR_TEST_DEBUG=1 make -j3 && make -j3 syntax-check && make -j3 check +fi + +exit $? -- 2.11.0

3 2

[libvirt] [PATCH] virsh: add --domain option for domain-to-native
by Daniel Liu 31 May '17

31 May '17

Fix bug 835476[1]. virsh: add [--domain DOMAIN] option to domxml-to-native DOMAIN COMMAND Add support for the following syntax: domxml-to-native <format> { [--domain DOMAIN] | [XML] }, i.e., it supports either designating domain (domain id, uuid, or name), or path to XML domain configuration file. E.g.: virsh domxml-to-native qemu-argv --domain RHEL7.3 # domain name virsh domxml-to-native qemu-argv --domain 10 # domain id virsh domxml-to-native qemu-argv dumped_dom.xml # dumped xml [1] https://bugzilla.redhat.com/show_bug.cgi?id=835476 --- tools/virsh-domain.c | 54 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0d19d0e01..a79fd3ab2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9840,9 +9840,13 @@ static const vshCmdOptDef opts_domxmltonative[] = { .flags = VSH_OFLAG_REQ, .help = N_("target config data type format") }, + {.name = "domain", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ_OPT, + .help = N_("domain name, id or uuid") + }, {.name = "xml", .type = VSH_OT_DATA, - .flags = VSH_OFLAG_REQ, .help = N_("xml data file to export from") }, {.name = NULL} @@ -9851,30 +9855,60 @@ static const vshCmdOptDef opts_domxmltonative[] = { static bool cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) { - bool ret = true; + bool ret = false; const char *format = NULL; - const char *xmlFile = NULL; - char *configData; - char *xmlData; + const char *domain = NULL; + const char *xml = NULL; + char *xmlData = NULL; + char *configData = NULL; unsigned int flags = 0; virshControlPtr priv = ctl->privData; + virDomainPtr dom = NULL; - if (vshCommandOptStringReq(ctl, cmd, "format", &format) < 0 || - vshCommandOptStringReq(ctl, cmd, "xml", &xmlFile) < 0) + if (vshCommandOptStringReq(ctl, cmd, "format", &format) < 0) + return false; + + if (vshCommandOptStringReq(ctl, cmd, "domain", &domain) < 0) + return false; + + if (vshCommandOptStringReq(ctl, cmd, "xml", &xml) < 0) return false; - if (virFileReadAll(xmlFile, VSH_MAX_XML_FILE, &xmlData) < 0) + VSH_EXCLUSIVE_OPTIONS_VAR(domain, xml); + + if (domain) + dom = virshCommandOptDomain(ctl, cmd, &domain); + + if (!dom && !xml) { + vshError(ctl, _("need either domain (ID, UUID, or name) or domain XML configuration file path")); return false; + } + + if (dom) { + xmlData = virDomainGetXMLDesc(dom, flags); + if (xmlData == NULL) + goto cleanup; + } + + if (xml) { + if (virFileReadAll(xml, VSH_MAX_XML_FILE, &xmlData) < 0) + goto cleanup; + } configData = virConnectDomainXMLToNative(priv->conn, format, xmlData, flags); if (configData != NULL) { vshPrint(ctl, "%s", configData); - VIR_FREE(configData); + ret = true; + goto cleanup; } else { - ret = false; + vshError(ctl, _("convert from domain XML to native command failed")); + goto cleanup; } + cleanup: + virshDomainFree(dom); VIR_FREE(xmlData); + VIR_FREE(configData); return ret; } -- 2.13.0

4 6

[libvirt] [PATCH v3] virsh: add [--domain DOMAIN] option to domxml-to-native DOMAIN COMMAND
by Daniel Liu 31 May '17

31 May '17

The option allows someone to run domain-to-native on already existing domain without the need of supplying their XML. It is basically wrapper around 'virsh dumpxml | virsh domxml-to-native /dev/stdin'. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=835476 --- tools/virsh-domain.c | 53 +++++++++++++++++++++++++++++++++++++++------------- tools/virsh.pod | 7 ++++--- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ccb514ef9..db92c4478 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9848,9 +9848,13 @@ static const vshCmdOptDef opts_domxmltonative[] = { .flags = VSH_OFLAG_REQ, .help = N_("target config data type format") }, + {.name = "domain", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ_OPT, + .help = N_("domain name, id or uuid") + }, {.name = "xml", .type = VSH_OT_DATA, - .flags = VSH_OFLAG_REQ, .help = N_("xml data file to export from") }, {.name = NULL} @@ -9859,30 +9863,53 @@ static const vshCmdOptDef opts_domxmltonative[] = { static bool cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) { - bool ret = true; + bool ret = false; const char *format = NULL; - const char *xmlFile = NULL; - char *configData; - char *xmlData; + const char *xml = NULL; + char *xmlData = NULL; + char *configData = NULL; unsigned int flags = 0; virshControlPtr priv = ctl->privData; + virDomainPtr dom = NULL; if (vshCommandOptStringReq(ctl, cmd, "format", &format) < 0 || - vshCommandOptStringReq(ctl, cmd, "xml", &xmlFile) < 0) + vshCommandOptStringReq(ctl, cmd, "xml", &xml) < 0) return false; - if (virFileReadAll(xmlFile, VSH_MAX_XML_FILE, &xmlData) < 0) - return false; + VSH_EXCLUSIVE_OPTIONS("domain", "xml"); - configData = virConnectDomainXMLToNative(priv->conn, format, xmlData, flags); - if (configData != NULL) { - vshPrint(ctl, "%s", configData); - VIR_FREE(configData); + if (vshCommandOptBool(cmd, "domain") && + (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))) + return false; + + if (dom) { + xmlData = virDomainGetXMLDesc(dom, flags); + } else if (xml) { + if (virFileReadAll(xml, VSH_MAX_XML_FILE, &xmlData) < 0) + goto cleanup; } else { - ret = false; + vshError(ctl, "%s", _("need either domain or domain XML")); + goto cleanup; + } + + if (!xmlData) { + vshError(ctl, "%s", _("failed to retrieve XML")); + goto cleanup; + } + + if (!(configData = virConnectDomainXMLToNative(priv->conn, format, xmlData, flags))) { + vshError(ctl, "%s", + _("convert from domain XML to native command failed")); + goto cleanup; + } else { + vshPrint(ctl, "%s", configData); + ret = true; } + cleanup: + virshDomainFree(dom); VIR_FREE(xmlData); + VIR_FREE(configData); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index aee964689..049c2f3c7 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1433,10 +1433,11 @@ the I<format> argument must be B<qemu-argv>. For Xen hypervisor, the I<format> argument may be B<xen-xm>, B<xen-xl>, or B<xen-sxpr>. For LXC hypervisor, the I<format> argument must be B<lxc-tools>. -=item B<domxml-to-native> I<format> I<xml> +=item B<domxml-to-native> I<format> +{ I<--domain> I<domain-name-or-id-or-uuid> | [I<--xml>] I<xml> } -Convert the file I<xml> in domain XML format to the native guest -configuration format named by I<format>. For QEMU/KVM hypervisor, +Convert the file I<xml> in domain XML format or existing domain to the +native guest configuration format named by I<format>. For QEMU/KVM hypervisor, the I<format> argument must be B<qemu-argv>. For Xen hypervisor, the I<format> argument may be B<xen-xm>, B<xen-xl>, or B<xen-sxpr>. For LXC hypervisor, the I<format> argument must be B<lxc-tools>. -- 2.13.0

1 0