- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Two almost trivial fixes
by Michal Privoznik 06 Apr '18

06 Apr '18

Any review appreciated. Michal Privoznik (2): storageVolLookupData: Drop conn struct member storageDriverAutostart: Drop unused @conn src/storage/storage_driver.c | 9 ++------- src/test/test_driver.c | 5 ++--- 2 files changed, 4 insertions(+), 10 deletions(-) -- 2.16.1

2 3

[libvirt] [PATCH 0/7] Prepare for daemon split
by Daniel P. Berrangé 06 Apr '18

06 Apr '18

When we split up the daemons, libvirtd will need to forward different sets of APIs to different daemons. This means libvirtd is going to need to have multiple virConnectPtr instances open. This series prepares for that by introducing "separate" connections, which are actually just an extra reference on the current single connection. This will facilitate later changes. Daniel P. Berrangé (7): rpc: refactor way connection object is generated for remote dispatch remote: use a separate connection for interface APIs remote: use a separate connection for network APIs remote: use a separate connection for nodedev APIs remote: use a separate connection for nwfilter APIs remote: use a separate connection for secret APIs remote: use a separate connection for storage APIs src/remote/remote_daemon.h | 6 +++ src/remote/remote_daemon_dispatch.c | 81 +++++++++++++++++++------------ src/rpc/gendispatch.pl | 95 ++++++++++++++++++++++++++++--------- 3 files changed, 128 insertions(+), 54 deletions(-) -- 2.14.3

4 19

[libvirt] [PATCH 0/2] utils: squelch errors from virNetSocketNewConnectTCP
by Jim Fehlig 05 Apr '18

05 Apr '18

Patch1 fixes a case where error is reported even when the reportError parameter is false. Patch2 is essentially a V2 of a patch posted earlier, incorporating some ideas from jferlan's review https://www.redhat.com/archives/libvir-list/2018-March/msg01120.html Jim Fehlig (2): util: honor reportError parameter in virSocketAddrParseInternal util: introduce virSocketAddrParseAny src/libvirt_private.syms | 1 + src/rpc/virnetsocket.c | 2 +- src/util/virsocketaddr.c | 53 ++++++++++++++++++++++++++++++++++++++++++++---- src/util/virsocketaddr.h | 5 +++++ 4 files changed, 56 insertions(+), 5 deletions(-) -- 2.16.2

2 6

[libvirt] [PATCH] util: fix spelling in virSocketAddrParseAny docs
by Jim Fehlig 05 Apr '18

05 Apr '18

s/netork/network/ Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing as trivial. src/util/virsocketaddr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 4f2457629..5c3bfad0a 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -176,7 +176,7 @@ int virSocketAddrParse(virSocketAddrPtr addr, const char *val, int family) * or 2001:db8:85a3:0:0:8a2e:370:7334. * * When @val is a network host name, this function may be susceptible to a - * delay due to potentially lengthy netork host address lookups. + * delay due to potentially lengthy network host address lookups. * * Returns the length of the network address or -1 in case of error. */ -- 2.16.2

1 0

[libvirt] anyone ever seen virDomainCreateWithFlags() essentially hang?
by Chris Friesen 05 Apr '18

05 Apr '18

I'm investigating something weird with libvirt 1.2.17 and qemu 2.3.0. I'm using the python bindings, and I seem to have a case where libvirtmod.virDomainCreateWithFlags() hung rather than returned. Then, about 15min later a subsequent call to libvirtmod.virDomainDestroy() from a different eventlet within the same process seems to have "unblocked" the original creation call, which raised an exception and an error code of libvirt.VIR_ERR_INTERNAL_ERROR. The virDomainDestroy() call came back with an error of "Requested operation is not valid: domain is not running". The corresponding qemu logs show the guest starting up and then a bit over 15min later there is a "shutting down" log. At shutdown time the libvirtd log shows "qemuMonitorIORead:609 : Unable to read from monitor: Connection reset by peer". The parent function did two additional retries, and both the retries failed in similar fashion. In all three caess there seems to be a pattern of the qemu instance starting up but virDomainCreateWithFlags() not returning, then a subsequent virDomainDestroy() call for the same domain causing the virDomainCreateWithFlags() call to get "unblocked" and return -1 leading to an exception in the python code. Any ideas what might cause this behaviour? I haven't reproduced the "hanging" behaviour myself, I'm working entirely off of logs from the affected system. Thanks, Chris

2 2

[libvirt] Run libvirtd from git: virsh hangs
by Mathieu Tarral 05 Apr '18

05 Apr '18

Hi, I managed to compile libvirt from the git repo, now i have some trouble to run it. This is what i did: I configured the source to use /var because i wanted the socket to be at the same place as the system one (/var/run/libvirt/libvirt-sock) ./configure --prefix=$HOME/usr --localstatedir=/var make make install at this point i stopped my system libvirtd and virtlogd sudo systemctl stop libvirtd sudo systemctl stop virtlogd And then i launched my custom libvirtd and virtlogd cd $HOME/usr/sbin sudo ./libvirtd -v sudo ./virtlogd -v After that i tried to list the available domains with virsh (using the system binary) sudo virsh virsh # list --all And this call hangs forever. There is no more output in libvirtd stdout/stderr, even if i set log_level to 1. Did i miss anything in the configuration ? Thanks guys ! -- Mathieu Tarral

3 4

[libvirt] [PATCH v4 0/3] Improve handling of multipath devices
by Michal Privoznik 05 Apr '18

05 Apr '18

The saga continues. v3: https://www.redhat.com/archives/libvir-list/2018-April/msg00083.html diff to v3: - hopefully all Peter's review comments are worked in now. Michal Privoznik (3): util: Introduce virDevMapperGetTargets qemu_cgroup: Handle device mapper targets properly news: Document device mapper fix docs/news.xml | 12 +++ libvirt.spec.in | 2 + src/libvirt_private.syms | 4 + src/qemu/qemu_cgroup.c | 46 ++++++++++- src/util/Makefile.inc.am | 2 + src/util/virdevmapper.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virdevmapper.h | 31 ++++++++ 7 files changed, 293 insertions(+), 3 deletions(-) create mode 100644 src/util/virdevmapper.c create mode 100644 src/util/virdevmapper.h -- 2.16.1

2 7

[libvirt] [dbus PATCH] test: Don't hardcode python3 path
by Andrea Bolognani 05 Apr '18

05 Apr '18

Using /usr/bin/python3 is fine for Linux, but it's not portable to other operating systems such as FreeBSD, where the binary lives under /usr/local/bin instead. Use /usr/bin/env to abstract the issue away. With this, 'make check' completes successfully on FreeBSD 10, 11 and -CURRENT. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- test/test_connect.py | 2 +- test/test_domain.py | 2 +- test/test_network.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_connect.py b/test/test_connect.py index 440a496..d972561 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import dbus import libvirttest diff --git a/test/test_domain.py b/test/test_domain.py index d36adf7..7ec2318 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import dbus import libvirttest diff --git a/test/test_network.py b/test/test_network.py index 97ab0aa..5178862 100755 --- a/test/test_network.py +++ b/test/test_network.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import dbus import libvirttest -- 2.14.3

2 1

[libvirt] [dbus PATCH 00/10] Impement some APIs for network Interface
by Katerina Koukiou 05 Apr '18

05 Apr '18

Katerina Koukiou (10): Implement BridgeName property for Network interface. Implement Autostart property for Network Interface Implement UUID property for Network interface. Implement NetworkLookupByUUID method for network interface. Rename virtDBusEventsRegisterEvent to virtDBusDomainEventsRegisterEvent Rename callback_ids variable to domain_callback_ids Register Network Lifecycle Events Implement Destroy method for Network Interface. Implement Undefine method for Network Interface Implement Create method for Network Interface data/org.libvirt.Connect.xml | 12 ++++ data/org.libvirt.Network.xml | 24 ++++++++ src/connect.c | 50 +++++++++++++++-- src/connect.h | 3 +- src/events.c | 112 ++++++++++++++++++++++++++++--------- src/network.c | 128 +++++++++++++++++++++++++++++++++++++++++++ test/test_connect.py | 1 + test/test_network.py | 43 +++++++++++++++ 8 files changed, 342 insertions(+), 31 deletions(-) -- 2.15.0

2 21

[libvirt] [PATCH] qemu: use target.port for isa-serial
by Thilo Cestonaro 05 Apr '18

05 Apr '18

A configured target.port is currently totaly ignored, while contsructing qemu commandline, for all types of serial devices. This patch adds a -device parameter "index" for the target model isa-serial. This enables the user to specify which serial device will end in which ttySX device. --- src/qemu/qemu_command.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bbd3cd0a7..a685abec0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10290,6 +10290,22 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virDomainChrSerialTargetModelTypeToString(serial->targetModel), serial->info.alias, serial->info.alias); + switch ((virDomainChrSerialTargetModel) serial->targetModel) { + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL: + if (serial->target.port != -1) + virBufferAsprintf(&cmd, ",index=%d", serial->target.port); + break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: + break; + } + if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps) < 0) goto error; -- 2.15.1

1 0

[libvirt] [PATCH] qemu: cpu: fix fullCPU to include all emulatable qemu features
by Nikolay Shirokovskiy 05 Apr '18

05 Apr '18

On Core i5 650 guest fail to start with error [1] if guest cpu config is taken from domcapabilities and check is set to partial. The problem is in qemu caps fullCPU calculation in virQEMUCapsInitHostCPUModel. It is supposed to include features emulated by qemu and missed on host. Some of such features may be not included however. For mentioned cpu host cpu is detected as Westmere and guest cpu as SandyBridge. x2apic is missed on host and provided by installed qemu. The feature is not mentioned in guest cpu features explicitly because SandyBridge model include it. As a result fullCPU does not include x2apic too. Solution is to expand guest cpu features before updating fullCPU features. [1] error: the CPU is incompatible with host CPU: Host CPU does not provide required features: x2apic, tsc-deadline --- src/qemu/qemu_capabilities.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9c1eeac..edba716 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3475,6 +3475,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, virDomainVirtType type) { virCPUDefPtr cpu = NULL; + virCPUDefPtr cpuExpanded = NULL; virCPUDefPtr migCPU = NULL; virCPUDefPtr hostCPU = NULL; virCPUDefPtr fullCPU = NULL; @@ -3504,9 +3505,13 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, NULL, NULL))) goto error; - for (i = 0; i < cpu->nfeatures; i++) { - if (cpu->features[i].policy == VIR_CPU_FEATURE_REQUIRE && - virCPUDefUpdateFeature(fullCPU, cpu->features[i].name, + if (!(cpuExpanded = virCPUDefCopy(cpu)) || + virCPUExpandFeatures(qemuCaps->arch, cpuExpanded) < 0) + goto error; + + for (i = 0; i < cpuExpanded->nfeatures; i++) { + if (cpuExpanded->features[i].policy == VIR_CPU_FEATURE_REQUIRE && + virCPUDefUpdateFeature(fullCPU, cpuExpanded->features[i].name, VIR_CPU_FEATURE_REQUIRE) < 0) goto error; } @@ -3528,6 +3533,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, virQEMUCapsSetHostModel(qemuCaps, type, cpu, migCPU, fullCPU); cleanup: + virCPUDefFree(cpuExpanded); virCPUDefFree(hostCPU); return; -- 1.8.3.1

2 3

[libvirt] Libvirt master compilation failed
by Mathieu Tarral 05 Apr '18

05 Apr '18

Hello, i have been trying to compile the latest libvirt from the Github mirror. I checked out on this commit: 3487973ee0c730b6fbfc6183af798c46ae3b85ff virjsontest: Use a more stable floating point number for testing But the compilation failed with this error: CC ssh.o CCLD ssh CC qemucapsprobe.o CCLD qemucapsprobe CC nsslinktest-nsslinktest.o CCLD nsslinktest CC nssguestlinktest-nsslinktest.o CCLD nssguestlinktest make[2]: Leaving directory '/var/ansible/libvirt/tests' Making all in po make[2]: Entering directory '/var/ansible/libvirt/po' test ! -f ./libvirt.pot || \ test -z "af.gmo am.gmo anp.gmo ar.gmo as.gmo ast.gmo bal.gmo be.gmo bg.gmo bn.gmo bn_IN.gmo bo.gmo br.gmo brx.gmo bs.gmo ca.gmo cs.gmo cy.gmo da.gmo de.gmo de_CH.gmo el.gmo en_GB.gmo eo.gmo es.gmo et.gmo eu.gmo fa.gmo fi.gmo fr.gmo gl.gmo gu.gmo he.gmo hi.gmo hr.gmo hu.gmo ia.gmo id.gmo ilo.gmo is.gmo it.gmo ja.gmo ka.gmo kk.gmo km.gmo kn.gmo ko.gmo kw.gmo kw(a)kkcor.gmo kw(a)uccor.gmo kw_GB.gmo ky.gmo lt.gmo lv.gmo mai.gmo mk.gmo ml.gmo mn.gmo mr.gmo ms.gmo nb.gmo nds.gmo ne.gmo nl.gmo nn.gmo nso.gmo or.gmo pa.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo si.gmo sk.gmo sl.gmo sq.gmo sr.gmo sr(a)latin.gmo sv.gmo ta.gmo te.gmo tg.gmo th.gmo tr.gmo tw.gmo uk.gmo ur.gmo vi.gmo wba.gmo yo.gmo zh_CN.gmo zh_HK.gmo zh_TW.gmo zu.gmo" || make af.gmo am.gmo anp.gmo ar.gmo as.gmo ast.gmo bal.gmo be.gmo bg.gmo bn.gmo bn_IN.gmo bo.gmo br.gmo brx.gmo bs.gmo ca.gmo cs.gmo cy.gmo da.gmo de.gmo de_CH.gmo el.gmo en_GB.gmo eo.gmo es.gmo et.gmo eu.gmo fa.gmo fi.gmo fr.gmo gl.gmo gu.gmo he.gmo hi.gmo hr.gmo hu.gmo ia.gmo id.gmo ilo.gmo is.gmo it.gmo ja.gmo ka.gmo kk.gmo km.gmo kn.gmo ko.gmo kw.gmo kw(a)kkcor.gmo kw(a)uccor.gmo kw_GB.gmo ky.gmo lt.gmo lv.gmo mai.gmo mk.gmo ml.gmo mn.gmo mr.gmo ms.gmo nb.gmo nds.gmo ne.gmo nl.gmo nn.gmo nso.gmo or.gmo pa.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo si.gmo sk.gmo sl.gmo sq.gmo sr.gmo sr(a)latin.gmo sv.gmo ta.gmo te.gmo tg.gmo th.gmo tr.gmo tw.gmo uk.gmo ur.gmo vi.gmo wba.gmo yo.gmo zh_CN.gmo zh_HK.gmo zh_TW.gmo zu.gmo make[3]: Entering directory '/var/ansible/libvirt/po' rm -f af.gmo && : -c --statistics -o af.gmo af.po mv: cannot stat 't-af.gmo': No such file or directory Makefile:470: recipe for target 'af.gmo' failed make[3]: *** [af.gmo] Error 1 make[3]: Leaving directory '/var/ansible/libvirt/po' Makefile:507: recipe for target 'stamp-po' failed make[2]: *** [stamp-po] Error 2 make[2]: Leaving directory '/var/ansible/libvirt/po' Makefile:2121: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/var/ansible/libvirt' Makefile:2014: recipe for target 'all' failed make: *** [all] Error 2 I'm on Debian stretch, i installed every dependency required by the configure script. Any ideas what's wrong here ? Thanks. -- Mathieu Tarral

2 2

[libvirt] [PATCH v2 0/8] Prepare for daemon split
by Daniel P. Berrangé 05 Apr '18

05 Apr '18

When we split up the daemons, libvirtd will need to forward different sets of APIs to different daemons. This means libvirtd is going to need to have multiple virConnectPtr instances open. This series prepares for that by introducing "separate" connections, which are actually just an extra reference on the current single connection. This will facilitate later changes. Daniel P. Berrangé (8): rpc: refactor way connection object is generated for remote dispatch remote: push check for conn down into remoteClientFreePrivateCallbacks remote: use a separate connection for interface APIs remote: use a separate connection for network APIs remote: use a separate connection for nodedev APIs remote: use a separate connection for nwfilter APIs remote: use a separate connection for secret APIs remote: use a separate connection for storage APIs src/remote/remote_daemon.h | 6 +++ src/remote/remote_daemon_dispatch.c | 94 +++++++++++++++++++------------- src/rpc/gendispatch.pl | 104 +++++++++++++++++++++++++----------- 3 files changed, 138 insertions(+), 66 deletions(-) -- 2.14.3

2 9

[libvirt] [dbus PATCH v3 0/4] Introduce Network Interface
by Katerina Koukiou 05 Apr '18

05 Apr '18

This patchset introduces also some basic methods and properties for Network interface. More functionality will be added in following patchsets. New functions are covered by the test suite. Changes from v2: * Added test_list_networks test. * xml files should group methods/signals/properties together. * Some other minor fixes. Katerina Koukiou (4): Introduce Network Interface Implement ListNetworks method for Connect interface Implement Name property for Network interface Implement NetworkLookupByName method for Connect interface data/Makefile.am | 3 +- data/org.libvirt.Connect.xml | 12 +++++ data/org.libvirt.Network.xml | 11 +++++ src/Makefile.am | 3 +- src/connect.c | 76 ++++++++++++++++++++++++++++++ src/connect.h | 1 + src/network.c | 107 +++++++++++++++++++++++++++++++++++++++++++ src/network.h | 9 ++++ src/util.c | 33 +++++++++++++ src/util.h | 15 ++++++ test/Makefile.am | 3 +- test/libvirttest.py | 12 +++++ test/test_connect.py | 23 ++++++++++ test/test_network.py | 19 ++++++++ 14 files changed, 324 insertions(+), 3 deletions(-) create mode 100644 data/org.libvirt.Network.xml create mode 100644 src/network.c create mode 100644 src/network.h create mode 100755 test/test_network.py -- 2.15.0

2 7

[libvirt] [PATCH] docs: add page describing goals for host platform version support
by Daniel P. Berrangé 05 Apr '18

05 Apr '18

Describe how we decide which host platforms to support for libvirt, which in turn makes it easier to decide when a platform / software version can be dropped. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/index.html.in | 2 +- docs/platforms.html.in | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 docs/platforms.html.in diff --git a/docs/index.html.in b/docs/index.html.in index 1b3a7a3db6..4783c39e3c 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -28,7 +28,7 @@ The libvirt project: </p> <ul> - <li>is a toolkit to manage virtualization hosts</li> + <li>is a toolkit to manage <a href="platforms.html.in">virtualization platforms</a></li> <li>is accessible from C, Python, Perl, Java and more</li> <li>is licensed under open source licenses</li> <li>supports <a href="drvqemu.html">KVM</a>, diff --git a/docs/platforms.html.in b/docs/platforms.html.in new file mode 100644 index 0000000000..859b482428 --- /dev/null +++ b/docs/platforms.html.in @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Supported host platforms</h1> + + <ul id="toc"></ul> + + <h2>Build targets</h2> + + <p> + Libvirt drivers aim to support building and executing on multiple + host OS platforms. This document outlines which platforms are the + major build targets. These platforms are used as the basis for deciding + upon the minimum required versions of 3rd party software libvirt depends + on. If a platform is no listed here, it does not imply that libvirt + won't work. If an unlisted platform has comparable software versions + to a listed platform, there is every expectation that it will work. + Bug reports are welcome for problems encountered on unlisted platforms + unless they are clearly older vintage that what is described here. + </p> + + <h3>Linux OS</h3> + + <p> + For distributions with frequent, short-lifetime releases (Fedora, + Ubuntu, OpenSUSE, etc), the project will aim to support all versions + that are not end of life by their respective vendors. + </p> + + <p> + For distributions with long-lifetime releases (RHEL, Ubuntu LTS, + SLES, etc), the project will aim to support the most recent major + version at all times. Support for the previous major version will + be dropped 2 years after the new major version is released. + </p> + + <h3>Windows</h3> + + <p> + The project supports building with current versions of the MinGW + toolchain, hosted on Linux. + </p> + + <h3>OS-X</h3> + + <p> + The project supports building with the current version of OS-X, + with the current homebrew package set available. + </p> + + <h3>FreeBSD</h3> + + <p> + The project will aim to support the most recent major version + at all times. Support for the previous major version will + be dropped 2 years after the new major version is released. + </p> + + <h2>Virtualization platforms</h2> + + <p> + For hypervisor drivers which execute locally (QEMU, LXC, VZ, + libxl, etc), the set of supported operating system platforms + listed above will inform choices as to the minimum required + versions of 3rd party libraries and hypervisor management APIs. + If a hypervisor is not commonly shipped directly by any distro + listed above, (VMWare ESX, HyperV, VZ), the project aims to + support versions upto 5 years, or until the vendor discontinues + support, whichever comes first. + </p> + + </body> +</html> -- 2.14.3

6 9

[libvirt] [PATCH] docs: Update the format of the generate metadata example
by John Ferlan 05 Apr '18

05 Apr '18

Initially, update the UUID field to have the proper format, but then also changed the type, id, and name fields. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- While beginning to think more about the vmgenid RFC and creating a <genid/> element under the <uuid>, I noted that the existing name and uuid fields were a bit out of date. docs/formatdomain.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 82e7d7ce66..984563379e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -31,9 +31,9 @@ <h3><a id="elementsMetadata">General metadata</a></h3> <pre> -<domain type='xen' id='3'> - <name>fv0</name> - <uuid>4dea22b31d52d8f32516782e98ab3fa0</uuid> +<domain type='kvm' id='1'> + <name>MyFirstGuest</name> + <uuid>4dea22b3-1d52-d8f3-2516-782e98ab3fa0</uuid> <title>A short description - title - of the domain</title> <description>Some human readable description</description> <metadata> -- 2.13.6

2 1

[libvirt] [dbus PATCH v2 0/5] Introduce Network Interface
by Katerina Koukiou 04 Apr '18

04 Apr '18

This patchset introduces also some basic methods and properties for Network interface. More functionality will be added in following patchsets. New functions are covered by the test suite. Changes from v1: I forgot to the test_network.py in v1. Katerina Koukiou (5): Introduce Network Interface Implement ListNetworks method for Connect interface Implement virtDBusUtilVirNetworkFromBusPath helper function. Implement Name property for Network interface Implement NetworkLookupByName method for Connect interface data/Makefile.am | 3 +- data/org.libvirt.Connect.xml | 12 +++++ data/org.libvirt.Network.xml | 11 +++++ src/Makefile.am | 3 +- src/connect.c | 75 ++++++++++++++++++++++++++++++ src/connect.h | 1 + src/network.c | 107 +++++++++++++++++++++++++++++++++++++++++++ src/network.h | 9 ++++ src/util.c | 33 +++++++++++++ src/util.h | 15 ++++++ test/Makefile.am | 3 +- test/libvirttest.py | 12 +++++ test/test_connect.py | 11 +++++ test/test_network.py | 19 ++++++++ 14 files changed, 311 insertions(+), 3 deletions(-) create mode 100644 data/org.libvirt.Network.xml create mode 100644 src/network.c create mode 100644 src/network.h create mode 100755 test/test_network.py -- 2.15.0

2 11

[libvirt] [PATCH v3 0/3] Improve handling of multipath devices
by Michal Privoznik 04 Apr '18

04 Apr '18

The saga continues. Turns out, this is bug in both libvirt AND kernel. Firstly, kernel uses different CGroup for checking open() than for ioctl() [1]. However, libvirt needs to allow all targets in the CGroup too. Not only it's logical, kernel devel says it never worked. QEMU was able to open the devmapper device but any subsequent read()/write() would fail because of CGroup perms. Anyway, it's not only RHEL which is affected by this bug. I've upgraded my Gentoo to 4.16 and I'm hitting it even though I was not with 4.15. It all started with upstream kernel commit of 519049afead4f7c3e6446028. This changed call in dm_blk_ioctl() from dm_grab_bdev_for_ioctl() to dm_get_bdev_for_ioctl(). The former merely increases refcount on some internal kernel strcut, the latter calls blkdev_get() which calls __blkdev_get() which actually performs CGroup check. 1: https://bugzilla.redhat.com/show_bug.cgi?id=1557769#c54 Diff to v2: - Changed virDevMapperGetTargets() to do recursive target fetching, and at the same time make it return string list of devices rather than MAJ:MIN pairs. This is because dm_task_set_name() accepts path as string. There's also dm_task_set_major_minor() but: a) handling multiple arrays and merging them (because of recursion) - the code would look ugly, b) we don't need to introduce virDomainAuditCgroupMajorMinor() just to pass MAJ:MIN to it. - Implemented dropping of permissions when unplugging a disk (was missing in previous versions) Michal Privoznik (3): util: Introduce virDevMapperGetTargets qemu_cgroup: Handle device mapper targets properly news: Document device mapper fix docs/news.xml | 10 +++ libvirt.spec.in | 2 + src/libvirt_private.syms | 4 + src/qemu/qemu_cgroup.c | 69 +++++++++++++--- src/util/Makefile.inc.am | 2 + src/util/virdevmapper.c | 200 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virdevmapper.h | 31 ++++++++ 7 files changed, 309 insertions(+), 9 deletions(-) create mode 100644 src/util/virdevmapper.c create mode 100644 src/util/virdevmapper.h -- 2.16.1

2 7

[libvirt] how to expose missing libxl APIs in xml?
by Olaf Hering 04 Apr '18

04 Apr '18

libvirt lacks support for various API interfaces provided by libxl. There is probably no list to track the items not supported by libvirt. Where should such list be maintained, in libvirt.git? The specific case I have right now is this member of libxl_domain_build_info: tools/libxl/libxl_types.idl:483: ("max_grant_frames", uint32, {'init_val': 'LIBXL_MAX_GRANT_FRAMES_DEFAULT'}), How should this be exposed in the guest xml? Olaf

1 0

[libvirt] [Question] Any plan about supporting MBA (Memory Bandwidth Allocation) in libvirt ?
by Zhanghailiang 04 Apr '18

04 Apr '18

Hi, Intel RDT/MBA has been supported by kernel for a time, we also support CAT in libvirt, which is part of RDT. but I didn't find any discussion or patches about MBA feature in Libvirt, does anyone propose supporting it in libvirt ? Thanks, Hailiang

2 1

[libvirt] [PATCH v2 0/3] Clean/fix test driver usage of FindBy{UUID|ID}
by John Ferlan 04 Apr '18

04 Apr '18

v1: https://www.redhat.com/archives/libvir-list/2018-March/msg00507.html e.g., part of a 20 patch series: https://www.redhat.com/archives/libvir-list/2018-March/msg00489.html Changes since v1: * Add patches 2 and 3 essentially... Doing the same ByIDRef as ByUUIDRef and fixing the ListRemove consumers to do the Lock. NB: The ByIDRef logic was formerly part of patch 20 - this just extracts it a bit to make it more orderly. John Ferlan (3): test: Use virDomainObjListFindByUUIDRef test: Use virDomainObjListFindByIDRef test: Need to relock afer virDomainObjListRemove src/test/test_driver.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) -- 2.13.6

2 7

[libvirt] [dbus PATCH 0/5] Introduce Network Interface
by Katerina Koukiou 04 Apr '18

04 Apr '18

This patchset introduces also some basic methods and properties for Network interface. More functionality will be added in following patchsets. New functions are covered by the test suite. Katerina Koukiou (5): Introduce Network Interface Implement ListNetworks method for Connect interface Implement virtDBusUtilVirNetworkFromBusPath helper function. Implement Name property for Network interface Implement NetworkLookupByName method for Connect interface data/Makefile.am | 3 +- data/org.libvirt.Connect.xml | 12 +++++ data/org.libvirt.Network.xml | 11 +++++ src/Makefile.am | 3 +- src/connect.c | 75 ++++++++++++++++++++++++++++++ src/connect.h | 1 + src/network.c | 107 +++++++++++++++++++++++++++++++++++++++++++ src/network.h | 9 ++++ src/util.c | 33 +++++++++++++ src/util.h | 15 ++++++ test/Makefile.am | 3 +- test/libvirttest.py | 12 +++++ test/test_connect.py | 11 +++++ 13 files changed, 292 insertions(+), 3 deletions(-) create mode 100644 data/org.libvirt.Network.xml create mode 100644 src/network.c create mode 100644 src/network.h -- 2.15.0

1 6

[libvirt] hash: failed on concurrent iterating.
by Zhangzijian 04 Apr '18

04 Apr '18

In function 'virHashForEach/virHashSearch', 'table->iterating' prevent concurrent iterating. But most caller evoke it, after hold a read lock. This will lead the second caller failed to iterate the table. So, the caller should hold a write lock, then iterate the table.

4 6

[libvirt] [PATCH] tests: utils: Fix out-of-bounds access to memory in virTestCompareToFile
by Peter Krempa 04 Apr '18

04 Apr '18

Similarly to 3506f1ecfde, the contents of 'cmpcontent' may be an empty string so the following code would access memory out of the array. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/testutils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index 4bd1b63755..7c095caac9 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -797,10 +797,11 @@ virTestCompareToFile(const char *strcontent, if (filecontent) { size_t filecontentLen = strlen(filecontent); + size_t cmpcontentLen = strlen(cmpcontent); if (filecontentLen > 0 && filecontent[filecontentLen - 1] == '\n' && - cmpcontent[strlen(cmpcontent) - 1] != '\n') { + (cmpcontentLen == 0 || cmpcontent[cmpcontentLen - 1] != '\n')) { if (virAsprintf(&fixedcontent, "%s\n", cmpcontent) < 0) goto failure; cmpcontent = fixedcontent; -- 2.16.2

2 1

[libvirt] [libvirt PATCH] qemu: Add support for specifying SPICE TLS ciphers
by Ján Tomko 04 Apr '18

04 Apr '18

From: Christophe Fergeau <cfergeau(a)redhat.com> This commit adds a 'spice_tls_ciphers' parameter in qemu.conf which allows to configure which TLS ciphers SPICE will be using for its TLS connections. https://bugzilla.redhat.com/show_bug.cgi?id=1562032 Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- This is mostly useful as a workaround for missing crypto policies, so I'm not sure if it's upstream material. Changes from the patch attached to the BZ: ciphers(2) -> ciphers(1) Added augeas changes and tests escape the string before passing it to QEMU src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 5 ++++ src/qemu/qemu_command.c | 8 +++++- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 + .../graphics-spice-sasl-ciphers.args | 29 ++++++++++++++++++++++ .../graphics-spice-sasl-ciphers.xml | 1 + tests/qemuxml2argvtest.c | 5 ++++ 9 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args create mode 120000 tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index c19bf3a43..15222d7e3 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -44,6 +44,7 @@ module Libvirtd_qemu = let spice_entry = str_entry "spice_listen" | bool_entry "spice_tls" | str_entry "spice_tls_x509_cert_dir" + | str_entry "spice_tls_ciphers" | bool_entry "spice_auto_unix_socket" | str_entry "spice_password" | bool_entry "spice_sasl" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 07eab7eff..1d7b6c555 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -181,6 +181,11 @@ #spice_tls_x509_cert_dir = "/etc/pki/libvirt-spice" +# The ciphers used by spice can be overridden here. This is an OpenSSL cipher +# list as documented in ciphers(1) +#spice_tls_ciphers = "DEFAULT" + + # Enable this option to have SPICE served over an automatically created # unix socket. This prevents unprivileged access from users on the # host machine. diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 682d71441..adf0b2cb9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8028,8 +8028,14 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, !cfg->spicePassword) virBufferAddLit(&opt, "disable-ticketing,"); - if (hasSecure) + if (hasSecure) { virBufferAsprintf(&opt, "x509-dir=%s,", cfg->spiceTLSx509certdir); + if (cfg->spiceTLSCiphers) { + virBufferAddLit(&opt, "tls-ciphers="); + virQEMUBuildBufferEscapeComma(&opt, cfg->spiceTLSCiphers); + virBufferAddLit(&opt, ","); + } + } switch (graphics->data.spice.defaultMode) { case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 36cf3a281..92afd252d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -374,6 +374,7 @@ static void virQEMUDriverConfigDispose(void *obj) VIR_FREE(cfg->vncSASLdir); VIR_FREE(cfg->spiceTLSx509certdir); + VIR_FREE(cfg->spiceTLSCiphers); VIR_FREE(cfg->spiceListen); VIR_FREE(cfg->spicePassword); VIR_FREE(cfg->spiceSASLdir); @@ -550,6 +551,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; if (virConfGetValueString(conf, "spice_tls_x509_cert_dir", &cfg->spiceTLSx509certdir) < 0) goto cleanup; + if (virConfGetValueString(conf, "spice_tls_ciphers", &cfg->spiceTLSCiphers) < 0) + goto cleanup; if (virConfGetValueBool(conf, "spice_sasl", &cfg->spiceSASL) < 0) goto cleanup; if (virConfGetValueString(conf, "spice_sasl_dir", &cfg->spiceSASLdir) < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index e1ad5463f..9ab9f4e37 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -128,6 +128,7 @@ struct _virQEMUDriverConfig { bool spiceTLS; char *spiceTLSx509certdir; + char *spiceTLSCiphers; bool spiceSASL; char *spiceSASLdir; char *spiceListen; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 688e5b9fd..2f62b383e 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -17,6 +17,7 @@ module Test_libvirtd_qemu = { "spice_listen" = "0.0.0.0" } { "spice_tls" = "1" } { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" } +{ "spice_tls_ciphers" = "DEFAULT" } { "spice_auto_unix_socket" = "1" } { "spice_password" = "XYZ12345" } { "spice_sasl" = "1" } diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args new file mode 100644 index 000000000..2f608ad7c --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args @@ -0,0 +1,29 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +SASL_CONF_PATH=/root/.sasl2 \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,sasl,\ +x509-dir=/etc/pki/libvirt-spice,tls-ciphers=DEFAULT,tls-channel=default \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml new file mode 120000 index 000000000..1bfac9efa --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml @@ -0,0 +1 @@ +graphics-spice-sasl.xml \ No newline at end of file diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 308d71f72..29f702c5c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1126,6 +1126,11 @@ mymain(void) DO_TEST("graphics-spice-sasl", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_QXL); + ignore_value(VIR_STRDUP(driver.config->spiceTLSCiphers, "DEFAULT")); + DO_TEST("graphics-spice-sasl-ciphers", + QEMU_CAPS_SPICE, + QEMU_CAPS_DEVICE_QXL); + VIR_FREE(driver.config->spiceTLSCiphers); VIR_FREE(driver.config->spiceSASLdir); driver.config->spiceSASL = 0; DO_TEST("graphics-spice-agentmouse", -- 2.13.6

4 3

[libvirt] [PATCH 00/44] Require QEMU 1.3.0 or newer
by Ján Tomko 03 Apr '18

03 Apr '18

It's been a while since we last bumped the minimum QEMU version. Let's get rid of -help parsing and bring our test suite closer to real world usage by implying lots of capabilities. Ján Tomko (44): qemuxml2argvtest: Fix q35-virt-manager capabilities Delete bogus cpu-host-passthrough test Force QMP capability probing Require QEMU 1.3.0 Deprecate QEMU_CAPS_PCI_MULTIFUNCTION Deprecate QEMU_CAPS_NETDEV Clean up qemuDomainAttachNetDevice Remove unused qemuDomainNetVLAN Remove qemuDomainSupportsNetdev Deprecate QEMU_CAPS_MONITOR_JSON Deprecate QEMU_CAPS_NO_USER_CONFIG Deprecate QEMU_CAPS_MEM_PATH Deprecate QEMU_CAPS_DRIVE_SERIAL Deprecate QEMU_CAPS_SDL Deprecate QEMU_CAPS_RTC Deprecate QEMU_CAPS_RTC_TD_HACK Deprecate QEMU_CAPS_VHOST_NET Deprecate QEMU_CAPS_NODEFCONFIG Deprecate QEMU_CAPS_BOOT_MENU Deprecate QEMU_CAPS_FSDEV Deprecate QEMU_CAPS_NAME_PROCESS Deprecate QEMU_CAPS_SMBIOS_TYPE Deprecate QEMU_CAPS_VGA_NONE Deprecate QEMU_CAPS_DRIVE_AIO Deprecate QEMU_CAPS_CHARDEV_SPICEVMC Deprecate QEMU_CAPS_DEVICE_SPICEVMC Deprecate QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC Deprecate QEMU_CAPS_NO_SHUTDOWN Deprecate QEMU_CAPS_DRIVE_CACHE_UNSAFE Deprecate QEMU_CAPS_FSDEV_READONLY Deprecate QEMU_CAPS_DRIVE_COPY_ON_READ Deprecate QEMU_CAPS_FSDEV_WRITEOUT Deprecate QEMU_CAPS_DRIVE_IOTUNE Deprecate QEMU_CAPS_WAKEUP Deprecate QEMU_CAPS_NETDEV_BRIDGE Deprecate QEMU_CAPS_SECCOMP_SANDBOX Deprecate QEMU_CAPS_DTB Deprecate QEMU_CAPS_IPV6_MIGRATION Deprecate QEMU_CAPS_MACHINE_OPT Deprecate QEMU_CAPS_DUMP_GUEST_CORE Deprecate QEMU_CAPS_VNC_SHARE_POLICY Deprecate QEMU_CAPS_HOST_PCI_MULTIDOMAIN Deprecate QEMU_CAPS_DISPLAY Deprecate QEMU_CAPS_MACHINE_USB_OPT cfg.mk | 2 +- src/qemu/qemu_capabilities.c | 931 +--------- src/qemu/qemu_capabilities.h | 74 +- src/qemu/qemu_capspriv.h | 17 +- src/qemu/qemu_command.c | 690 +++---- src/qemu/qemu_domain.c | 16 - src/qemu/qemu_domain.h | 6 - src/qemu/qemu_driver.c | 48 +- src/qemu/qemu_hotplug.c | 147 +- src/qemu/qemu_interface.c | 4 +- src/qemu/qemu_interface.h | 1 - src/qemu/qemu_migration.c | 10 +- src/qemu/qemu_process.c | 23 +- tests/Makefile.am | 8 +- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 1886 -------------------- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 172 -- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 35 - tests/qemucapabilitiestest.c | 1 - tests/qemucapsprobe.c | 2 +- tests/qemuhelpdata/qemu-0.12.1 | 198 -- tests/qemuhelpdata/qemu-0.12.1-device | 62 - tests/qemuhelpdata/qemu-1.0 | 253 --- tests/qemuhelpdata/qemu-1.0-device | 148 -- tests/qemuhelpdata/qemu-1.1.0 | 269 --- tests/qemuhelpdata/qemu-1.1.0-device | 170 -- tests/qemuhelpdata/qemu-1.2.0 | 272 --- tests/qemuhelpdata/qemu-kvm-0.12.3 | 215 --- tests/qemuhelpdata/qemu-kvm-0.12.3-device | 63 - tests/qemuhelpdata/qemu-kvm-0.13.0 | 242 --- tests/qemuhelpdata/qemu-kvm-0.13.0-device | 90 - tests/qemuhelpdata/qemu-kvm-1.2.0 | 277 --- tests/qemuhelptest.c | 437 ----- .../aarch64-aavmf-virtio-mmio.args | 14 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 9 +- .../qemuxml2argvdata/aarch64-cpu-passthrough.args | 10 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 9 +- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 9 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 9 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 9 +- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 14 +- tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 9 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 9 +- tests/qemuxml2argvdata/aarch64-pci-serial.args | 10 +- .../aarch64-usb-controller-nec-xhci.args | 9 +- .../aarch64-usb-controller-qemu-xhci.args | 9 +- tests/qemuxml2argvdata/aarch64-video-default.args | 8 +- .../aarch64-video-virtio-gpu-pci.args | 16 +- .../aarch64-virt-2.6-virtio-pci-default.args | 15 +- .../qemuxml2argvdata/aarch64-virt-default-nic.args | 14 +- tests/qemuxml2argvdata/aarch64-virt-virtio.args | 14 +- .../aarch64-virtio-pci-default.args | 15 +- .../aarch64-virtio-pci-manual-addresses.args | 20 +- tests/qemuxml2argvdata/acpi-table.args | 9 +- tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 10 +- tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 10 +- tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 14 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 14 +- tests/qemuxml2argvdata/autoindex.args | 9 +- tests/qemuxml2argvdata/balloon-ccw-deflate.args | 10 +- tests/qemuxml2argvdata/balloon-device-auto.args | 10 +- .../balloon-device-deflate-off.args | 10 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 10 +- tests/qemuxml2argvdata/balloon-device-period.args | 10 +- tests/qemuxml2argvdata/balloon-device.args | 10 +- tests/qemuxml2argvdata/balloon-mmio-deflate.args | 10 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 11 +- tests/qemuxml2argvdata/bios-nvram.args | 11 +- tests/qemuxml2argvdata/bios.args | 11 +- tests/qemuxml2argvdata/blkdeviotune-group-num.args | 9 +- .../qemuxml2argvdata/blkdeviotune-max-length.args | 9 +- tests/qemuxml2argvdata/blkdeviotune-max.args | 9 +- tests/qemuxml2argvdata/blkdeviotune.args | 9 +- tests/qemuxml2argvdata/blkiotune-device.args | 9 +- tests/qemuxml2argvdata/blkiotune.args | 9 +- tests/qemuxml2argvdata/boot-cdrom.args | 9 +- tests/qemuxml2argvdata/boot-complex-bootindex.args | 20 +- tests/qemuxml2argvdata/boot-complex.args | 19 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 9 +- tests/qemuxml2argvdata/boot-floppy.args | 9 +- .../boot-menu-disable-drive-bootindex.args | 9 +- .../qemuxml2argvdata/boot-menu-disable-drive.args | 9 +- tests/qemuxml2argvdata/boot-menu-disable.args | 9 +- .../boot-menu-enable-bootindex.args | 9 +- .../boot-menu-enable-with-timeout.args | 9 +- tests/qemuxml2argvdata/boot-menu-enable.args | 9 +- tests/qemuxml2argvdata/boot-multi.args | 9 +- tests/qemuxml2argvdata/boot-network.args | 9 +- tests/qemuxml2argvdata/boot-order.args | 15 +- tests/qemuxml2argvdata/boot-strict.args | 20 +- tests/qemuxml2argvdata/bootindex-floppy-q35.args | 9 +- tests/qemuxml2argvdata/channel-guestfwd.args | 10 +- tests/qemuxml2argvdata/channel-spicevmc-old.args | 29 - tests/qemuxml2argvdata/channel-spicevmc-old.xml | 35 - tests/qemuxml2argvdata/channel-spicevmc.args | 8 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 10 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 10 +- .../channel-virtio-autoassign.args | 10 +- tests/qemuxml2argvdata/channel-virtio-default.args | 10 +- tests/qemuxml2argvdata/channel-virtio-state.args | 10 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 10 +- tests/qemuxml2argvdata/channel-virtio.args | 10 +- tests/qemuxml2argvdata/chardev-reconnect.args | 10 +- tests/qemuxml2argvdata/clock-catchup.args | 8 +- tests/qemuxml2argvdata/clock-france.args | 8 +- tests/qemuxml2argvdata/clock-hpet-off.args | 8 +- .../clock-localtime-basis-localtime.args | 8 +- tests/qemuxml2argvdata/clock-localtime.args | 10 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 9 +- tests/qemuxml2argvdata/clock-utc.args | 10 +- tests/qemuxml2argvdata/clock-variable.args | 8 +- tests/qemuxml2argvdata/console-compat-auto.args | 9 +- tests/qemuxml2argvdata/console-compat-chardev.args | 10 +- tests/qemuxml2argvdata/console-compat.args | 9 +- tests/qemuxml2argvdata/console-sclp.args | 10 +- tests/qemuxml2argvdata/console-virtio-ccw.args | 10 +- tests/qemuxml2argvdata/console-virtio-many.args | 10 +- tests/qemuxml2argvdata/console-virtio-s390.args | 10 +- tests/qemuxml2argvdata/console-virtio.args | 10 +- tests/qemuxml2argvdata/controller-order.args | 13 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 9 +- tests/qemuxml2argvdata/cpu-Haswell.args | 9 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 9 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 9 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 9 +- tests/qemuxml2argvdata/cpu-cache-disable2.args | 9 +- tests/qemuxml2argvdata/cpu-cache-disable3.args | 9 +- tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 9 +- tests/qemuxml2argvdata/cpu-cache-passthrough.args | 9 +- tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 9 +- tests/qemuxml2argvdata/cpu-check-default-none.args | 9 +- .../qemuxml2argvdata/cpu-check-default-none2.args | 9 +- .../cpu-check-default-partial.args | 9 +- .../cpu-check-default-partial2.args | 9 +- tests/qemuxml2argvdata/cpu-check-none.args | 9 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 9 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 9 +- tests/qemuxml2argvdata/cpu-exact1.args | 9 +- tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 9 +- tests/qemuxml2argvdata/cpu-exact2.args | 9 +- tests/qemuxml2argvdata/cpu-fallback.args | 9 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 10 +- tests/qemuxml2argvdata/cpu-host-model-cmt.args | 9 +- .../qemuxml2argvdata/cpu-host-model-fallback.args | 9 +- tests/qemuxml2argvdata/cpu-host-model-vendor.args | 9 +- tests/qemuxml2argvdata/cpu-host-model.args | 9 +- .../cpu-host-passthrough-features.args | 9 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 9 +- tests/qemuxml2argvdata/cpu-hotplug-startup.args | 9 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 10 +- tests/qemuxml2argvdata/cpu-minimum1.args | 9 +- tests/qemuxml2argvdata/cpu-minimum2.args | 9 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 9 +- tests/qemuxml2argvdata/cpu-numa-memshared.args | 9 +- .../cpu-numa-no-memory-element.args | 9 +- tests/qemuxml2argvdata/cpu-numa1.args | 9 +- tests/qemuxml2argvdata/cpu-numa2.args | 9 +- tests/qemuxml2argvdata/cpu-s390-features.args | 9 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 9 +- tests/qemuxml2argvdata/cpu-strict1.args | 9 +- tests/qemuxml2argvdata/cpu-topology1.args | 9 +- tests/qemuxml2argvdata/cpu-topology2.args | 9 +- tests/qemuxml2argvdata/cpu-topology3.args | 9 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 9 +- tests/qemuxml2argvdata/cputune-numatune.args | 9 +- tests/qemuxml2argvdata/cputune-zero-shares.args | 9 +- tests/qemuxml2argvdata/cputune.args | 9 +- tests/qemuxml2argvdata/debug-threads.args | 9 +- tests/qemuxml2argvdata/default-kvm-host-arch.args | 9 +- tests/qemuxml2argvdata/default-qemu-host-arch.args | 9 +- tests/qemuxml2argvdata/disk-aio.args | 9 +- tests/qemuxml2argvdata/disk-blockio.args | 10 +- tests/qemuxml2argvdata/disk-cdrom-empty.args | 9 +- tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-ftps.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-http.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-https.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-tftp.args | 9 +- .../disk-cdrom-tray-no-device-cap.args | 9 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 11 +- tests/qemuxml2argvdata/disk-cdrom.args | 9 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 17 +- tests/qemuxml2argvdata/disk-drive-boot-cdrom.args | 9 +- tests/qemuxml2argvdata/disk-drive-boot-disk.args | 9 +- .../disk-drive-cache-directsync.args | 9 +- .../qemuxml2argvdata/disk-drive-cache-unsafe.args | 9 +- .../qemuxml2argvdata/disk-drive-cache-v2-none.args | 9 +- tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args | 9 +- tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args | 9 +- .../qemuxml2argvdata/disk-drive-copy-on-read.args | 9 +- .../qemuxml2argvdata/disk-drive-detect-zeroes.args | 11 +- tests/qemuxml2argvdata/disk-drive-discard.args | 11 +- .../disk-drive-error-policy-enospace.args | 7 +- .../disk-drive-error-policy-stop.args | 7 +- .../disk-drive-error-policy-wreport-rignore.args | 7 +- tests/qemuxml2argvdata/disk-drive-fmt-qcow.args | 9 +- .../disk-drive-network-gluster.args | 9 +- .../disk-drive-network-iscsi-auth.args | 9 +- .../disk-drive-network-iscsi-lun.args | 10 +- .../qemuxml2argvdata/disk-drive-network-iscsi.args | 9 +- .../disk-drive-network-nbd-export.args | 9 +- .../disk-drive-network-nbd-ipv6-export.args | 9 +- .../disk-drive-network-nbd-ipv6.args | 9 +- .../disk-drive-network-nbd-unix.args | 9 +- tests/qemuxml2argvdata/disk-drive-network-nbd.args | 9 +- .../disk-drive-network-rbd-auth-AES.args | 9 +- .../disk-drive-network-rbd-auth.args | 9 +- .../disk-drive-network-rbd-ipv6.args | 9 +- tests/qemuxml2argvdata/disk-drive-network-rbd.args | 9 +- .../disk-drive-network-sheepdog.args | 9 +- .../disk-drive-network-source-auth.args | 9 +- .../disk-drive-network-tlsx509-vxhs.args | 15 +- .../qemuxml2argvdata/disk-drive-network-vxhs.args | 11 +- tests/qemuxml2argvdata/disk-drive-no-boot.args | 9 +- .../qemuxml2argvdata/disk-drive-readonly-disk.args | 10 +- .../disk-drive-readonly-no-device.args | 10 +- .../disk-drive-shared-locking.args | 9 +- tests/qemuxml2argvdata/disk-drive-shared.args | 9 +- .../disk-floppy-tray-no-device-cap.args | 9 +- tests/qemuxml2argvdata/disk-floppy-tray.args | 9 +- tests/qemuxml2argvdata/disk-floppy.args | 9 +- tests/qemuxml2argvdata/disk-geometry.args | 9 +- .../disk-hostdev-scsi-virtio-iscsi-auth-AES.args | 9 +- tests/qemuxml2argvdata/disk-ide-drive-split.args | 10 +- tests/qemuxml2argvdata/disk-ide-wwn.args | 9 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 15 +- tests/qemuxml2argvdata/disk-iscsi.args | 9 +- .../qemuxml2argvdata/disk-many-format-probing.args | 9 +- tests/qemuxml2argvdata/disk-many.args | 9 +- tests/qemuxml2argvdata/disk-order.args | 9 +- tests/qemuxml2argvdata/disk-sata-device.args | 10 +- tests/qemuxml2argvdata/disk-scsi-device-auto.args | 10 +- tests/qemuxml2argvdata/disk-scsi-device.args | 10 +- tests/qemuxml2argvdata/disk-scsi-disk-split.args | 10 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 10 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 12 +- .../disk-scsi-lun-passthrough.args | 9 +- tests/qemuxml2argvdata/disk-scsi-megasas.args | 10 +- tests/qemuxml2argvdata/disk-scsi-mptsas1068.args | 10 +- tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args | 10 +- tests/qemuxml2argvdata/disk-scsi-vscsi.args | 10 +- tests/qemuxml2argvdata/disk-serial.args | 9 +- tests/qemuxml2argvdata/disk-snapshot.args | 9 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 10 +- tests/qemuxml2argvdata/disk-source-pool.args | 10 +- .../disk-usb-device-removable.args | 10 +- tests/qemuxml2argvdata/disk-usb-device.args | 10 +- tests/qemuxml2argvdata/disk-virtio-ccw-many.args | 9 +- tests/qemuxml2argvdata/disk-virtio-ccw.args | 9 +- .../qemuxml2argvdata/disk-virtio-drive-queues.args | 9 +- tests/qemuxml2argvdata/disk-virtio-s390.args | 9 +- tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args | 9 +- .../disk-virtio-scsi-cmd_per_lun.args | 10 +- .../disk-virtio-scsi-ioeventfd.args | 10 +- .../disk-virtio-scsi-max_sectors.args | 10 +- .../disk-virtio-scsi-num_queues.args | 10 +- tests/qemuxml2argvdata/disk-virtio.args | 9 +- tests/qemuxml2argvdata/encrypted-disk-usage.args | 9 +- tests/qemuxml2argvdata/encrypted-disk.args | 9 +- tests/qemuxml2argvdata/eoi-disabled.args | 9 +- tests/qemuxml2argvdata/eoi-enabled.args | 9 +- tests/qemuxml2argvdata/event_idx.args | 17 +- .../fd-memory-no-numa-topology.args | 9 +- .../qemuxml2argvdata/fd-memory-numa-topology.args | 9 +- .../qemuxml2argvdata/fd-memory-numa-topology2.args | 9 +- .../qemuxml2argvdata/fd-memory-numa-topology3.args | 9 +- tests/qemuxml2argvdata/fips-enabled.args | 9 +- tests/qemuxml2argvdata/floppy-drive-fat.args | 9 +- tests/qemuxml2argvdata/fs9p-ccw.args | 10 +- tests/qemuxml2argvdata/fs9p.args | 10 +- .../qemuxml2argvdata/graphics-sdl-fullscreen.args | 7 +- tests/qemuxml2argvdata/graphics-sdl.args | 7 +- .../graphics-spice-agent-file-xfer.args | 7 +- .../graphics-spice-agentmouse.args | 8 +- .../graphics-spice-auto-socket-cfg.args | 7 +- .../graphics-spice-auto-socket.args | 7 +- .../graphics-spice-compression.args | 7 +- tests/qemuxml2argvdata/graphics-spice-no-args.args | 7 +- tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 7 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 7 +- tests/qemuxml2argvdata/graphics-spice-socket.args | 7 +- tests/qemuxml2argvdata/graphics-spice-timeout.args | 14 +- .../qemuxml2argvdata/graphics-spice-usb-redir.args | 8 +- tests/qemuxml2argvdata/graphics-spice.args | 7 +- .../graphics-vnc-auto-socket-cfg.args | 7 +- .../qemuxml2argvdata/graphics-vnc-auto-socket.args | 7 +- .../graphics-vnc-no-listen-attr.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-none.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-policy.args | 7 +- .../graphics-vnc-remove-generated-socket.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 7 +- .../graphics-vnc-socket-new-cmdline.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-socket.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-tls.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-websocket.args | 7 +- tests/qemuxml2argvdata/graphics-vnc.args | 7 +- .../qemuxml2argvdata/hostdev-mdev-precreated.args | 10 +- .../hostdev-pci-address-device.args | 10 +- tests/qemuxml2argvdata/hostdev-pci-address.args | 9 +- .../hostdev-scsi-lsi-iscsi-auth.args | 9 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args | 9 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 9 +- tests/qemuxml2argvdata/hostdev-scsi-readonly.args | 9 +- .../hostdev-scsi-vhost-scsi-ccw.args | 9 +- .../hostdev-scsi-vhost-scsi-pci.args | 9 +- .../hostdev-scsi-vhost-scsi-pcie.args | 9 +- .../hostdev-scsi-virtio-iscsi-auth.args | 9 +- .../hostdev-scsi-virtio-iscsi.args | 9 +- .../qemuxml2argvdata/hostdev-scsi-virtio-scsi.args | 9 +- .../hostdev-usb-address-device-boot.args | 10 +- .../hostdev-usb-address-device.args | 10 +- tests/qemuxml2argvdata/hostdev-usb-address.args | 9 +- .../qemuxml2argvdata/hostdev-vfio-multidomain.args | 10 +- tests/qemuxml2argvdata/hostdev-vfio.args | 10 +- tests/qemuxml2argvdata/hotplug-base.args | 9 +- tests/qemuxml2argvdata/hugepages-memaccess.args | 9 +- tests/qemuxml2argvdata/hugepages-memaccess2.args | 9 +- tests/qemuxml2argvdata/hugepages-numa.args | 6 +- tests/qemuxml2argvdata/hugepages-pages.args | 9 +- tests/qemuxml2argvdata/hugepages-pages2.args | 9 +- tests/qemuxml2argvdata/hugepages-pages3.args | 9 +- tests/qemuxml2argvdata/hugepages-pages5.args | 9 +- tests/qemuxml2argvdata/hugepages-pages6.args | 9 +- tests/qemuxml2argvdata/hugepages-pages7.args | 9 +- tests/qemuxml2argvdata/hugepages-shared.args | 9 +- tests/qemuxml2argvdata/hugepages.args | 9 +- tests/qemuxml2argvdata/hyperv-off.args | 9 +- tests/qemuxml2argvdata/hyperv-panic.args | 9 +- tests/qemuxml2argvdata/hyperv.args | 9 +- tests/qemuxml2argvdata/input-usbmouse-addr.args | 10 +- tests/qemuxml2argvdata/input-usbmouse.args | 9 +- tests/qemuxml2argvdata/input-usbtablet.args | 9 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 9 +- .../qemuxml2argvdata/intel-iommu-caching-mode.args | 14 +- .../qemuxml2argvdata/intel-iommu-device-iotlb.args | 9 +- tests/qemuxml2argvdata/intel-iommu-eim.args | 9 +- tests/qemuxml2argvdata/intel-iommu-machine.args | 9 +- tests/qemuxml2argvdata/intel-iommu.args | 9 +- .../iothreads-disk-virtio-ccw.args | 9 +- tests/qemuxml2argvdata/iothreads-disk.args | 9 +- tests/qemuxml2argvdata/iothreads-ids-partial.args | 9 +- tests/qemuxml2argvdata/iothreads-ids.args | 9 +- .../iothreads-virtio-scsi-ccw.args | 9 +- .../iothreads-virtio-scsi-pci.args | 9 +- tests/qemuxml2argvdata/iothreads.args | 9 +- tests/qemuxml2argvdata/kvm-features-off.args | 9 +- tests/qemuxml2argvdata/kvm-features.args | 9 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 9 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 9 +- tests/qemuxml2argvdata/kvm.args | 9 +- tests/qemuxml2argvdata/kvmclock+eoi-disabled.args | 9 +- tests/qemuxml2argvdata/kvmclock.args | 9 +- tests/qemuxml2argvdata/luks-disks-source.args | 9 +- tests/qemuxml2argvdata/luks-disks.args | 9 +- .../qemuxml2argvdata/mach-virt-console-virtio.args | 10 +- .../qemuxml2argvdata/mach-virt-serial-native.args | 10 +- tests/qemuxml2argvdata/mach-virt-serial-pci.args | 10 +- tests/qemuxml2argvdata/mach-virt-serial-usb.args | 10 +- .../machine-aeskeywrap-off-cap.args | 10 +- .../machine-aeskeywrap-off-caps.args | 10 +- .../machine-aeskeywrap-on-cap.args | 9 +- .../machine-aeskeywrap-on-caps.args | 9 +- tests/qemuxml2argvdata/machine-aliases1.args | 9 +- tests/qemuxml2argvdata/machine-aliases2.args | 9 +- tests/qemuxml2argvdata/machine-core-cfg-off.args | 9 +- tests/qemuxml2argvdata/machine-core-off.args | 9 +- tests/qemuxml2argvdata/machine-core-on.args | 9 +- .../machine-deakeywrap-off-cap.args | 10 +- .../machine-deakeywrap-off-caps.args | 10 +- .../machine-deakeywrap-on-cap.args | 9 +- .../machine-deakeywrap-on-caps.args | 9 +- .../machine-keywrap-none-caps.args | 9 +- tests/qemuxml2argvdata/machine-keywrap-none.args | 9 +- .../machine-loadparm-multiple-disks-nets-s390.args | 21 +- .../machine-loadparm-net-s390.args | 15 +- tests/qemuxml2argvdata/machine-loadparm-s390.args | 9 +- tests/qemuxml2argvdata/machine-smm-opt.args | 9 +- tests/qemuxml2argvdata/machine-usb-opt.args | 9 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 9 +- tests/qemuxml2argvdata/master-key.args | 9 +- .../qemuxml2argvdata/memory-hotplug-dimm-addr.args | 9 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 9 +- .../memory-hotplug-nvdimm-access.args | 9 +- .../memory-hotplug-nvdimm-label.args | 9 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm.args | 9 +- .../memory-hotplug-ppc64-nonuma.args | 9 +- tests/qemuxml2argvdata/memory-hotplug.args | 9 +- tests/qemuxml2argvdata/memtune-unlimited.args | 9 +- tests/qemuxml2argvdata/memtune.args | 9 +- tests/qemuxml2argvdata/migrate-numa-unaligned.args | 9 +- tests/qemuxml2argvdata/migrate.args | 9 +- tests/qemuxml2argvdata/minimal-msg-timestamp.args | 9 +- tests/qemuxml2argvdata/minimal.args | 9 +- tests/qemuxml2argvdata/misc-acpi.args | 9 +- tests/qemuxml2argvdata/misc-disable-s3.args | 9 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 9 +- tests/qemuxml2argvdata/misc-enable-s4.args | 9 +- tests/qemuxml2argvdata/misc-no-reboot.args | 8 +- tests/qemuxml2argvdata/misc-uuid.args | 9 +- tests/qemuxml2argvdata/mlock-off.args | 9 +- tests/qemuxml2argvdata/mlock-on.args | 9 +- tests/qemuxml2argvdata/mlock-unsupported.args | 9 +- tests/qemuxml2argvdata/monitor-json.args | 8 +- .../qemuxml2argvdata/multifunction-pci-device.args | 10 +- tests/qemuxml2argvdata/name-escape.args | 7 +- tests/qemuxml2argvdata/net-client.args | 14 +- tests/qemuxml2argvdata/net-eth-hostip.args | 14 +- tests/qemuxml2argvdata/net-eth-ifname.args | 14 +- tests/qemuxml2argvdata/net-eth-names.args | 18 +- tests/qemuxml2argvdata/net-eth.args | 14 +- .../qemuxml2argvdata/net-hostdev-multidomain.args | 10 +- .../net-hostdev-vfio-multidomain.args | 10 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 10 +- tests/qemuxml2argvdata/net-hostdev.args | 10 +- tests/qemuxml2argvdata/net-mcast.args | 14 +- tests/qemuxml2argvdata/net-server.args | 14 +- tests/qemuxml2argvdata/net-udp.args | 15 +- tests/qemuxml2argvdata/net-user-addr.args | 9 +- tests/qemuxml2argvdata/net-user.args | 14 +- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 9 +- tests/qemuxml2argvdata/net-vhostuser.args | 9 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 19 +- tests/qemuxml2argvdata/net-virtio-device.args | 16 +- .../net-virtio-disable-offloads.args | 14 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 10 +- .../qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 15 +- tests/qemuxml2argvdata/net-virtio-s390.args | 13 +- tests/qemuxml2argvdata/net-virtio.args | 14 +- tests/qemuxml2argvdata/no-kvm-pit-device.args | 9 +- tests/qemuxml2argvdata/no-shutdown.args | 7 +- tests/qemuxml2argvdata/nographics-display.args | 7 +- tests/qemuxml2argvdata/nographics-vga.args | 9 +- tests/qemuxml2argvdata/nographics.args | 9 +- tests/qemuxml2argvdata/nosharepages.args | 9 +- .../numad-auto-memory-vcpu-cpuset.args | 9 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 9 +- .../numad-auto-vcpu-static-numatune.args | 9 +- .../numad-static-memory-auto-vcpu.args | 9 +- tests/qemuxml2argvdata/numad.args | 9 +- .../numatune-auto-nodeset-invalid.args | 9 +- tests/qemuxml2argvdata/numatune-auto-prefer.args | 9 +- tests/qemuxml2argvdata/numatune-distances.args | 9 +- .../numatune-memnode-no-memory.args | 9 +- tests/qemuxml2argvdata/numatune-memnode.args | 9 +- tests/qemuxml2argvdata/numatune-memory.args | 9 +- tests/qemuxml2argvdata/panic-double.args | 10 +- tests/qemuxml2argvdata/panic-no-address.args | 10 +- tests/qemuxml2argvdata/panic.args | 10 +- .../qemuxml2argvdata/parallel-parport-chardev.args | 10 +- tests/qemuxml2argvdata/parallel-tcp-chardev.args | 10 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 9 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 9 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 9 +- tests/qemuxml2argvdata/pci-bridge-many-disks.args | 9 +- tests/qemuxml2argvdata/pci-bridge.args | 158 +- tests/qemuxml2argvdata/pci-expander-bus.args | 160 +- tests/qemuxml2argvdata/pci-many.args | 9 +- tests/qemuxml2argvdata/pci-rom.args | 22 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 10 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 164 +- .../pcie-root-port-model-generic.args | 9 +- .../pcie-root-port-model-ioh3420.args | 9 +- tests/qemuxml2argvdata/pcie-root-port.args | 9 +- tests/qemuxml2argvdata/pcie-root.args | 9 +- .../pcie-switch-downstream-port.args | 9 +- .../pcie-switch-upstream-port.args | 9 +- tests/qemuxml2argvdata/pcihole64-q35.args | 9 +- tests/qemuxml2argvdata/pcihole64.args | 9 +- tests/qemuxml2argvdata/pmu-feature-off.args | 9 +- tests/qemuxml2argvdata/pmu-feature.args | 9 +- tests/qemuxml2argvdata/ppc-dtb.args | 9 +- .../ppc64-usb-controller-legacy.args | 9 +- .../ppc64-usb-controller-qemu-xhci.args | 9 +- tests/qemuxml2argvdata/ppc64-usb-controller.args | 9 +- tests/qemuxml2argvdata/ppce500-serial.args | 9 +- tests/qemuxml2argvdata/pseries-basic.args | 10 +- tests/qemuxml2argvdata/pseries-console-virtio.args | 10 +- .../pseries-cpu-compat-power9.args | 10 +- tests/qemuxml2argvdata/pseries-cpu-compat.args | 10 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 10 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 10 +- tests/qemuxml2argvdata/pseries-features.args | 9 +- tests/qemuxml2argvdata/pseries-hostdevs-1.args | 10 +- tests/qemuxml2argvdata/pseries-hostdevs-2.args | 10 +- tests/qemuxml2argvdata/pseries-hostdevs-3.args | 10 +- .../pseries-machine-max-cpu-compat.args | 10 +- tests/qemuxml2argvdata/pseries-many-buses-1.args | 10 +- tests/qemuxml2argvdata/pseries-many-buses-2.args | 10 +- tests/qemuxml2argvdata/pseries-many-devices.args | 10 +- tests/qemuxml2argvdata/pseries-nvram.args | 9 +- tests/qemuxml2argvdata/pseries-panic-missing.args | 10 +- .../qemuxml2argvdata/pseries-panic-no-address.args | 10 +- .../pseries-phb-default-missing.args | 10 +- tests/qemuxml2argvdata/pseries-phb-numa-node.args | 9 +- tests/qemuxml2argvdata/pseries-phb-simple.args | 10 +- tests/qemuxml2argvdata/pseries-serial-native.args | 10 +- tests/qemuxml2argvdata/pseries-serial-pci.args | 10 +- tests/qemuxml2argvdata/pseries-serial-usb.args | 10 +- tests/qemuxml2argvdata/pseries-usb-default.args | 10 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 10 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 10 +- .../pseries-vio-user-assigned.args | 10 +- tests/qemuxml2argvdata/pseries-vio.args | 10 +- tests/qemuxml2argvdata/pv-spinlock-disabled.args | 9 +- tests/qemuxml2argvdata/pv-spinlock-enabled.args | 9 +- tests/qemuxml2argvdata/q35-acpi-nouefi.args | 9 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 9 +- .../qemuxml2argvdata/q35-default-devices-only.args | 9 +- tests/qemuxml2argvdata/q35-multifunction.args | 9 +- tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 9 +- tests/qemuxml2argvdata/q35-pci-force-address.args | 14 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 9 +- tests/qemuxml2argvdata/q35-pcie.args | 9 +- .../qemuxml2argvdata/q35-pm-disable-fallback.args | 9 +- tests/qemuxml2argvdata/q35-pm-disable.args | 9 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 9 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 9 +- tests/qemuxml2argvdata/q35-usb2.args | 9 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 6 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 9 +- tests/qemuxml2argvdata/q35.args | 9 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 9 +- .../qemuxml2argvdata/qemu-ns-commandline-ns0.args | 9 +- .../qemuxml2argvdata/qemu-ns-commandline-ns1.args | 9 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 9 +- .../qemu-ns-domain-commandline-ns0.args | 9 +- .../qemu-ns-domain-commandline.args | 9 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 9 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 9 +- tests/qemuxml2argvdata/qemu-ns.args | 9 +- .../qemuxml2argvdata/reboot-timeout-disabled.args | 9 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 9 +- tests/qemuxml2argvdata/restore-v2-fd.args | 9 +- tests/qemuxml2argvdata/restore-v2.args | 9 +- .../s390-allow-bogus-usb-controller.args | 10 +- .../s390-allow-bogus-usb-none.args | 10 +- tests/qemuxml2argvdata/s390-panic-missing.args | 10 +- tests/qemuxml2argvdata/s390-panic-no-address.args | 10 +- tests/qemuxml2argvdata/s390-serial-2.args | 10 +- tests/qemuxml2argvdata/s390-serial-console.args | 10 +- tests/qemuxml2argvdata/s390-serial.args | 10 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 9 +- .../seclabel-dynamic-baselabel.args | 9 +- .../seclabel-dynamic-labelskip.args | 9 +- .../seclabel-dynamic-override.args | 9 +- .../qemuxml2argvdata/seclabel-dynamic-relabel.args | 9 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 9 +- tests/qemuxml2argvdata/seclabel-none.args | 9 +- .../seclabel-static-labelskip.args | 9 +- .../qemuxml2argvdata/seclabel-static-relabel.args | 9 +- tests/qemuxml2argvdata/seclabel-static.args | 9 +- .../serial-dev-chardev-iobase.args | 10 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 10 +- tests/qemuxml2argvdata/serial-file-chardev.args | 10 +- tests/qemuxml2argvdata/serial-file-log.args | 9 +- tests/qemuxml2argvdata/serial-many-chardev.args | 10 +- tests/qemuxml2argvdata/serial-pty-chardev.args | 10 +- .../qemuxml2argvdata/serial-spiceport-nospice.args | 9 +- tests/qemuxml2argvdata/serial-spiceport.args | 8 +- tests/qemuxml2argvdata/serial-tcp-chardev.args | 10 +- .../serial-tcp-telnet-chardev.args | 10 +- .../serial-tcp-tlsx509-chardev-notls.args | 10 +- .../serial-tcp-tlsx509-chardev-verify.args | 10 +- .../serial-tcp-tlsx509-chardev.args | 10 +- .../serial-tcp-tlsx509-secret-chardev.args | 10 +- tests/qemuxml2argvdata/serial-udp-chardev.args | 10 +- tests/qemuxml2argvdata/serial-unix-chardev.args | 10 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 10 +- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 9 +- tests/qemuxml2argvdata/shmem.args | 9 +- tests/qemuxml2argvdata/smartcard-controller.args | 10 +- .../smartcard-host-certificates.args | 10 +- tests/qemuxml2argvdata/smartcard-host.args | 10 +- .../smartcard-passthrough-spicevmc.args | 10 +- .../smartcard-passthrough-tcp.args | 10 +- tests/qemuxml2argvdata/smbios.args | 9 +- tests/qemuxml2argvdata/smp.args | 9 +- tests/qemuxml2argvdata/sound-device.args | 10 +- tests/qemuxml2argvdata/sound.args | 9 +- tests/qemuxml2argvdata/tpm-passthrough.args | 11 +- .../usb-controller-default-q35.args | 9 +- .../usb-controller-explicit-q35.args | 9 +- .../qemuxml2argvdata/usb-controller-qemu-xhci.args | 9 +- tests/qemuxml2argvdata/usb-controller-xhci.args | 10 +- tests/qemuxml2argvdata/usb-controller.args | 10 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 10 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 10 +- tests/qemuxml2argvdata/usb-hub.args | 10 +- tests/qemuxml2argvdata/usb-ich9-autoassign.args | 10 +- tests/qemuxml2argvdata/usb-ich9-companion.args | 10 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 10 +- tests/qemuxml2argvdata/usb-long-port-path.args | 10 +- tests/qemuxml2argvdata/usb-none.args | 10 +- tests/qemuxml2argvdata/usb-piix3-controller.args | 10 +- tests/qemuxml2argvdata/usb-port-autoassign.args | 10 +- tests/qemuxml2argvdata/usb-port-missing.args | 10 +- tests/qemuxml2argvdata/usb-ports.args | 10 +- tests/qemuxml2argvdata/usb-redir-boot.args | 10 +- .../qemuxml2argvdata/usb-redir-filter-version.args | 10 +- tests/qemuxml2argvdata/usb-redir-filter.args | 10 +- tests/qemuxml2argvdata/usb-redir.args | 10 +- tests/qemuxml2argvdata/usb-xhci-autoassign.args | 10 +- tests/qemuxml2argvdata/usb1-usb2.args | 10 +- tests/qemuxml2argvdata/user-aliases-usb.args | 9 +- tests/qemuxml2argvdata/user-aliases.args | 25 +- tests/qemuxml2argvdata/vcpu-placement-static.args | 9 +- .../video-device-pciaddr-default.args | 7 +- .../qemuxml2argvdata/video-qxl-device-vgamem.args | 9 +- tests/qemuxml2argvdata/video-qxl-device.args | 9 +- tests/qemuxml2argvdata/video-qxl-heads.args | 9 +- tests/qemuxml2argvdata/video-qxl-nodevice.args | 9 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 9 +- .../video-qxl-sec-device-vgamem.args | 9 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 9 +- .../qemuxml2argvdata/video-vga-device-vgamem.args | 9 +- tests/qemuxml2argvdata/video-vga-device.args | 9 +- tests/qemuxml2argvdata/video-vga-nodevice.args | 9 +- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 9 +- tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 7 +- .../qemuxml2argvdata/video-virtio-gpu-device.args | 9 +- .../video-virtio-gpu-secondary.args | 9 +- .../video-virtio-gpu-spice-gl.args | 7 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 9 +- tests/qemuxml2argvdata/video-virtio-vga.args | 9 +- .../qemuxml2argvdata/virtio-input-passthrough.args | 9 +- tests/qemuxml2argvdata/virtio-input.args | 9 +- tests/qemuxml2argvdata/virtio-lun.args | 16 +- tests/qemuxml2argvdata/virtio-options.args | 15 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 10 +- tests/qemuxml2argvdata/virtio-rng-default.args | 9 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 9 +- tests/qemuxml2argvdata/virtio-rng-multiple.args | 9 +- tests/qemuxml2argvdata/virtio-rng-random.args | 9 +- tests/qemuxml2argvdata/vmcoreinfo.args | 9 +- tests/qemuxml2argvdata/watchdog-device.args | 10 +- tests/qemuxml2argvdata/watchdog-diag288.args | 10 +- tests/qemuxml2argvdata/watchdog-dump.args | 9 +- tests/qemuxml2argvdata/watchdog-injectnmi.args | 9 +- tests/qemuxml2argvdata/watchdog.args | 9 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 9 +- tests/qemuxml2argvtest.c | 744 +++----- tests/qemuxml2xmltest.c | 119 +- 667 files changed, 4571 insertions(+), 10320 deletions(-) delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml delete mode 100644 tests/qemuhelpdata/qemu-0.12.1 delete mode 100644 tests/qemuhelpdata/qemu-0.12.1-device delete mode 100644 tests/qemuhelpdata/qemu-1.0 delete mode 100644 tests/qemuhelpdata/qemu-1.0-device delete mode 100644 tests/qemuhelpdata/qemu-1.1.0 delete mode 100644 tests/qemuhelpdata/qemu-1.1.0-device delete mode 100644 tests/qemuhelpdata/qemu-1.2.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-1.2.0 delete mode 100644 tests/qemuhelptest.c delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.args delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.xml -- 2.16.1

6 61

[libvirt] [RFC PATCH 0/2] qemu: deny privilege elevation and spawn in seccomp
by Ján Tomko 03 Apr '18

03 Apr '18

QEMU changed the behavior of -sandbox on since 2.11 and it no longer whitelists all the possible calls. Override the meaning of seccomp_sandbox = 1 in qemu.conf to block the privilege elevation set and spawn set on top of the default. Do the same by default even if no option is specified, hoping that this should be enough for everybody (TM) Sending as RFC to ask whether: * this is a sensible default * a coarse setting like this is enough or it makes sense to expose the individual sets in qemu.conf (in that case - can I reasonably promote an int setting to a list of strings?) Ján Tomko (2): Introduce QEMU_CAPS_SECCOMP_BLACKLIST qemu: deny privilege elevation and spawn in seccomp src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 10 +++++-- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemuxml2argvdata/minimal-sandbox.args | 25 ++++++++++++++++ tests/qemuxml2argvdata/minimal-sandbox.xml | 34 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 11 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/minimal-sandbox.args create mode 100644 tests/qemuxml2argvdata/minimal-sandbox.xml -- 2.13.6

2 3

[libvirt] [PATCH 00/20] Fix virConnect(Un)RegisterCloseCallback and get rid of global variables
by Marc Hartmayer 03 Apr '18

03 Apr '18

The first part of this patch series fixes the behavior of virConnectSupportsFeatures, virConnect(Un)RegisterCloseCallback, and implements these features in the test driver. This results in a better code coverage of our test suite. The subsequent patches remove the need to have the global variables 'qemuProgram', 'adminProgram', 'lxcProgram, and 'remoteProgram' in remote_daemon.[ch]. They only work in combination with the fixed behavior of virConnectSupportsFeatures and virConnect(Un)RegisterCloseCallback. Marc Hartmayer (20): driver: Add typedef for the anonymous enum used for driver features remote: Don't hard code the feature VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK as available virConnect(Un)RegisterCloseCallback: Throw an error in case the API is not supported test: Implement virConnectSupportsFeature test: Implement virConnect(Un)RegisterCloseCallback test: testOpenDefault: introduce cleanup path test: testOpenFromFile: return VIR_DRV_OPEN_SUCCESS in case of success test: testConnectAuthenticate: Take the lock when accessing mutable values test: testConnectClose: Set privateData to NULL in all cases test: rename defaultConn to defaultPrivconn test: introduce testDriverCloseInternal test: fix error path in testConnectOpen test: Convert testDriver to virObjectLockable remote: remove unneeded global variables stream: Access stream->prog instead of a hard-coded global variable remote: Set eventID explicitly to an invalid value remote: Add the information which program has to be used to daemonClientEventCallback remote: Use domainClientEventCallbacks for remoteReplayConnectionClosedEvent rpc: Introduce virNetServerGetProgramLocked helper function remote/rpc: Use virNetServerGetProgram() to determine the program src/esx/esx_driver.c | 18 +- src/libvirt-host.c | 24 +-- src/libvirt_internal.h | 4 +- src/libvirt_remote.syms | 1 + src/libxl/libxl_driver.c | 13 +- src/lxc/lxc_driver.c | 24 ++- src/openvz/openvz_driver.c | 15 +- src/qemu/qemu_driver.c | 8 +- src/remote/remote_daemon.c | 8 +- src/remote/remote_daemon.h | 3 - src/remote/remote_daemon_dispatch.c | 182 +++++++++++-------- src/remote/remote_daemon_stream.c | 14 +- src/rpc/gendispatch.pl | 2 + src/rpc/virnetserver.c | 54 +++++- src/rpc/virnetserver.h | 2 + src/test/test_driver.c | 339 ++++++++++++++++++++++-------------- src/vz/vz_driver.c | 15 +- src/xen/xen_driver.c | 15 +- tools/virsh.c | 11 +- 19 files changed, 504 insertions(+), 248 deletions(-) -- 2.13.4

4 62

[libvirt] [PATCH python] Post-release version bump to 4.3.0
by Daniel P. Berrangé 03 Apr '18

03 Apr '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial change. setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c40908b..eff9d54 100755 --- a/setup.py +++ b/setup.py @@ -334,7 +334,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '4.2.0', + version = '4.3.0', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.14.3

1 0

[libvirt] [PATCH] rpm: add deps on rpcgen/libtirpc-devel
by Daniel P. Berrangé 03 Apr '18

03 Apr '18

Since RPC support moved out of glibc we need to have explicit deps on the new packages providing this functionality Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index b55a947ec9..97143c68ae 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -464,6 +464,11 @@ BuildRequires: wireshark-devel >= 2.1.0 BuildRequires: libssh-devel >= 0.7.0 %endif +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 +BuildRequires: rpcgen +BuildRequires: libtirpc-devel +%endif + Provides: bundled(gnulib) %description -- 2.14.3

2 1

[libvirt] [PATCH 0/2] libxl: drop support for Xen 4.4 and 4.5
by Jim Fehlig 03 Apr '18

03 Apr '18

Bla bla bla... Jim Fehlig (2): libxl: drop support for Xen < 4.6 news: announce dropping support for Xen 4.4 and 4.5 docs/drvxen.html.in | 11 +++++------ docs/news.xml | 9 +++++++++ m4/virt-driver-libxl.m4 | 23 ++--------------------- 3 files changed, 16 insertions(+), 27 deletions(-) -- 2.16.2

3 7

[libvirt] [PATCH] util: json: Remove yajl bits from virJSONValueToStr
by Peter Krempa 03 Apr '18

03 Apr '18

Rather than depending on yajl bits for creating the JSON structure replace it by few virBuffer bits. This will make the JSON formatter libary agnostic. Additionally remove the debug statement from the worker function since it was not very useful. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virjson.c | 188 ++++++++++++++++++++++++++++------------------------- 1 file changed, 101 insertions(+), 87 deletions(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index 6a02ddf0cc..772a205e9e 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1834,144 +1834,158 @@ virJSONValueFromString(const char *jsonstring) return ret; } +#else +virJSONValuePtr +virJSONValueFromString(const char *jsonstring ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No JSON parser implementation is available")); + return NULL; +} +#endif + + +static void +virJSONValueToStringAddString(virBufferPtr buf, + virJSONValuePtr string) +{ + const char *t; + + virBufferAddLit(buf, "\""); + + for (t = string->data.string; *t; t++) { + switch (*t) { + case '"': + virBufferAddLit(buf, "\\\""); + break; + case '\\': + virBufferAddLit(buf, "\\\\"); + break; + case '\n': + virBufferAddLit(buf, "\\n"); + break; + case '\t': + virBufferAddLit(buf, "\\t"); + break; + default: + virBufferAdd(buf, t, 1); + break; + } + } + + virBufferAddLit(buf, "\""); +} + + +#define VIR_JSON_PRETTY_NEWLINE \ + if (pretty) \ + virBufferAddLit(buf, "\n") static int virJSONValueToStringOne(virJSONValuePtr object, - yajl_gen g) + virBufferPtr buf, + bool pretty) { size_t i; - VIR_DEBUG("object=%p type=%d gen=%p", object, object->type, g); - - switch (object->type) { + switch ((virJSONType) object->type) { case VIR_JSON_TYPE_OBJECT: - if (yajl_gen_map_open(g) != yajl_gen_status_ok) - return -1; + virBufferAddLit(buf, "{"); + VIR_JSON_PRETTY_NEWLINE; + virBufferAdjustIndent(buf, 2); + for (i = 0; i < object->data.object.npairs; i++) { - if (yajl_gen_string(g, - (unsigned char *)object->data.object.pairs[i].key, - strlen(object->data.object.pairs[i].key)) - != yajl_gen_status_ok) - return -1; - if (virJSONValueToStringOne(object->data.object.pairs[i].value, g) < 0) + virBufferStrcat(buf, "\"", object->data.object.pairs[i].key, "\":", NULL); + + if (pretty) + virBufferAddLit(buf, " "); + + if (virJSONValueToStringOne(object->data.object.pairs[i].value, + buf, pretty) < 0) return -1; + + if (i != object->data.object.npairs - 1) { + virBufferAddLit(buf, ","); + VIR_JSON_PRETTY_NEWLINE; + } } - if (yajl_gen_map_close(g) != yajl_gen_status_ok) - return -1; + + virBufferAdjustIndent(buf, -2); + VIR_JSON_PRETTY_NEWLINE; + virBufferAddLit(buf, "}"); break; + case VIR_JSON_TYPE_ARRAY: - if (yajl_gen_array_open(g) != yajl_gen_status_ok) - return -1; + virBufferAddLit(buf, "["); + VIR_JSON_PRETTY_NEWLINE; + virBufferAdjustIndent(buf, 2); + for (i = 0; i < object->data.array.nvalues; i++) { - if (virJSONValueToStringOne(object->data.array.values[i], g) < 0) + if (virJSONValueToStringOne(object->data.array.values[i], buf, pretty) < 0) return -1; + + if (i != object->data.array.nvalues - 1) { + virBufferAddLit(buf, ","); + VIR_JSON_PRETTY_NEWLINE; + } } - if (yajl_gen_array_close(g) != yajl_gen_status_ok) - return -1; + + virBufferAdjustIndent(buf, -2); + VIR_JSON_PRETTY_NEWLINE; + virBufferAddLit(buf, "]"); break; case VIR_JSON_TYPE_STRING: - if (yajl_gen_string(g, (unsigned char *)object->data.string, - strlen(object->data.string)) != yajl_gen_status_ok) - return -1; + virJSONValueToStringAddString(buf, object); break; case VIR_JSON_TYPE_NUMBER: - if (yajl_gen_number(g, object->data.number, - strlen(object->data.number)) != yajl_gen_status_ok) - return -1; + virBufferAdd(buf, object->data.number, -1); break; case VIR_JSON_TYPE_BOOLEAN: - if (yajl_gen_bool(g, object->data.boolean) != yajl_gen_status_ok) - return -1; + if (object->data.boolean) + virBufferAddLit(buf, "true"); + else + virBufferAddLit(buf, "false"); break; case VIR_JSON_TYPE_NULL: - if (yajl_gen_null(g) != yajl_gen_status_ok) - return -1; + virBufferAddLit(buf, "null"); break; default: + virReportEnumRangeError(virJSONType, object->type); return -1; } return 0; } +#undef VIR_JSON_PRETTY_NEWLINE + char * virJSONValueToString(virJSONValuePtr object, bool pretty) { - yajl_gen g; - const unsigned char *str; + virBuffer buf = VIR_BUFFER_INITIALIZER; char *ret = NULL; - yajl_size_t len; -# ifndef WITH_YAJL2 - yajl_gen_config conf = { pretty ? 1 : 0, pretty ? " " : " "}; -# endif VIR_DEBUG("object=%p", object); -# ifdef WITH_YAJL2 - g = yajl_gen_alloc(NULL); - if (g) { - yajl_gen_config(g, yajl_gen_beautify, pretty ? 1 : 0); - yajl_gen_config(g, yajl_gen_indent_string, pretty ? " " : " "); - yajl_gen_config(g, yajl_gen_validate_utf8, 1); - } -# else - g = yajl_gen_alloc(&conf, NULL); -# endif - if (!g) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to create JSON formatter")); - goto cleanup; - } - - if (virJSONValueToStringOne(object, g) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (yajl_gen_get_buf(g, &str, &len) != yajl_gen_status_ok) { - virReportOOMError(); - goto cleanup; + if (virJSONValueToStringOne(object, &buf, pretty) < 0 || + virBufferCheckError(&buf) < 0) { + virBufferFreeAndReset(&buf); + return NULL; } - ignore_value(VIR_STRDUP(ret, (const char *)str)); - - cleanup: - yajl_gen_free(g); - - VIR_DEBUG("result=%s", NULLSTR(ret)); - + ret = virBufferContentAndReset(&buf); + VIR_DEBUG("result=%s", ret); return ret; } -#else -virJSONValuePtr -virJSONValueFromString(const char *jsonstring ATTRIBUTE_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No JSON parser implementation is available")); - return NULL; -} - - -char * -virJSONValueToString(virJSONValuePtr object ATTRIBUTE_UNUSED, - bool pretty ATTRIBUTE_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No JSON parser implementation is available")); - return NULL; -} -#endif - - /** * virJSONStringReformat: * @jsonstr: string to reformat -- 2.14.3

2 2

[libvirt] [PATCH 0/9] json: Fix leak/double-free, clean up code and privatize virJSONValue
by Peter Krempa 03 Apr '18

03 Apr '18

Coverity was not wrong about the usage of 'a'/'A' modifiers for virJSONValueObjectAddVArgs as noted in [1]. Fix the possible leak/double-free, and add test to make sure it works as expected. This series also cleans up direct access to attributes of virJSONValue and in the end privatizes the implementation so that all users are forced to use accessors. Peter Krempa (9): util: json: Fix freeing of objects appended to virJSONValue tests: json: Validate that attribute values are properly stolen qemu: monitor: Use virJSONValueObjectKeysNumber in qemuMonitorJSONGetCPUModelExpansion qemu: agent: Avoid unnecessary JSON object type check json: Replace access to virJSONValue->type by virJSONValueGetType util: json: Add accessor for geting a VIR_JSON_TYPE_NUMBER as string util: qemu: Don't access virJSONValue members directly in virQEMUBuildCommandLineJSONRecurse qemu: monitor: Don't resist stealing 'actions' in qemuMonitorJSONTransaction util: json: Privatize struct _virJSONValue and sub-structs src/libvirt_private.syms | 1 + src/qemu/qemu_agent.c | 21 +++++----------- src/qemu/qemu_block.c | 22 +++++------------ src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 4 +-- src/qemu/qemu_monitor.c | 4 +-- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 59 ++++++++++++++------------------------------ src/qemu/qemu_monitor_json.h | 2 +- src/util/virjson.c | 59 +++++++++++++++++++++++++++++++++++++++++--- src/util/virjson.h | 39 +---------------------------- src/util/virqemu.c | 13 ++++++---- tests/qemublocktest.c | 4 +-- tests/virjsontest.c | 47 +++++++++++++++++++++++++++++++++++ 14 files changed, 152 insertions(+), 127 deletions(-) -- 2.16.2

3 24

[libvirt] [PATCH] lxc_container: Set source file description
by Radostin Stoyanov 03 Apr '18

03 Apr '18

Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com> --- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_container.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 14928e8ec..532fd0be0 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -3,7 +3,7 @@ * Copyright (C) 2008 IBM Corp. * Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. * - * lxc_container.c: file description + * lxc_container.c: Performs container setup tasks * * Authors: * David L. Leskovec <dlesko at linux.vnet.ibm.com> diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index e0f508d4a..641e2d460 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -1,7 +1,7 @@ /* * Copyright IBM Corp. 2008 * - * lxc_container.h: header file for fcns run inside container + * lxc_container.h: Performs container setup tasks * * Authors: * David L. Leskovec <dlesko at linux.vnet.ibm.com> -- 2.14.3

2 1

[libvirt] [dbus PATCH v4 0/5] New APIs and Domain Lifecycle signal change
by Katerina Koukiou 03 Apr '18

03 Apr '18

* Implemented Suspend and Resume APIs. * Reused virsh functions for taking the Event Strings names from ENUM. * Merged all Domain Lifecycle events signals into one signal. Changes from v3: * s/arg2/arg1/ since Event Type is the second argument of the signal. Katerina Koukiou (5): Implement Suspend method for Domain interface. Implement Resume method for Domain interface. utils: Introduce functions and macros for translating ENUMs to strings events: Introduce virtDBusEventsDomainEventToString function Merge all Domain lifecycle signals into one signal called Domain. data/org.libvirt.Connect.xml | 54 +++------------------------------------- data/org.libvirt.Domain.xml | 8 ++++++ src/domain.c | 42 +++++++++++++++++++++++++++++++ src/events.c | 59 +++++++++++++++++--------------------------- src/util.c | 27 ++++++++++++++++++++ src/util.h | 28 +++++++++++++++++++++ test/test_connect.py | 10 +++----- test/test_domain.py | 40 +++++++++++++++++++++++++----- 8 files changed, 168 insertions(+), 100 deletions(-) -- 2.15.0

2 8

[libvirt] RFC: Extending UEFI XML specification
by Prerna 03 Apr '18

03 Apr '18

Hi Michal, The <loader>,<nvram> tags of os element in domain XML ( https://libvirt.org/formatdomain.html#elementsOSBIOS) currently expects absolute path of the local file which would be used to back the the pflash disk representing the non-volatile RAM: <loader readonly='yes' secure='no' type='rom'>/usr/lib/xen/boot/hvmloader</loader> <nvram template='/usr/share/OVMF/OVMF_VARS.fd'>/var/lib/libvirt/nvram/guest_VARS.fd</nvram> However, given that for virtualized environments, it is possible that the VM could be started on different hosts at various points in time, and so we need to expose the firmware/nvram tuple over a network device so as to be accessible from various hosts. I propose extending of the existing config by adding a new element, "backing". This could be one of : - 'file': for local filesystem paths - 'network': for network-attached storage. As an example: <loader readonly='yes' secure='no' type='rom' backing = 'file'>/usr/share/OVMF/OVMF_CODE.fd</loader> <nvram backing='file' template='/usr/share/OVMF/OVMF_VARS.fd'>/var/lib/libvirt/nvram/guest_VARS.fd</nvram> For network-attached storage: <loader readonly='yes' secure='no' type='rom' backing = 'network'>/usr/share/OVMF/OVMF_CODE.fd</loader> <nvram backing='network'> <source protocol='XXX' name='YYY'> <host name='x.x.x.x' port=xxxx/> </source> </nvram> Note that 'template' attribute in NVRAM should be explicitly disallowed for backing type "network". This is because libvirtd may not be able to access the backing store to copy the contents of the template. I would like to capture thoughts from the community to extend the current firmware spec. Regards, Prerna

2 4

[libvirt] [dbus PATCH v3 0/5] New APIs and Domain Lifecycle signal change
by Katerina Koukiou 03 Apr '18

03 Apr '18

* Implemented Suspend and Resume APIs. * Reused virsh functions for taking the Event Strings names from ENUM. * Merged all Domain Lifecycle events signals into one signal. Changed from v2: * Coding style issues. * Removed the Domain prefix for domain event type only in last patch. Katerina Koukiou (5): Implement Suspend method for Domain interface. Implement Resume method for Domain interface. utils: Introduce functions and macros for translating ENUMs to strings events: Introduce virtDBusEventsDomainEventToString function Merge all Domain lifecycle signals into one signal called Domain. data/org.libvirt.Connect.xml | 54 +++------------------------------------- data/org.libvirt.Domain.xml | 8 ++++++ src/domain.c | 42 +++++++++++++++++++++++++++++++ src/events.c | 59 +++++++++++++++++--------------------------- src/util.c | 27 ++++++++++++++++++++ src/util.h | 28 +++++++++++++++++++++ test/test_connect.py | 10 +++----- test/test_domain.py | 40 +++++++++++++++++++++++++----- 8 files changed, 168 insertions(+), 100 deletions(-) -- 2.15.0

1 5

[libvirt] [PATCH] lxc: Use virDomainObjEndAPI after FindByName
by John Ferlan 02 Apr '18

02 Apr '18

For consistency, rather than open coding the Unref and Unlock, just use the virDomainObjEndAPI API. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial src/lxc/lxc_process.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index bc321e360d..85c7bcc321 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -420,8 +420,7 @@ static int virLXCProcessSetupNamespaceName(virConnectPtr conn, int ns_type, cons cleanup: VIR_FREE(path); - virObjectUnlock(vm); - virObjectUnref(vm); + virDomainObjEndAPI(&vm); return fd; } -- 2.13.6

1 0

[libvirt] [PATCH] qemu: s/acceptible/acceptable/
by Ján Tomko 01 Apr '18

01 Apr '18

Prefer the contemporary spelling. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 580e0f830..136116cfe 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4173,7 +4173,7 @@ qemuDomainDeviceDefValidateControllerAttributes(const virDomainControllerDef *co * * Using the @qemuCaps, let's ensure the provided @model can be supported * - * Returns true if acceptible, false otherwise with error message set. + * Returns true if acceptable, false otherwise with error message set. */ static bool qemuDomainCheckSCSIControllerModel(virQEMUCapsPtr qemuCaps, -- 2.13.6

1 0

[libvirt] [PATCH 0/4] vmx: allow more than 4 NICs (RHBZ#1560917)
by Pino Toscano 01 Apr '18

01 Apr '18

Hi, the VMX parser, used in the esx driver, has currently hardcoded 4 NICs possible, ignoring extra more than that. The following series removes this limitation, allowing to parse all the 10 NICs in the VMX of RHBZ#1560917. Thanks, Pino Toscano (4): vmx: check for present/enabled devices earlier vmx: allocate space for network interfaces if needed internal: add STRCASEPREFIX vmx: convert any amount of NICs src/internal.h | 1 + src/vmx/vmx.c | 150 +++++++++++----------- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.vmx | 163 ++++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 89 +++++++++++++ tests/vmx2xmltest.c | 1 + 5 files changed, 325 insertions(+), 79 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml -- 2.14.3

3 7

[libvirt] Release of libvirt-4.2.0
by Daniel Veillard 01 Apr '18

01 Apr '18

Not April fool one, I made the release on time :-) It's signed in git and signed tarball and rpms are pushed to the usual place: ftp://libvirt.org/libvirt/ I also pushed a python binding 4.2.0 release which can be found at: ftp://libvirt.org/libvirt/python/ New features - Support building with Python 3 Python is required to build libvirt, and up until now only Python 2 could be used as an interpreter. All scripts used during build have now been made compatible with Python 3, which means both major releases of the language are fully supported. - qemu: Provide ccw address support for graphics and input devices Support the virtio-gpu-ccw device as a video device and virtio-{keyboard, mouse, tablet}-ccw devices as input devices on S390. Improvements - qemu: Add logging of guest crash information on S390 On S390, when the guest crashes and QEMU exposes the guest crash information, log the relevant data to the domain log file. - qemu: use arp table of host to get the IP address of guests Find IP address of a VM by arp table on hosts. If someone customizing IP address inside VM, it will be helpful. - Xen: Remove hard-coded scheduler weight The libxl driver was accidentally hard-coding the per-domain scheduler weight to 1000, silently ignoring any user-provided <shares> in <cputune>. The driver now honors <shares>, and defers setting a default value to Xen. Note that the Xen default is 256, so any domains started after this improvement will have one fourth the shares of previously started domains. If all domains must have equal CPU shares, administrators must manually set the weight of previously started domains to 256, or restart them. there is no documented bug fix but there is quite a few there too :-) Thanks everybody for your help getting this release, with patches, reviews, bug reports, documentation, etc. Enjoy ! 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/

2 2

[libvirt] [PATCH] qemuDomainRemoveDevice: add qemuDomainRemoveWatchdog
by Ján Tomko 01 Apr '18

01 Apr '18

qemuDomainDetachWatchdog uses the infrastructure for waiting for the DEVICE_DELETED event, but the asynchronous delete was not implemented. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_hotplug.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 49af4d4ff..e840c8010 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4493,12 +4493,15 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, ret = qemuDomainRemoveRedirdevDevice(driver, vm, dev->data.redirdev); break; + case VIR_DOMAIN_DEVICE_WATCHDOG: + ret = qemuDomainRemoveWatchdog(driver, vm, dev->data.watchdog); + break; + case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_VIDEO: - case VIR_DOMAIN_DEVICE_WATCHDOG: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_HUB: case VIR_DOMAIN_DEVICE_SMARTCARD: -- 2.13.6

2 1

[libvirt] [PATCH] qemu: Randomly deny starting domains
by Michal Privoznik 01 Apr '18

01 Apr '18

Libvirt works just too well. Deny starting domains at random so users value our incredibly low number of bugs more. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7bcc4936de..4570c76db7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -107,6 +107,7 @@ #include "virnuma.h" #include "dirname.h" #include "netdev_bandwidth_conf.h" +#include "virrandom.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -7256,7 +7257,7 @@ qemuDomainObjStart(virConnectPtr conn, qemuDomainAsyncJob asyncJob) { int ret = -1; - char *managed_save; + char *managed_save = NULL; bool start_paused = (flags & VIR_DOMAIN_START_PAUSED) != 0; bool autodestroy = (flags & VIR_DOMAIN_START_AUTODESTROY) != 0; bool bypass_cache = (flags & VIR_DOMAIN_START_BYPASS_CACHE) != 0; @@ -7267,6 +7268,13 @@ qemuDomainObjStart(virConnectPtr conn, start_flags |= start_paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; start_flags |= autodestroy ? VIR_QEMU_PROCESS_START_AUTODESTROY : 0; + if (virRandomInt(2)) { + virReportError(VIR_ERR_OPERATION_DENIED, + _("Starting domain %s denied. Today is not your day"), + vm->def->name); + goto cleanup; + } + /* * If there is a managed saved state restore it instead of starting * from scratch. The old state is removed once the restoring succeeded. -- 2.16.1

1 0

[libvirt] [PATCH] Introduce the <watchcat> device
by Ján Tomko 01 Apr '18

01 Apr '18

As one wise man once said about those furry things with no practical purpose: a cat is like a self-aware moving bonsai tree with an attitude. Inspired by this profound quote, introduce a <watchcat> device. A counterpart to <watchdog> that does nothing. If the domain crashes, it just watches. Or purrs. Or wanders around. XML format: <devices> <watchcat breed='persian'/> </devices> Available breeds also include chihuahua, because dogs under 50 lbs are as pointless as cats. Just ask Ron Swanson. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/formatdomain.html.in | 26 ++++++++ docs/schemas/domaincommon.rng | 19 ++++++ src/conf/domain_conf.c | 106 +++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 22 +++++++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 1 + src/qemu/qemu_driver.c | 6 ++ src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 5 ++ tests/genericxml2xmlindata/watchcat.xml | 18 ++++++ tests/genericxml2xmltest.c | 2 + 11 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 tests/genericxml2xmlindata/watchcat.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 08dc74b6b..bc47b85f1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -8032,6 +8032,32 @@ qemu-kvm -net nic,model=? /dev/null </dd> </dl> + <h4><a id="elementsWatchcat">Watchcat</a></h4> + + <p> + The <code>watchcat</code> element can be used to add a watchcat. + <span class="since">Since 2.4.0</span> + </p> + + <p> + Example: + </p> +<pre> +... +<devices> + <watchcat breed='siamese'/> +</devices> +... +</pre> + <dl> + <dt><code>breed</code></dt> + <dd> + <p> + This attribute is intentionally left undocumented + </p> + </dd> + </dl> + <h3><a id="seclabel">Security label</a></h3> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8165e699d..58630f68a 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4179,6 +4179,22 @@ </element> </define> + <define name="watchcat"> + <element name="watchcat"> + <attribute name="breed"> + <choice> + <value>persian</value> + <value>blue-swedish</value> + <value>abyssinian</value> + <value>british-shorthair</value> + <value>turkish-angora</value> + <value>chihuahua</value> + <value>siamese</value> + </choice> + </attribute> + </element> + </define> + <define name="input"> <element name="input"> <optional> @@ -4691,6 +4707,9 @@ <optional> <ref name="iommu"/> </optional> + <optional> + <ref name="watchcat"/> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ae7c0d9b7..d45d40ee8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -59,6 +59,7 @@ #include "virnetdevmacvlan.h" #include "virhostdev.h" #include "virmdev.h" +#include "virrandom.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -256,7 +257,8 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "tpm", "panic", "memory", - "iommu") + "iommu", + "watchcat") VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, "none", @@ -929,6 +931,15 @@ VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MODEL_LAST, "ivshmem-plain", "ivshmem-doorbell") +VIR_ENUM_IMPL(virDomainWatchcatBreed, VIR_DOMAIN_WATCHCAT_BREED_LAST, + "persian", + "blue-swedish", + "abyssinian", + "british-shorthair", + "turkish-angora", + "chihuahua", + "siamese") + static virClassPtr virDomainObjClass; static virClassPtr virDomainXMLOptionClass; static void virDomainObjDispose(void *obj); @@ -2739,6 +2750,9 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) case VIR_DOMAIN_DEVICE_IOMMU: VIR_FREE(def->data.iommu); break; + case VIR_DOMAIN_DEVICE_WATCHCAT: + VIR_FREE(def->data.watchcat); + break; case VIR_DOMAIN_DEVICE_LAST: case VIR_DOMAIN_DEVICE_NONE: break; @@ -3608,6 +3622,7 @@ virDomainDeviceGetInfo(virDomainDeviceDefPtr device) case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: case VIR_DOMAIN_DEVICE_NONE: break; @@ -3834,6 +3849,7 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def, case VIR_DOMAIN_DEVICE_RNG: case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: break; } #endif @@ -5010,6 +5026,12 @@ virDomainDefPostParseCommon(virDomainDefPtr def, } } + if (def->watchcat && + def->watchcat->breed == VIR_DOMAIN_WATCHCAT_BREED_CHIHUAHUA) { + virDomainWatchdogDefPtr dawg = def->watchdog; + VIR_FREE(dawg); + } + /* clean up possibly duplicated metadata entries */ virXMLNodeSanitizeNamespaces(def->metadata); @@ -5550,6 +5572,7 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LAST: break; @@ -15685,6 +15708,39 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, } +static virDomainWatchcatDefPtr +virDomainWatchcatDefParseXML(xmlNodePtr node) +{ + virDomainWatchcatDefPtr watchcat = NULL, ret = NULL; + char *tmp = NULL; + int val; + + if (VIR_ALLOC(watchcat) < 0) + goto cleanup; + + if (!(tmp = virXMLPropString(node, "breed"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing breed for Watchcat device")); + goto cleanup; + } + + if ((val = virDomainWatchcatBreedTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_XML_ERROR, _("unknown Watchcat breed: %s"), tmp); + goto cleanup; + } + + watchcat->breed = val; + + ret = watchcat; + watchcat = NULL; + + cleanup: + VIR_FREE(watchcat); + VIR_FREE(tmp); + return ret; +} + + virDomainDeviceDefPtr virDomainDeviceDefParse(const char *xmlStr, const virDomainDef *def, @@ -15840,6 +15896,10 @@ virDomainDeviceDefParse(const char *xmlStr, if (!(dev->data.iommu = virDomainIOMMUDefParseXML(node, ctxt))) goto error; break; + case VIR_DOMAIN_DEVICE_WATCHCAT: + if (!(dev->data.watchcat = virDomainWatchcatDefParseXML(node))) + goto error; + break; case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LAST: break; @@ -20243,6 +20303,21 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); + if ((n = virXPathNodeSet("./devices/watchcat", ctxt, &nodes)) < 0) + goto error; + + if (n > 1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("only a single Watchcat is supported")); + goto error; + } + + if (n > 0) { + if (!(def->watchcat = virDomainWatchcatDefParseXML(nodes[0]))) + goto error; + } + VIR_FREE(nodes); + /* analysis of the user namespace mapping */ if ((n = virXPathNodeSet("./idmap/uid", ctxt, &nodes)) < 0) goto error; @@ -22287,6 +22362,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src, case VIR_DOMAIN_DEVICE_SHMEM: case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: break; } #endif @@ -26463,6 +26539,27 @@ virDomainIOMMUDefFormat(virBufferPtr buf, } +static int +virDomainWatchcatDefFormat(virBufferPtr buf, + const virDomainWatchcatDef *watchcat) +{ + virBuffer attrBuf = VIR_BUFFER_INITIALIZER; + int ret = -1; + + virBufferAsprintf(&attrBuf, " breed='%s'", + virDomainWatchcatBreedTypeToString(watchcat->breed)); + + if (virXMLFormatElement(buf, "watchcat", &attrBuf, NULL) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virBufferFreeAndReset(&attrBuf); + return ret; +} + + /* This internal version appends to an existing buffer * (possibly with auto-indent), rather than flattening * to string. @@ -27244,6 +27341,12 @@ virDomainDefFormatInternal(virDomainDefPtr def, virDomainIOMMUDefFormat(buf, def->iommu) < 0) goto error; + if (def->watchcat) { + if (virDomainWatchcatDefFormat(buf, def->watchcat) < 0) + goto error; + if (virRandomInt(100) < 2) + VIR_FREE(def->watchcat); + } virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</devices>\n"); @@ -28370,6 +28473,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Copying definition of '%d' type " diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 61379e50f..6fd4ee6eb 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -157,6 +157,9 @@ typedef virDomainTPMDef *virDomainTPMDefPtr; typedef struct _virDomainIOMMUDef virDomainIOMMUDef; typedef virDomainIOMMUDef *virDomainIOMMUDefPtr; +typedef struct _virDomainWatchcatDef virDomainWatchcatDef; +typedef virDomainWatchcatDef *virDomainWatchcatDefPtr; + typedef struct _virDomainVirtioOptions virDomainVirtioOptions; typedef virDomainVirtioOptions *virDomainVirtioOptionsPtr; @@ -186,6 +189,7 @@ typedef enum { VIR_DOMAIN_DEVICE_PANIC, VIR_DOMAIN_DEVICE_MEMORY, VIR_DOMAIN_DEVICE_IOMMU, + VIR_DOMAIN_DEVICE_WATCHCAT, VIR_DOMAIN_DEVICE_LAST } virDomainDeviceType; @@ -218,6 +222,7 @@ struct _virDomainDeviceDef { virDomainPanicDefPtr panic; virDomainMemoryDefPtr memory; virDomainIOMMUDefPtr iommu; + virDomainWatchcatDefPtr watchcat; } data; }; @@ -2303,6 +2308,21 @@ struct _virDomainIOMMUDef { virTristateSwitch iotlb; }; +typedef enum { + VIR_DOMAIN_WATCHCAT_BREED_PERSIAN, + VIR_DOMAIN_WATCHCAT_BREED_BLUE_SWEDISH, + VIR_DOMAIN_WATCHCAT_BREED_ABYSSINIAN, + VIR_DOMAIN_WATCHCAT_BREED_BRITISH_SHORTHAIR, + VIR_DOMAIN_WATCHCAT_BREED_TURKISH_ANGORA, + VIR_DOMAIN_WATCHCAT_BREED_CHIHUAHUA, + VIR_DOMAIN_WATCHCAT_BREED_SIAMESE, + VIR_DOMAIN_WATCHCAT_BREED_LAST +} virDomainWatchcatBreed; + +struct _virDomainWatchcatDef { + virDomainWatchcatBreed breed; +}; + struct _virDomainVirtioOptions { virTristateSwitch iommu; virTristateSwitch ats; @@ -2448,6 +2468,7 @@ struct _virDomainDef { virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; virDomainIOMMUDefPtr iommu; + virDomainWatchcatDefPtr watchcat; void *namespaceData; virDomainXMLNamespace ns; @@ -3345,6 +3366,7 @@ VIR_ENUM_DECL(virDomainMemorySource) VIR_ENUM_DECL(virDomainMemoryAllocation) VIR_ENUM_DECL(virDomainIOMMUModel) VIR_ENUM_DECL(virDomainShmemModel) +VIR_ENUM_DECL(virDomainWatchcatBreed) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) VIR_ENUM_DECL(virDomainNostateReason) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 580e0f830..c75ce26eb 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4978,6 +4978,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LAST: break; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 37473ebf1..f789cbe92 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -851,6 +851,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: case VIR_DOMAIN_DEVICE_NONE: return 0; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7bcc4936d..5ede1edb7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7734,6 +7734,7 @@ qemuDomainAttachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("live attach of device '%s' is not supported"), @@ -7833,6 +7834,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("live detach of device '%s' is not supported"), @@ -7969,6 +7971,7 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("live update of device '%s' is not supported"), @@ -8155,6 +8158,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("persistent attach of device '%s' is not supported"), @@ -8338,6 +8342,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("persistent detach of device '%s' is not supported"), @@ -8436,6 +8441,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("persistent update of device '%s' is not supported"), diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 49af4d4ff..e8ba3e967 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4507,6 +4507,7 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("don't know how to remove a %s device"), diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1afb71f11..3bd08720b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2849,6 +2849,9 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + if (vm->def->watchcat) + VIR_WARN("Meow!"); + /* Bring up netdevs before starting CPUs */ if (qemuInterfaceStartDevices(vm->def) < 0) goto cleanup; @@ -4190,6 +4193,8 @@ qemuProcessBeginJob(virQEMUDriverPtr driver, return -1; qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE); + if (vm->def->watchcat) + VIR_WARN("purrr"); return 0; } diff --git a/tests/genericxml2xmlindata/watchcat.xml b/tests/genericxml2xmlindata/watchcat.xml new file mode 100644 index 000000000..daeebfa43 --- /dev/null +++ b/tests/genericxml2xmlindata/watchcat.xml @@ -0,0 +1,18 @@ +<domain type='qemu'> + <name>foo-fighters</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>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> + <watchcat breed='blue-swedish'/> + </devices> +</domain> diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index d8270a6ca..6438ab2a3 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -141,6 +141,8 @@ mymain(void) DO_TEST_FULL("cachetune-colliding-types", false, true, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); + DO_TEST("watchcat"); + virObjectUnref(caps); virObjectUnref(xmlopt); -- 2.13.6

1 0

[libvirt] [PATCH] Replace QEmu with QEMU
by Ján Tomko 31 Mar '18

31 Mar '18

QEMU is the preferred spelling used on QEMU website. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/architecture.html.in | 18 +++++++++--------- docs/drvqemu.html.in | 4 ++-- docs/logging.html.in | 4 ++-- docs/schemas/domaincommon.rng | 2 +- src/network/bridge_driver.c | 6 +++--- src/nwfilter/nwfilter_driver.c | 2 +- src/qemu/qemu.conf | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 8 ++++---- src/util/virhook.h | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/architecture.html.in b/docs/architecture.html.in index f1461ba88..5e5671661 100644 --- a/docs/architecture.html.in +++ b/docs/architecture.html.in @@ -46,18 +46,18 @@ connect to initialize the library. It will then fork a libvirt_proxy program running as root and providing read_only access to the API, this is then only useful for reporting and monitoring.</p> - <h2><a id="QEmu">QEmu and KVM support</a></h2> + <h2><a id="QEMU">QEMU and KVM support</a></h2> - <p>The model for QEmu and KVM is completely similar, basically KVM is based -on QEmu for the process controlling a new domain, only small details differs + <p>The model for QEMU and KVM is completely similar, basically KVM is based +on QEMU for the process controlling a new domain, only small details differs between the two. In both case the libvirt API is provided by a controlling process forked by libvirt in the background and which launch and control the -QEmu or KVM process. That program called libvirt_qemud talks though a specific -protocol to the library, and connects to the console of the QEmu process in +QEMU or KVM process. That program called libvirt_qemud talks though a specific +protocol to the library, and connects to the console of the QEMU process in order to control and report on its status. Libvirt tries to expose all the -emulations models of QEmu, the selection is done when creating the new +emulations models of QEMU, the selection is done when creating the new domain, by specifying the architecture and machine type targeted.</p> - <p>The code controlling the QEmu process is available in the + <p>The code controlling the QEMU process is available in the <code>qemud/</code> directory.</p> <h2><a id="drivers">Driver based architecture</a></h2> @@ -83,9 +83,9 @@ drivers present in driver.h:</p> is in the <code>proxy/</code> directory.</li> <li>xm_internal: provide support for Xen defined but not running domains.</li> - <li>qemu_internal: implement the driver functions for QEmu and + <li>qemu_internal: implement the driver functions for QEMU and KVM virtualization engines. It also uses a qemud/ specific daemon - which interacts with the QEmu process to implement libvirt API.</li> + which interacts with the QEMU process to implement libvirt API.</li> <li>test: this is a test driver useful for regression tests of the front-end part of libvirt.</li> </ul> diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index cb41b505d..cbd159da3 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -567,7 +567,7 @@ $ virsh domxml-to-native qemu-argv demo.xml </dl> <p>Example:</p><pre> <domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> - <name>QEmu-fedora-i686</name> + <name>QEMU-fedora-i686</name> <memory>219200</memory> <os> <type arch='i686' machine='pc'>hvm</type> @@ -587,7 +587,7 @@ $ virsh domxml-to-native qemu-argv demo.xml <h3>QEMU emulated guest on x86_64</h3> <pre><domain type='qemu'> - <name>QEmu-fedora-i686</name> + <name>QEMU-fedora-i686</name> <uuid>c7a5fdbd-cdaf-9455-926a-d65c16db1809</uuid> <memory>219200</memory> <currentMemory>219200</currentMemory> diff --git a/docs/logging.html.in b/docs/logging.html.in index abedc1784..be2fd4ab5 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -30,7 +30,7 @@ the message is discarded, if higher the message is output. If no filter matches, then a general priority level is applied to all remaining messages. This allows, for example, capturing all - debug messages for the QEmu driver, but otherwise only allowing + debug messages for the QEMU driver, but otherwise only allowing errors to show up from other parts.</li> <li><b>log outputs</b>: once a message has gone through filtering a set of output defines where to send the message, they can also filter @@ -236,7 +236,7 @@ export LIBVIRT_LOG_OUTPUTS="1:file:virsh.log"</pre> what is happening and where things are going wrong, allowing to then put the correct breakpoints when running under a debugger.</p> <p>To activate full debug of the libvirt entry points, utility - functions and the QEmu/KVM driver, set:</p> + functions and the QEMU/KVM driver, set:</p> <pre>log_filters="1:libvirt 1:util 1:qemu" log_outputs="1:file:/var/log/libvirt/libvirtd.log"</pre> <p>in libvirtd.conf and restart the daemon will allow to diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8165e699d..a72c9190d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5821,7 +5821,7 @@  <define name="qemucmdline"> <element name="commandline" ns="http://libvirt.org/schemas/domain/qemu/1.0"> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 898c94610..d326923d8 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -649,7 +649,7 @@ networkMigrateStateFiles(virNetworkDriverStatePtr driver) /** * networkStateInitialize: * - * Initialization function for the QEmu daemon + * Initialization function for the QEMU daemon */ static int networkStateInitialize(bool privileged, @@ -814,7 +814,7 @@ networkStateAutoStart(void) /** * networkStateReload: * - * Function to restart the QEmu daemon, it will recheck the configuration + * Function to restart the QEMU daemon, it will recheck the configuration * files and update its state and the networking */ static int @@ -840,7 +840,7 @@ networkStateReload(void) /** * networkStateCleanup: * - * Shutdown the QEmu daemon, it will stop all active domains and networks + * Shutdown the QEMU daemon, it will stop all active domains and networks */ static int networkStateCleanup(void) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 717bce269..6cc7ca699 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -166,7 +166,7 @@ nwfilterDriverInstallDBusMatches(DBusConnection *sysbus ATTRIBUTE_UNUSED) /** * nwfilterStateInitialize: * - * Initialization function for the QEmu daemon + * Initialization function for the QEMU daemon */ static int nwfilterStateInitialize(bool privileged, diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 43dd561cc..07eab7eff 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -541,7 +541,7 @@ # If clear_emulator_capabilities is enabled, libvirt will drop all -# privileged capabilities of the QEmu/KVM emulator. This is enabled by +# privileged capabilities of the QEMU/KVM emulator. This is enabled by # default. # # Warning: Disabling this option means that a compromised guest can diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 89fd08b64..682d71441 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10009,7 +10009,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, /* * do not use boot=on for drives when not using KVM since this - * is not supported at all in upstream QEmu. + * is not supported at all in upstream QEMU. */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) && (def->virtType == VIR_DOMAIN_VIRT_QEMU)) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7bcc4936d..072eb54b4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -600,7 +600,7 @@ qemuDomainFindMaxID(virDomainObjPtr vm, /** * qemuStateInitialize: * - * Initialization function for the QEmu daemon + * Initialization function for the QEMU daemon */ static int qemuStateInitialize(bool privileged, @@ -951,7 +951,7 @@ qemuStateInitialize(bool privileged, /** * qemuStateAutoStart: * - * Function to auto start the QEmu daemons + * Function to auto start the QEMU daemons */ static void qemuStateAutoStart(void) @@ -978,7 +978,7 @@ static void qemuNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque) /** * qemuStateReload: * - * Function to restart the QEmu daemon, it will recheck the configuration + * Function to restart the QEMU daemon, it will recheck the configuration * files and update its state and the networking */ static int @@ -1069,7 +1069,7 @@ qemuStateStop(void) /** * qemuStateCleanup: * - * Shutdown the QEmu daemon, it will stop all active domains and networks + * Shutdown the QEMU daemon, it will stop all active domains and networks */ static int qemuStateCleanup(void) diff --git a/src/util/virhook.h b/src/util/virhook.h index 205249c55..00544c96f 100644 --- a/src/util/virhook.h +++ b/src/util/virhook.h @@ -28,7 +28,7 @@ typedef enum { VIR_HOOK_DRIVER_DAEMON = 0, /* Daemon related events */ - VIR_HOOK_DRIVER_QEMU, /* QEmu domains related events */ + VIR_HOOK_DRIVER_QEMU, /* QEMU domains related events */ VIR_HOOK_DRIVER_LXC, /* LXC domains related events */ VIR_HOOK_DRIVER_NETWORK, /* network related events */ VIR_HOOK_DRIVER_LIBXL, /* Xen libxl domains related events */ -- 2.13.6

2 1

[libvirt] [dbus PATCH v2 0/5] New APIs and Domain Lifecycle signal change
by Katerina Koukiou 31 Mar '18

31 Mar '18

* Implemented Suspend and Resume APIs. * Reused virsh functions for taking the Event Strings names from ENUM. * Merged all Domain Lifecycle events signals into one signal. Katerina Koukiou (5): Implement Suspend method for Domain interface. Implement Resume method for Domain interface. utils: Introduce functions and macros for translating ENUMs to strings events: Introduce virtDBusEventsDomainEventToString function Merge all Domain lifecycle signals into one signal called Domain. data/org.libvirt.Connect.xml | 54 +++------------------------------------- data/org.libvirt.Domain.xml | 8 ++++++ src/domain.c | 42 +++++++++++++++++++++++++++++++ src/events.c | 59 +++++++++++++++++--------------------------- src/events.h | 3 +++ src/util.c | 27 ++++++++++++++++++++ src/util.h | 29 ++++++++++++++++++++++ test/test_connect.py | 10 +++----- test/test_domain.py | 40 +++++++++++++++++++++++++----- 9 files changed, 172 insertions(+), 100 deletions(-) -- 2.15.0

2 7

[libvirt] [dbus PATCH 0/4] New APIs and Domain Lifecycle signal change
by Katerina Koukiou 31 Mar '18

31 Mar '18

* Implemented Suspend and Resume APIs. * Merged all Domain Lifecycle events signals into one signal. * Reused virsh functions for taking the Event Strings names from ENUM. Katerina Koukiou (4): Implement Suspend method for Domain interface. Implement Resume method for Domain interface. Merge all Domain lifecycle signals into one signal called Domain. Introduce functions for translating Events to strings data/org.libvirt.Connect.xml | 54 +++----------------------------------------- data/org.libvirt.Domain.xml | 8 +++++++ m4/virt-compile-warnings.m4 | 3 +++ src/domain.c | 42 ++++++++++++++++++++++++++++++++++ src/events.c | 39 ++------------------------------ src/util.c | 30 ++++++++++++++++++++++++ src/util.h | 30 ++++++++++++++++++++++++ test/test_connect.py | 10 ++++---- test/test_domain.py | 40 +++++++++++++++++++++++++++----- 9 files changed, 156 insertions(+), 100 deletions(-) -- 2.15.0

3 15

[libvirt] [PATCH] docs: formatdomain: Clarify CPU feature policy option "require"
by Kashyap Chamarthy 31 Mar '18

31 Mar '18

(Thanks: Jiri Denemark, for clarifying this on IRC.) Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6fd2189cd..2410c92af 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1532,7 +1532,7 @@ of it being supported by host CPU.</dd> <dt><code>require</code></dt> <dd>Guest creation will fail unless the feature is supported by host - CPU.</dd> + CPU or the hypervisor is able to emulate it".</dd> <dt><code>optional</code></dt> <dd>The feature will be supported by virtual CPU if and only if it is supported by host CPU.</dd> -- 2.13.6

2 4

[libvirt] [PATCH 00/14] Fixes, cleanups and qcow2+luks support (blockdev-add saga)
by Peter Krempa 31 Mar '18

31 Mar '18

This is a collection of patches from my blockdev-add branch which are basically ready. First few patches are refactors and cleanups which should be justified enough by itself even if the code which will use some of them was not posted yet. Other few patches add checks which will reject configurations which qemu would not accept anyways. The last part adds qcow2+luks support since adding it was rather trivial. Obviously as with raw+luks disks it works only without a backing chain. Peter Krempa (14): tests: utils: Tolerate NULL actual data in virTestCompareToFile conf: Refactor/rename virDomainDiskDefSourceParse conf: Don't require 'def' in virDomainDiskDefParse conf: Extract logic for updating 'detect_zeroes' mode qemu: domain: Add helper to initialize detected parts of the backing chain qemu: domain: Forbid storage type 'cow' in qemu qemu: domain: Forbid VIR_STORAGE_FILE_DIR as a disk format qemu: domain: Forbid VIR_STORAGE_FILE_ISO as a disk format qemu: caps: Add capability for LUKS encrypted qcow2 image support qemu: domain: Validate support for LUKS encryption of QCOW2 images qemu: command: Add support for qcow2 + luks tests: qemu: Test QCOW2 + LUKS support tests: qemuxml2argv: Allow testing of config processed at startup qemu: domain: Move initialization of disk cachemode for <shareable> disks src/conf/domain_conf.c | 58 +++++++---- src/conf/domain_conf.h | 11 +- src/libvirt_private.syms | 3 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 33 +++--- src/qemu/qemu_domain.c | 111 +++++++++++++++++++-- src/qemu/qemu_domain.h | 6 ++ src/qemu/qemu_driver.c | 9 +- tests/Makefile.am | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemuxml2argvdata/disk-drive-fmt-cow.xml | 27 +++++ tests/qemuxml2argvdata/disk-drive-fmt-dir.xml | 27 +++++ tests/qemuxml2argvdata/disk-drive-fmt-iso.xml | 27 +++++ .../qemuxml2argvdata/luks-disks-source-qcow2.args | 66 ++++++++++++ tests/qemuxml2argvdata/luks-disks-source-qcow2.xml | 81 +++++++++++++++ tests/qemuxml2argvtest.c | 47 ++++++++- .../disk-drive-shared.xml | 56 +++++++++++ tests/testutils.c | 4 +- 27 files changed, 521 insertions(+), 58 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-drive-fmt-cow.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-fmt-dir.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-fmt-iso.xml create mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.args create mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.xml create mode 100644 tests/qemuxml2startupxmloutdata/disk-drive-shared.xml -- 2.16.2

2 28

[libvirt] [PATCH] qemu: add virQEMUBuildBufferEscapeComma in qemu_command.c
by Sukrit Bhatnagar 30 Mar '18

30 Mar '18

This patch adds virQEMUBuildBufferEscapeComma wherever applicable in src/qemu/qemu_command.c Based on: https://wiki.libvirt.org/page/BiteSizedTasks#qemu:_Use_comma_escaping_for_m… Signed-off-by: Sukrit Bhatnagar <skrtbhtngr(a)gmail.com> --- This patch is submitted towards my proposal for GSoC'18. Changes made: - info->romfile in qemuBuildRomStr - disk->vendor, disk->product in qemuBuildDriveDevStr - fs->src->path in qemuBuildFSStr - fs->dst in qemuBuildFSDevStr - connect= in qemuBuildHostNetStr - fileval handling in qemuBuildChrChardevStr - TYPE_DEV, TYPE_PIPE handling in qemuBuildChrChardevStr - cfg->vncTLSx509certdir in qemuBuildGraphicsVNCCommandLine - cfg->spiceTLSx509certdir in qemuBuildGraphicsSPICECommandLine - loader->path, loader->nvram usage qemuBuildDomainLoaderCommandLine Places where no changes were made: - src->hosts->socket in qemuBuildNetworkDriveURI uses virAsprintf not virBufferAsprintf; src->path, src->configFile are not used - qemuBuildChrArgStr function does not exist - not applicable on data.nix.path in qemuBuildVhostuserCommandLine - converting places that use strchr in qemuBuildSmartcardCommandLine to use virBufferEscape I have run `make check VIR_TEST_EXPENSIVE=1`, `make syntax-check` and `make -C tests valgrind`. Some tests fail on my system, even for an unmodified clone of the repo. But, all the tests which were passed by the unmodified clone were passed after I made these changes. As always, your feedback is welcome! src/qemu/qemu_command.c | 73 +++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fa0aa5d5c..06f4f72fc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -474,8 +474,10 @@ qemuBuildRomStr(virBufferPtr buf, default: break; } - if (info->romfile) - virBufferAsprintf(buf, ",romfile=%s", info->romfile); + if (info->romfile) { + virBufferAddLit(buf, ",romfile="); + virQEMUBuildBufferEscapeComma(buf, info->romfile); + } } return 0; } @@ -2177,11 +2179,15 @@ qemuBuildDriveDevStr(const virDomainDef *def, virBufferAsprintf(&opt, ",wwn=0x%s", disk->wwn); } - if (disk->vendor) - virBufferAsprintf(&opt, ",vendor=%s", disk->vendor); + if (disk->vendor) { + virBufferAddLit(&opt, ",vendor="); + virQEMUBuildBufferEscapeComma(&opt, disk->vendor); + } - if (disk->product) - virBufferAsprintf(&opt, ",product=%s", disk->product); + if (disk->product) { + virBufferAddLit(&opt, ",product="); + virQEMUBuildBufferEscapeComma(&opt, disk->product); + } if (disk->bus == VIR_DOMAIN_DISK_BUS_USB) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_REMOVABLE)) { @@ -2418,7 +2424,8 @@ qemuBuildFSStr(virDomainFSDefPtr fs, } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); - virBufferAsprintf(&opt, ",path=%s", fs->src->path); + virBufferAddLit(&opt, ",path="); + virQEMUBuildBufferEscapeComma(&opt, fs->src->path); if (fs->readonly) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV_READONLY)) { @@ -2463,7 +2470,8 @@ qemuBuildFSDevStr(const virDomainDef *def, virBufferAsprintf(&opt, ",id=%s", fs->info.alias); virBufferAsprintf(&opt, ",fsdev=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); - virBufferAsprintf(&opt, ",mount_tag=%s", fs->dst); + virBufferAddLit(&opt, ",mount_tag="); + virQEMUBuildBufferEscapeComma(&opt, fs->dst); if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, qemuCaps) < 0) goto error; @@ -3603,10 +3611,9 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_CLIENT: - virBufferAsprintf(&buf, "socket%cconnect=%s:%d,", - type_sep, - net->data.socket.address, - net->data.socket.port); + virBufferAsprintf(&buf, "socket%cconnect=", type_sep); + virQEMUBuildBufferEscapeComma(&buf, net->data.socket.address); + virBufferAsprintf(&buf, ":%d,", net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_SERVER: @@ -4858,7 +4865,8 @@ qemuBuildChrChardevFileStr(virLogManagerPtr logManager, virBufferAsprintf(buf, ",%s=%s,%s=on", filearg, fdpath, appendarg); VIR_FREE(fdpath); } else { - virBufferAsprintf(buf, ",%s=%s", filearg, fileval); + virBufferAsprintf(buf, ",%s=", filearg); + virQEMUBuildBufferEscapeComma(buf, fileval); if (appendval != VIR_TRISTATE_SWITCH_ABSENT) { virBufferAsprintf(buf, ",%s=%s", appendarg, virTristateSwitchTypeToString(appendval)); @@ -4916,9 +4924,10 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, break; case VIR_DOMAIN_CHR_TYPE_DEV: - virBufferAsprintf(&buf, "%s,id=%s,path=%s", + virBufferAsprintf(&buf, "%s,id=%s,path=", STRPREFIX(alias, "parallel") ? "parport" : "tty", - charAlias, dev->data.file.path); + charAlias); + virQEMUBuildBufferEscapeComma(&buf, dev->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_FILE: @@ -4938,8 +4947,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, break; case VIR_DOMAIN_CHR_TYPE_PIPE: - virBufferAsprintf(&buf, "pipe,id=%s,path=%s", charAlias, - dev->data.file.path); + virBufferAsprintf(&buf, "pipe,id=%s,path=", charAlias); + virQEMUBuildBufferEscapeComma(&buf, dev->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_STDIO: @@ -7829,10 +7838,13 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, if (cfg->vncTLS) { virBufferAddLit(&opt, ",tls"); - if (cfg->vncTLSx509verify) - virBufferAsprintf(&opt, ",x509verify=%s", cfg->vncTLSx509certdir); - else - virBufferAsprintf(&opt, ",x509=%s", cfg->vncTLSx509certdir); + if (cfg->vncTLSx509verify) { + virBufferAddLit(&opt, ",x509verify="); + virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir); + } else { + virBufferAddLit(&opt, ",x509="); + virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir); + } } if (cfg->vncSASL) { @@ -7977,8 +7989,11 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, !cfg->spicePassword) virBufferAddLit(&opt, "disable-ticketing,"); - if (hasSecure) - virBufferAsprintf(&opt, "x509-dir=%s,", cfg->spiceTLSx509certdir); + if (hasSecure) { + virBufferAddLit(&opt, "x509-dir="); + virQEMUBuildBufferEscapeComma(&opt, cfg->spiceTLSx509certdir); + virBufferAddLit(&opt, ","); + } switch (graphics->data.spice.defaultMode) { case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: @@ -9463,9 +9478,9 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, NULL); } - virBufferAsprintf(&buf, - "file=%s,if=pflash,format=raw,unit=%d", - loader->path, unit); + virBufferAddLit(&buf, "file="); + virQEMUBuildBufferEscapeComma(&buf, loader->path); + virBufferAsprintf(&buf, ",if=pflash,format=raw,unit=%d", unit); unit++; if (loader->readonly) { @@ -9478,9 +9493,9 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, if (loader->nvram) { virBufferFreeAndReset(&buf); - virBufferAsprintf(&buf, - "file=%s,if=pflash,format=raw,unit=%d", - loader->nvram, unit); + virBufferAddLit(&buf, "file="); + virQEMUBuildBufferEscapeComma(&buf, loader->nvram); + virBufferAsprintf(&buf, ",if=pflash,format=raw,unit=%d", unit); virCommandAddArg(cmd, "-drive"); virCommandAddArgBuffer(cmd, &buf); -- 2.16.2

3 2