- Devel - libvirt List Archives

[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

[libvirt] [PATCH] 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. --- Notes: * see it working at: https://travis-ci.org/claudioandre/libvirt/builds/237015534 * now, I introduced an error: https://travis-ci.org/claudioandre/libvirt/builds/237018298 * I'm using Ubuntu 17.04 because I need to pick something. Could be Xenial and/or Fedora and/or ...; * One test is failing in Ubuntu 17.04 in Travis. The error log says: ----- TEST: virkmodtest Failed to get config !... 4 FAIL FAIL virkmodtest (exit status: 1) ----- * Since it is failing, I used the 'allow_failures'. .travis.yml | 19 +++++++++------- tests/travis-ci.sh | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 8 deletions(-) create mode 100755 tests/travis-ci.sh diff --git a/.travis.yml b/.travis.yml index 5a3e765..7b73761 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,11 +62,8 @@ 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: @@ -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..d115564 --- /dev/null +++ b/tests/travis-ci.sh @@ -0,0 +1,64 @@ +#!/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 +} + + +function do_Show_Info(){ + echo + echo '-- Environment --' + echo "Running on Docker: $DISTRO" +} + + +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 -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 + +# 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 + +# 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 4

[libvirt] [PATCH] qemu: mkdir memory_backing_dir on startup
by Michal Privoznik 31 May '17

31 May '17

In 48d9e6cdcc and friends we've allowed users to back guest memory by a file inside the host. And in order to keep things manageable the memory_backing_dir variable was introduced to qemu.conf to specify the directory where the files are kept. However, libvirt's policy is that directories are created on domain startup if they don't exist. We've missed this one. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 67f54282a..fcab7ddf8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -706,6 +706,11 @@ qemuStateInitialize(bool privileged, cfg->nvramDir); goto error; } + if (virFileMakePath(cfg->memoryBackingDir) < 0) { + virReportSystemError(errno, _("Failed to create memory backing dir %s"), + cfg->memoryBackingDir); + goto error; + } qemu_driver->qemuImgBinary = virFindFileInPath("qemu-img"); @@ -830,6 +835,13 @@ qemuStateInitialize(bool privileged, (int) cfg->group); goto error; } + if (chown(cfg->memoryBackingDir, cfg->user, cfg->group) < 0) { + virReportSystemError(errno, + _("unable to set ownership of '%s' to %d:%d"), + cfg->memoryBackingDir, (int) cfg->user, + (int) cfg->group); + goto error; + } run_uid = cfg->user; run_gid = cfg->group; -- 2.13.0

3 3

[libvirt] [PATCH v4 0/5] Hyperv-method invocation
by Sri Ramanujam 31 May '17

31 May '17

Changes from v3: * Feedback from code review * Added 5 minute timeout to hypervInvokeMethod Sri Ramanujam (5): hyperv: Functions to work with invocation parameters. hyperv: Generate object property type information. hyperv: add hypervInvokeMethod hyperv: support virDomainSendKey hyperv: Add support for virDomainSetMemory src/hyperv/hyperv_driver.c | 201 ++++++++ src/hyperv/hyperv_wmi.c | 894 ++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_wmi.h | 93 +++- src/hyperv/hyperv_wmi_classes.h | 19 + src/hyperv/hyperv_wmi_generator.input | 116 +++++ src/hyperv/hyperv_wmi_generator.py | 15 +- src/hyperv/openwsman.h | 4 + 7 files changed, 1340 insertions(+), 2 deletions(-) -- 2.9.4

2 11

[libvirt] [PATCH go-xml] Add support for Node Device with basic testing.
by Vladik Romanovsky 31 May '17

31 May '17

--- node_device.go | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++ node_device_test.go | 111 +++++++++++++++++++++ 2 files changed, 388 insertions(+) create mode 100644 node_device.go create mode 100644 node_device_test.go diff --git a/node_device.go b/node_device.go new file mode 100644 index 0000000..5375d32 --- /dev/null +++ b/node_device.go @@ -0,0 +1,277 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +import ( + "encoding/xml" + "fmt" +) + +type NodeDevice struct { + Name string `xml:"name"` + Path string `xml:"path,omitempty"` + Parent string `xml:"parent,omitempty"` + Driver string `xml:"driver>name,omitempty"` + Capability *CapabilityType `xml:"capability"` +} + +type CapabilityType struct { + Type interface{} `xml:"type,attr"` +} + +type IDName struct { + ID string `xml:"id,attr"` + Name string `xml:",chardata"` +} + +type PciExpress struct { + Links []PciExpressLink `xml:"link"` +} + +type PciExpressLink struct { + Validity string `xml:"validity,attr,omitempty"` + Speed float64 `xml:"speed,attr,omitempty"` + Port int `xml:"port,attr,omitempty"` + Width int `xml:"width,attr,omitempty"` +} + +type IOMMUGroupType struct { + Number int `xml:"number,attr"` +} + +type NUMA struct { + Node int `xml:"node,attr"` +} + +type PciCapabilityType struct { + Domain int `xml:"domain,omitempty"` + Bus int `xml:"bus,omitempty"` + Slot int `xml:"slot,omitempty"` + Function int `xml:"function,omitempty"` + Product IDName `xml:"product,omitempty"` + Vendor IDName `xml:"vendor,omitempty"` + IommuGroup IOMMUGroupType `xml:"iommuGroup,omitempty"` + Numa NUMA `xml:"numa,omitempty"` + PciExpress PciExpress `xml:"pci-express,omitempty"` + Capabilities []PciCapability `xml:"capability,omitempty"` +} + +type PCIAddress struct { + Domain string `xml:"domain,attr"` + Bus string `xml:"bus,attr"` + Slot string `xml:"slot,attr"` + Function string `xml:"function,attr"` +} + +type PciCapability struct { + Type string `xml:"type,attr"` + Address []PCIAddress `xml:"address,omitempty"` + MaxCount int `xml:"maxCount,attr,omitempty"` +} + +type SystemHardware struct { + Vendor string `xml:"vendor"` + Version string `xml:"version"` + Serial string `xml:"serial"` + UUID string `xml:"uuid"` +} + +type SystemFirmware struct { + Vendor string `xml:"vendor"` + Version string `xml:"version"` + ReleaseData string `xml:"release_date"` +} + +type SystemCapabilityType struct { + Product string `xml:"product"` + Hardware SystemHardware `xml:"hardware"` + Firmware SystemFirmware `xml:"firmware"` +} + +type USBDeviceCapabilityType struct { + Bus int `xml:"bus"` + Device int `xml:"device"` + Product IDName `xml:"product,omitempty"` + Vendor IDName `xml:"vendor,omitempty"` +} + +type USBCapabilityType struct { + Number int `xml:"number"` + Class int `xml:"class"` + Subclass int `xml:"subclass"` + Protocol int `xml:"protocol"` + Description string `xml:"description,omitempty"` +} + +type NetOffloadFeatures struct { + Name string `xml:"number"` +} + +type NetLink struct { + State string `xml:"state,attr"` + Speed string `xml:"speed,attr,omitempty"` +} + +type NetCapability struct { + Type string `xml:"type,attr"` +} + +type NetCapabilityType struct { + Interface string `xml:"interface"` + Address string `xml:"address"` + Link NetLink `xml:"link"` + Features []NetOffloadFeatures `xml:"feature,omitempty"` + Capability NetCapability `xml:"capability"` +} + +type SCSIVportsOPS struct { + Vports int `xml:"vports,omitempty"` + MaxVports int `xml:"maxvports,,omitempty"` +} + +type SCSIFCHost struct { + WWNN string `xml:"wwnn,omitempty"` + WWPN string `xml:"wwpn,omitempty"` + FabricWWN string `xml:"fabric_wwn,omitempty"` +} + +type SCSIHostCapability struct { + VportsOPS SCSIVportsOPS `xml:"vports_ops"` + FCHost SCSIFCHost `xml:"fc_host"` +} + +type SCSIHostCapabilityType struct { + Host int `xml:"host"` + UniqueID int `xml:"unique_id"` + Capability SCSIHostCapability `xml:"capability"` +} + +type SCSICapabilityType struct { + Host int `xml:"host"` + Bus int `xml:"bus"` + Target int `xml:"target"` + Lun int `xml:"lun"` + Type string `xml:"type"` +} + +type StroageCap struct { + Type string `xml:"match,attr"` + MediaAvailable int `xml:"media_available,omitempty"` + MediaSize int `xml:"media_size,omitempty"` + MediaLable int `xml:"media_label,omitempty"` +} + +type StorageCapabilityType struct { + Block string `xml:"block"` + Bus string `xml:"bus"` + DriverType string `xml:"drive_type"` + Model string `xml:"model"` + Vendor string `xml:"vendor"` + Serial string `xml:"serial"` + Size int `xml:"size"` + Capatibility StroageCap `xml:"capability,omitempty"` +} + +type DRMCapabilityType struct { + Type string `xml:"type"` +} + +func (c *CapabilityType) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { + for _, attr := range start.Attr { + fmt.Println(attr.Name.Local) + if attr.Name.Local == "type" { + switch attr.Value { + case "pci": + var pciCaps PciCapabilityType + if err := d.DecodeElement(&pciCaps, &start); err != nil { + return err + } + c.Type = pciCaps + case "system": + var systemCaps SystemCapabilityType + if err := d.DecodeElement(&systemCaps, &start); err != nil { + return err + } + c.Type = systemCaps + case "usb_device": + var usbdevCaps USBDeviceCapabilityType + if err := d.DecodeElement(&usbdevCaps, &start); err != nil { + return err + } + c.Type = usbdevCaps + case "usb": + var usbCaps USBCapabilityType + if err := d.DecodeElement(&usbCaps, &start); err != nil { + return err + } + c.Type = usbCaps + case "net": + var netCaps NetCapabilityType + if err := d.DecodeElement(&netCaps, &start); err != nil { + return err + } + c.Type = netCaps + case "scsi_host": + var scsiHostCaps SCSIHostCapabilityType + if err := d.DecodeElement(&scsiHostCaps, &start); err != nil { + return err + } + c.Type = scsiHostCaps + case "scsi": + var scsiCaps SCSICapabilityType + if err := d.DecodeElement(&scsiCaps, &start); err != nil { + return err + } + c.Type = scsiCaps + case "storage": + var storageCaps StorageCapabilityType + if err := d.DecodeElement(&storageCaps, &start); err != nil { + return err + } + c.Type = storageCaps + case "drm": + var drmCaps DRMCapabilityType + if err := d.DecodeElement(&drmCaps, &start); err != nil { + return err + } + c.Type = drmCaps + } + } + } + return nil +} + +func (c *NodeDevice) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), c) +} + +func (c *NodeDevice) Marshal() (string, error) { + doc, err := xml.MarshalIndent(c, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} diff --git a/node_device_test.go b/node_device_test.go new file mode 100644 index 0000000..129956b --- /dev/null +++ b/node_device_test.go @@ -0,0 +1,111 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +import ( + "reflect" + "strings" + "testing" +) + +var NodeDeviceTestData = []struct { + Object *NodeDevice + XML []string +}{ + { + Object: &NodeDevice{ + Name: "pci_0000_81_00_0", + Parent: "pci_0000_80_01_0", + Driver: "ixgbe", + Capability: &CapabilityType{ + Type: PciCapabilityType{ + Domain: 1, + Bus: 21, + Slot: 10, + Function: 50, + Product: IDName{ + ID: "0x1528", + Name: "Ethernet Controller 10-Gigabit X540-AT2", + }, + Vendor: IDName{ + ID: "0x8086", + Name: "Intel Corporation", + }, + IommuGroup: IOMMUGroupType{ + Number: 3, + }, + Numa: NUMA{ + Node: 1, + }, + Capabilities: []PciCapability{ + PciCapability{ + Type: "virt_functions", + MaxCount: 63, + }, + }, + }, + }, + }, + XML: []string{ + `<device>`, + ` <name>pci_0000_81_00_0</name>`, + ` <parent>pci_0000_80_01_0</parent>`, + ` <driver>`, + ` <name>ixgbe</name>`, + ` </driver>`, + ` <capability type='pci'>`, + ` <domain>1</domain>`, + ` <bus>21</bus>`, + ` <slot>10</slot>`, + ` <function>50</function>`, + ` <product id='0x1528'>Ethernet Controller 10-Gigabit X540-AT2</product>`, + ` <vendor id='0x8086'>Intel Corporation</vendor>`, + ` <capability type='virt_functions' maxCount='63'/>`, + ` <iommuGroup number='3'>`, + ` <address domain='0x0000' bus='0x15' slot='0x00' function='0x4'/>`, + ` </iommuGroup>`, + ` <numa node='1'/>`, + ` </capability>`, + `</device>`, + }, + }, +} + +func TestNodeDevice(t *testing.T) { + for _, test := range NodeDeviceTestData { + xmlDoc := strings.Join(test.XML, "\n") + nodeDevice := NodeDevice{} + err := nodeDevice.Unmarshal(xmlDoc) + if err != nil { + t.Fatal(err) + } + + res := reflect.DeepEqual(&nodeDevice, test.Object) + if !res { + t.Fatal("Bad NodeDevice object creation.") + } + } +} -- 2.9.4

2 3

[libvirt] [PATCH go-xml] 1, add support for disk cache and io, and add test case. 2, add support for controller model, and add test case. 3, extend DomainAddress struct for PCI address and target&unit, and add test cases. 4, modify DomainController:Index type from string to *uint.
by zhenwei.pi 31 May '17

31 May '17

--- domain.go | 13 +++++++++++-- domain_test.go | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 5 deletions(-) diff --git a/domain.go b/domain.go index 848835a..cbb22e5 100644 --- a/domain.go +++ b/domain.go @@ -30,8 +30,10 @@ import ( ) type DomainController struct { - Type string `xml:"type,attr"` - Index string `xml:"index,attr"` + Type string `xml:"type,attr"` + Index *uint `xml:"index,attr"` + Model string `xml:"model,attr,omitempty"` + Address *DomainAddress `xml:"address"` } type DomainDiskSecret struct { @@ -77,6 +79,8 @@ type DomainDisk struct { Type string `xml:"type,attr"` Device string `xml:"device,attr"` Snapshot string `xml:"snapshot,attr,omitempty"` + Cache string `xml:"cache,attr,omitempty"` + Io string `xml:"io,attr,omitempty"` Driver *DomainDiskDriver `xml:"driver"` Auth *DomainDiskAuth `xml:"auth"` Source *DomainDiskSource `xml:"source"` @@ -196,8 +200,13 @@ type DomainAlias struct { type DomainAddress struct { Type string `xml:"type,attr"` Controller *uint `xml:"controller,attr"` + Domain *uint `xml:"domain,attr"` Bus *uint `xml:"bus,attr"` Port *uint `xml:"port,attr"` + Slot *uint `xml:"slot,attr"` + Function *uint `xml:"function,attr"` + Target *uint `xml:"target,attr"` + Unit *uint `xml:"unit,attr"` } type DomainChardev struct { diff --git a/domain_test.go b/domain_test.go index 265cf80..22da947 100644 --- a/domain_test.go +++ b/domain_test.go @@ -30,6 +30,16 @@ import ( "testing" ) +type PciAddress struct { + Domain uint + Bus uint + Slot uint + Function uint +} + +var uhciIndex uint = 0 +var uhciAddr = PciAddress{0, 0, 1, 2} + var domainTestData = []struct { Object *Domain Expected []string @@ -130,10 +140,12 @@ var domainTestData = []struct { }, }, DomainDisk{ - Type: "volume", + Type: "volume", Device: "cdrom", + Cache: "none", + Io: "native", Source: &DomainDiskSource{ - Pool: "default", + Pool: "default", Volume: "myvolume", }, Target: &DomainDiskTarget{ @@ -174,7 +186,7 @@ var domainTestData = []struct { ` </source>`, ` <target dev="vdd" bus="virtio"></target>`, ` </disk>`, - ` <disk type="volume" device="cdrom">`, + ` <disk type="volume" device="cdrom" cache="none" io="native">`, ` <source pool="default" volume="myvolume"></source>`, ` <target dev="vde" bus="virtio"></target>`, ` </disk>`, @@ -820,6 +832,44 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + Devices: &DomainDeviceList{ + Controllers: []DomainController{ + DomainController{ + Type: "usb", + Index: &uhciIndex, + Model: "piix3-uhci", + Address: &DomainAddress{ + Type: "pci", + Domain: &uhciAddr.Domain, + Bus: &uhciAddr.Bus, + Slot: &uhciAddr.Slot, + Function: &uhciAddr.Function, + }, + }, + DomainController{ + Type: "usb", + Index: nil, + Model: "ehci", + }, + }, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <devices>`, + ` <controller type="usb" index="0" model="piix3-uhci">`, + ` <address type="pci" domain="0" bus="0" slot="1" function="2"></address>`, + ` </controller>`, + ` <controller type="usb" model="ehci"></controller>`, + ` </devices>`, + `</domain>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.7.4

3 3

[libvirt] Entering freeze for libvirt-3.4.0
by Daniel Veillard 31 May '17

31 May '17

So as planned I tagged the release candidate 1 in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ Everything seems to work fine for me with RC1 on my limited testing but as usual please give it some attention to find out issues and check portability on the various platforms. If everything woks well, I will push the RC2 on Tuesday and then we can roll out 3.4.0 and get out of the freeze next Thursday, but in the meantime, please give it a try ! Thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 4

[libvirt] [PATCH] udev: Fix build on older platforms
by Erik Skultety 31 May '17

31 May '17

Caused by commit @d1eea6c1 due to the missing symbol on older platforms. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Despite falling under build-breaker category, I'd like to get a proper review, since I'm not really familiar with autoconf and there might be a better fix. Erik configure.ac | 2 +- src/node_device/node_device_udev.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 246f4e077..b78c8b790 100644 --- a/configure.ac +++ b/configure.ac @@ -322,7 +322,7 @@ AC_CHECK_FUNCS_ONCE([cfmakeraw fallocate geteuid getgid getgrnam_r \ getmntent_r getpwuid_r getrlimit getuid if_indextoname kill mmap \ newlocale posix_fallocate posix_memalign prlimit regexec \ sched_getaffinity setgroups setns setrlimit symlink sysctlbyname \ - getifaddrs sched_setscheduler unshare]) + getifaddrs sched_setscheduler unshare udev_monitor_set_receive_buffer_size]) dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h regex.h sys/un.h \ diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index a69dc1175..01438ea17 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1764,12 +1764,14 @@ static int nodeStateInitialize(bool privileged, udev_monitor_enable_receiving(priv->udev_monitor); +#if HAVE_UDEV_MONITOR_SET_RECEIVE_BUFFER_SIZE /* mimic udevd's behaviour and override the systems rmem_max limit in case * there's a significant number of device 'add' events */ if (geteuid() == 0) udev_monitor_set_receive_buffer_size(priv->udev_monitor, 128 * 1024 * 1024); +#endif /* We register the monitor with the event callback so we are * notified by udev of device changes before we enumerate existing -- 2.13.0

3 3

[libvirt] [GSoC] Project of libvirt/qemu fuzzing
by Dan 30 May '17

30 May '17

Dear all, The project of qemu command line fuzzing has been accepted as a GSoC project [1] [2]. As a student participating Google Summer of Code activity, I am extremely exitited to get started today on May 30th, 2017. During the past months, I have received tremendous guidance from my mentors as well as many other contributors on the mailinglist. I look forward to contributing to the community and learning a lot over the summer. Any advice, comment, feedback, suggestion to my emails/commit, would always be highly appreciated and more than welcome. Thank you all for your time, Daniel Liu [1]. https://summerofcode.withgoogle.com/projects/#5088017038442496 [2]. https://wiki.libvirt.org/page/Google_Summer_of_Code_Ideas#QEMU_command_line…

2 2

[libvirt] [PATCH] maint: add sanitizers to the build process
by claudioandre.br＠gmail.com 30 May '17

30 May '17

From: Claudio André <claudioandre.br(a)gmail.com> Sanitizers are based on compile-time instrumentation. They are available in gcc and clang for a range of supported operation systems and platforms. More info at: https://github.com/google/sanitizers The address sanitizer finds bugs related to addressing memory: use after free, heap buffer overflow, stack buffer overflow, memory leaks, ... The undefined behavior sanitizer detects situations not prescribed by the language specification: bound violations, data overflows, ... The llvm.org states that Sanitizers have found thousands of bugs everywhere. Sanitizers running during CI can prevent bugs from taking up residence. A helper tool to keep bugs out. --- - I mean CI (in general) not only Travis; - The functionality is not tied to CI; it is useful for local testing; - A way to think about this (including the ongoing GSOC): - Phase 1: test with Sanitizers to achieve basic code sanity; - Phase 2: use fuzzing for stronger security & reliability; - MISSING: should I add the flag to which Makefile.am? Or, what do you guys think about this? configure.ac | 2 ++ m4/virt-compile-sanitizer.m4 | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 m4/virt-compile-sanitizer.m4 diff --git a/configure.ac b/configure.ac index 246f4e0..4334614 100644 --- a/configure.ac +++ b/configure.ac @@ -237,6 +237,7 @@ LIBVIRT_COMPILE_WARNINGS LIBVIRT_COMPILE_PIE LIBVIRT_LINKER_RELRO LIBVIRT_LINKER_NO_INDIRECT +LIBVIRT_COMPILE_SANITIZER LIBVIRT_ARG_APPARMOR LIBVIRT_ARG_ATTR @@ -1011,6 +1012,7 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_DEBUG +LIBVIRT_RESULT_SANITIZER AC_MSG_NOTICE([ Use -Werror: $enable_werror]) AC_MSG_NOTICE([ Warning Flags: $WARN_CFLAGS]) LIBVIRT_RESULT_DTRACE diff --git a/m4/virt-compile-sanitizer.m4 b/m4/virt-compile-sanitizer.m4 new file mode 100644 index 0000000..a7cac31 --- /dev/null +++ b/m4/virt-compile-sanitizer.m4 @@ -0,0 +1,51 @@ +dnl +dnl Check for support for Sanitizers +dnl Check for -fsanitize=address and -fsanitize=undefined support +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_COMPILE_SANITIZER],[ + LIBVIRT_ARG_ENABLE([ASAN], [Build with address sanitizer support], [no]) + LIBVIRT_ARG_ENABLE([UBSAN], [Build with undefined behavior sanitizer support], [no]) + + SAN_CFLAGS= + SAN_LDFLAGS= + + AS_IF([test "x$enable_asan" = "xyes"], [ + gl_COMPILER_OPTION_IF([-fsanitize=address -fno-omit-frame-pointer], [ + SAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer" + SAN_LDFLAGS="-fsanitize=address" + ]) + + AC_SUBST([SAN_CFLAGS]) + AC_SUBST([SAN_LDFLAGS]) + ]) + + AS_IF([test "x$enable_ubsan" = "xyes"], [ + gl_COMPILER_OPTION_IF([-fsanitize=undefined -fno-omit-frame-pointer], [ + SAN_CFLAGS="$SAN_CFLAGS -fsanitize=undefined -fno-omit-frame-pointer" + SAN_LDFLAGS="$SAN_LDFLAGS -fsanitize=undefined" + ]) + + AC_SUBST([SAN_CFLAGS]) + AC_SUBST([SAN_LDFLAGS]) + ]) +]) + +AC_DEFUN([LIBVIRT_RESULT_SANITIZER], [ + AC_MSG_NOTICE([ ASan: $enable_asan]) + AC_MSG_NOTICE([ UBSan: $enable_ubsan]) +]) -- 2.11.0

3 2

[libvirt] [PATCH 0/9] virObject adjustments for common object
by John Ferlan 30 May '17

30 May '17

Originally posted in part as an RFC: https://www.redhat.com/archives/libvir-list/2017-April/msg00321.html Obviously not a 3.4.0 discussion, but I'm trying to get ahead of the curve for 3.5.0 and posting this now as I'm "close enough" to at least convert secrets, nwfilters, nodedevs, and interfaces to use a more common object methodolgy to add/store, fetch/find, search, list, etc. the objects in something other than a linear forward linked list. Converting the storage pool, storage volume, and network is taking longer than hoped since there are so many patches to get from pointA to pointB. So I'll focus on the 4 and work through getting the complete model published/adopted as those have been in my branches for a while now. Still these patches get as far as the creation of the common object which is a start. The first 4 patches are essentially setup. Patch 5 is new and covers the need for nwfilters (at least temporarily until self locking list mgmt is possible). Patches 6-7 were more or less what patch 7-8 were in the RFC. Patches 8-9 are essentially the driver/common object extension. Patches 5-6 from the RFC still exist in my branches and would be the next logical step. It was a conscious decision to just use the "default" string comparison for hash table key. That key could be a UUID, but since the UUID can easily be converted from unsigned to signed - I believe it would be far simpler to keep that mechanism rather than complexity introduced by having "different" key search algorithms when the key isn't a char *. John Ferlan (9): util: Formatting cleanups to virobject API util: Introduce virObjectGetLockableObj util: Generate a common internal only error print util: Add magic_marker for all virObjects util: Introduce virObjectLockableRecursiveNew util: Introduce virObjectPoolableHashElement util: Add virObjectPoolableHashElementGet*Key util: Introduce virObjectPoolableDef util: Add virObjectPoolableDef* accessor API's src/libvirt_private.syms | 12 ++ src/util/virobject.c | 492 +++++++++++++++++++++++++++++++++++++++++++---- src/util/virobject.h | 130 +++++++++++-- 3 files changed, 580 insertions(+), 54 deletions(-) -- 2.9.4

3 17

[libvirt] [PATCH v3 0/3] Loadparm support
by Farhan Ali 30 May '17

30 May '17

This patch series introduces the support for new s390x 'loadparm' feature. The 'loadparm' can be used to select the boot entry to boot from, for a boot device. Here is a link to the QEMU patches: https://lists.nongnu.org/archive/html/qemu-devel/2017-05/msg00192.html ChangeLog --------- v2 -> v3: - Updated news.xml and formatdomain.html.in with a more architectural description of loadparm (patch 1) v1 -> v2: - Rebased the patch series on the latest master, commit 2f69dd3 virfiletest: include linux/falloc.h Thanks Farhan Ali Farhan Ali (3): conf : Add loadparm boot option for a boot device qemu : Add loadparm to qemu command line string tests : Testcases for loadparm docs/formatdomain.html.in | 9 ++- docs/news.xml | 11 ++++ docs/schemas/domaincommon.rng | 7 +++ src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 69 +++++++++++++++++++++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 37 ++++++++++++ ...-machine-loadparm-multiple-disks-nets-s390.args | 28 +++++++++ ...v-machine-loadparm-multiple-disks-nets-s390.xml | 43 ++++++++++++++ .../qemuxml2argv-machine-loadparm-net-s390.args | 20 +++++++ .../qemuxml2argv-machine-loadparm-net-s390.xml | 26 ++++++++ ...xml2argv-machine-loadparm-s390-char-invalid.xml | 26 ++++++++ ...uxml2argv-machine-loadparm-s390-len-invalid.xml | 26 ++++++++ .../qemuxml2argv-machine-loadparm-s390.args | 20 +++++++ .../qemuxml2argv-machine-loadparm-s390.xml | 26 ++++++++ tests/qemuxml2argvtest.c | 19 ++++++ 17 files changed, 367 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml -- 1.9.1

2 10

[libvirt] [PATCH] qemu: Don't error out if allocation info can't be queried
by Peter Krempa 30 May '17

30 May '17

qemuDomainGetBlockInfo would error out if qemu did not report 'wr_highest_offset'. This usually does not happen, but can happen briefly during active layer block commit. There's no need to report the error, we can simply report that the disk is fully alocated at that point. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452045 --- src/qemu/qemu_driver.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 67f54282a..f6b352b56 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11541,14 +11541,6 @@ qemuDomainGetBlockInfo(virDomainPtr dom, } if (!entry->wr_highest_offset_valid) { - if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_BLOCK && - disk->src->format != VIR_STORAGE_FILE_RAW) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to query the maximum written offset of " - "block device '%s'"), disk->dst); - goto endjob; - } - info->allocation = entry->physical; } else { if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_FILE && -- 2.12.2

2 1

[libvirt] [libvirt-sandbox PATCH] Drop library/ from template name and image path
by Guido Günther 30 May '17

30 May '17

If one pastes from the output of virt-sansbox-image $ virt-sandbox-image list docker:/library/ubuntu?tag=17.04 docker:/library/debian?tag=latest verbatim $ virt-sandbox-image run -c qemu:///session docker:/library/debian?tag=latest This fails like /home/<usr>/.local/share/libvirt/images/library/debian:qbeilwxard.qcow2: Could not create file: No such file or directory Unable to start sandbox: Failed to create domain: XML error: name library/debian:qbeilwxard cannot contain '/' /usr/bin/virt-sandbox-image: [Errno 2] No such file or directory: '/home/<user>/.local/share/libvirt/images/library/debian:qbeilwxard.qcow2' so strip of any leading components. --- This might not be the correct fix but I hope you get the idea. libvirt-sandbox/image/cli.py | 2 +- libvirt-sandbox/image/sources/docker.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-sandbox/image/cli.py b/libvirt-sandbox/image/cli.py index 3a5ccfa..0f27a16 100644 --- a/libvirt-sandbox/image/cli.py +++ b/libvirt-sandbox/image/cli.py @@ -96,7 +96,7 @@ def run(args): name = args.name if name is None: randomid = ''.join(random.choice(string.lowercase) for i in range(10)) - name = tmpl.path[1:] + ":" + randomid + name = tmpl.path[1:].split('/')[-1] + ":" + randomid diskfile = source.get_disk(template=tmpl, templatedir=template_dir, diff --git a/libvirt-sandbox/image/sources/docker.py b/libvirt-sandbox/image/sources/docker.py index aa5675e..6ca086c 100755 --- a/libvirt-sandbox/image/sources/docker.py +++ b/libvirt-sandbox/image/sources/docker.py @@ -655,7 +655,7 @@ class DockerSource(base.Source): def get_disk(self, template, templatedir, imagedir, sandboxname): image = DockerImage.from_template(template) configfile, diskfile = self._get_template_data(image, templatedir) - tempfile = imagedir + "/" + sandboxname + ".qcow2" + tempfile = imagedir + "/" + sandboxname.split('/')[-1] + ".qcow2" if not os.path.exists(imagedir): os.makedirs(imagedir) cmd = ["qemu-img","create","-q","-f","qcow2"] -- 2.11.0

2 1

[libvirt] [PATCH v2] nodedev: Increase the netlink socket buffer size to the one used by udev
by Erik Skultety 30 May '17

30 May '17

From: "ning.bo" <ning.bo9(a)zte.com.cn> When a number of SRIOV VFs (up to 128 on Intel XL710) is created: for i in `seq 0 1`; do echo 63 > /sys/class/net/<interface>/device/sriov_numvfs done libvirtd will then report "udev_monitor_receive_device returned NULL" error because the netlink socket buffer is not big enough (using GDB on libudev confirmed this with ENOBUFFS) and thus some udev events were dropped. This results in some devices being missing in the nodedev-list output. This patch overrides the system's rmem_max limit but for that, we need to make sure we've got root privileges. https://bugzilla.redhat.com/show_bug.cgi?id=1450960 Signed-off-by: ning.bo <ning.bo9(a)zte.com.cn> Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Additionally, we might want to check for the errno, providing a specific message if such issue occurs again in a further non-specified point in time and return the generic, yet cryptic one for all other cases. src/node_device/node_device_udev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 4ecb0b18f..0b3717397 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1728,6 +1728,13 @@ static int nodeStateInitialize(bool privileged, udev_monitor_enable_receiving(priv->udev_monitor); + /* mimic udevd's behaviour and override the systems rmem_max limit in case + * there's a significant number of device 'add' events + */ + if (geteuid() == 0) + udev_monitor_set_receive_buffer_size(priv->udev_monitor, + 128 * 1024 * 1024); + /* We register the monitor with the event callback so we are * notified by udev of device changes before we enumerate existing * devices because libvirt will simply recreate the device if we -- 2.13.0

3 4

[libvirt] [PATCH] qemu:json: Fix daemon crash on handling domain shutdown event
by Erik Skultety 30 May '17

30 May '17

commit a8eba5036 added further checking of the guest shutdown cause, but this enhancement is available since qemu 2.10, causing a crash because of a NULL pointer dereference on older qemus. Thread 1 "libvirtd" received signal SIGSEGV, Segmentation fault. 0x00007ffff72441af in virJSONValueObjectGet (object=0x0, key=0x7fffd5ef11bf "guest") at util/virjson.c:769 769 if (object->type != VIR_JSON_TYPE_OBJECT) (gdb) bt 0 in virJSONValueObjectGet 1 in virJSONValueObjectGetBoolean 2 in qemuMonitorJSONHandleShutdown 3 in qemuMonitorJSONIOProcessEvent 4 in qemuMonitorJSONIOProcessLine 5 in qemuMonitorJSONIOProcess 6 in qemuMonitorIOProcess 7 in qemuMonitorIO 8 in virEventPollDispatchHandles 9 in virEventPollRunOnce 10 in virEventRunDefaultImpl 11 in virNetDaemonRun 12 in main Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 757595dd7..f208dd05a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -528,7 +528,7 @@ static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr da bool guest = false; virTristateBool guest_initiated = VIR_TRISTATE_BOOL_ABSENT; - if (virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) + if (data && virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) guest_initiated = guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; qemuMonitorEmitShutdown(mon, guest_initiated); -- 2.13.0

2 2

[libvirt] [PATCH v3] Regression: Report correct CPUs present on executing virsh nodecpumap
by Nitesh Konkar 30 May '17

30 May '17

On executing the virsh nodecpumap command, the number of CPUs present was shown as (last cpu online id + 1). This patch fixes the issue by reporting the current number of CPUs present. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virhostcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index aa9cfeac2..c485a9721 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1093,7 +1093,7 @@ virHostCPUGetMap(unsigned char **cpumap, if (online) *online = virBitmapCountBits(cpus); - ret = virBitmapSize(cpus); + ret = virHostCPUGetCount(); cleanup: if (ret < 0 && cpumap) -- 2.11.0

2 1

[libvirt] [libvirt-sandbox PATCH] mkinitrd: Add missing fscrypto module
by Guido Günther 30 May '17

30 May '17

--- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index bdec490..7204f71 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -186,6 +186,7 @@ static gchar *gvir_sandbox_builder_machine_mkinitrd(GVirSandboxConfig *config, /* In case ext4 is built as a module, include it and its deps * for the root mount */ + gvir_sandbox_config_initrd_add_module(initrd, "fscrypto.ko"); gvir_sandbox_config_initrd_add_module(initrd, "mbcache.ko"); gvir_sandbox_config_initrd_add_module(initrd, "jbd2.ko"); gvir_sandbox_config_initrd_add_module(initrd, "crc16.ko"); -- 2.11.0

2 2

[libvirt] [libvirt-sandbox PATCH] docker: Don't ignore qemu-img errors
by Guido Günther 30 May '17

30 May '17

--- libvirt-sandbox/image/sources/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-sandbox/image/sources/docker.py b/libvirt-sandbox/image/sources/docker.py index 43e9c32..aa5675e 100755 --- a/libvirt-sandbox/image/sources/docker.py +++ b/libvirt-sandbox/image/sources/docker.py @@ -662,7 +662,7 @@ class DockerSource(base.Source): cmd.append("-o") cmd.append("backing_fmt=qcow2,backing_file=%s" % diskfile) cmd.append(tempfile) - subprocess.call(cmd) + subprocess.check_call(cmd) return tempfile def get_command(self, template, templatedir, userargs): -- 2.11.0

2 2

[libvirt] [PATCH] tools: make setvcpus --maximum imply --config
by Chen Hanxiao 29 May '17

29 May '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Currently --maximum was possible if and only if --config was specified. This patch makes setvcpus --maximum imply --config. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain.c | 7 ++++--- tools/virsh.pod | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5c42021..04ef816 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6819,8 +6819,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); VSH_EXCLUSIVE_OPTIONS_VAR(guest, config); - - VSH_REQUIRE_OPTION_VAR(maximum, config); + VSH_EXCLUSIVE_OPTIONS_VAR(maximum, live); + VSH_EXCLUSIVE_OPTIONS_VAR(maximum, current); if (config) flags |= VIR_DOMAIN_AFFECT_CONFIG; @@ -6829,7 +6829,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (guest) flags |= VIR_DOMAIN_VCPU_GUEST; if (maximum) - flags |= VIR_DOMAIN_VCPU_MAXIMUM; + flags |= VIR_DOMAIN_VCPU_MAXIMUM | + VIR_DOMAIN_AFFECT_CONFIG; if (hotpluggable) flags |= VIR_DOMAIN_VCPU_HOTPLUGGABLE; diff --git a/tools/virsh.pod b/tools/virsh.pod index e7c513b..bc8b539 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2501,10 +2501,11 @@ flag. Vcpus added to live domains supporting vcpu unplug are automatically marked as hotpluggable. The I<--maximum> flag controls the maximum number of virtual cpus that can -be hot-plugged the next time the domain is booted. As such, it must only be -used with the I<--config> flag, and not with the I<--live> or the I<--current> -flag. Note that it may not be possible to change the maximum vcpu count if -the processor topology is specified for the guest. +be hot-plugged the next time the domain is booted. As such, it implies +I<--config> be set. Also it can be used with the I<--config> flag, +but not with the I<--live> or the I<--current> flag. Note that it may not +be possible to change the maximum vcpu count if the processor topology +is specified for the guest. =item B<setvcpu> I<domain> I<vcpulist> [I<--enable>] | [I<--disable>] [[I<--live>] [I<--config>] | [I<--current>]] -- 2.7.4

3 4

[libvirt] [PATCH] virCapabilitiesInitCaches: Don't leak @cpus
by Michal Privoznik 29 May '17

29 May '17

The @cpus is allocated by virFileReadValueBitmap() but never freed: ==21274== 40 (32 direct, 8 indirect) bytes in 1 blocks are definitely lost in loss record 808 of 1,004 ==21274== at 0x4C2E080: calloc (vg_replace_malloc.c:711) ==21274== by 0x54BA561: virAlloc (viralloc.c:144) ==21274== by 0x54BC604: virBitmapNewEmpty (virbitmap.c:126) ==21274== by 0x54BD059: virBitmapParseUnlimited (virbitmap.c:570) ==21274== by 0x54EECE9: virFileReadValueBitmap (virfile.c:4113) ==21274== by 0x5563132: virCapabilitiesInitCaches (capabilities.c:1548) ==21274== by 0x2BB86E59: virQEMUCapsInit (qemu_capabilities.c:1132) ==21274== by 0x2BBEC067: virQEMUDriverCreateCapabilities (qemu_conf.c:928) ==21274== by 0x2BC3DEAA: qemuStateInitialize (qemu_driver.c:845) ==21274== by 0x5625AAC: virStateInitialize (libvirt.c:770) ==21274== by 0x124519: daemonRunStateInit (libvirtd.c:881) ==21274== by 0x554C927: virThreadHelper (virthread.c:206) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index a91a72a35..43b15761a 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1643,5 +1643,6 @@ virCapabilitiesInitCaches(virCapsPtr caps) VIR_FREE(path); VIR_DIR_CLOSE(dirp); virCapsHostCacheBankFree(bank); + virBitmapFree(cpus); return ret; } -- 2.13.0

2 1