- Devel - libvirt List Archives

[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

[libvirt] [PATCH 00/20] Rework/rename virDomainObjListFindBy{UUID|ID}Ref
by John Ferlan 30 Mar '18

30 Mar '18

First, don't be scared off by 20 patches... They're not that difficult. Second, don't be scared off by the all the various code touched. Third, look at all the lines of code being removed! That's unlike my normal patch series! This is really the end game of what I started last year trying to make object access code to be "more common". The last and worse is/was the domain object code which really has a mish-mash of usage models and is (to say the least) confusing depending on the algorithm chosen (ByRef or not). This series focuses on the various virDomainObjListFindBy* APIs to do common things *and* allows the callers to use the common virDomainObjEndAPI when done with the object rather than needing to know whether they should virObjectUnlock and/or virObjectUnref. There were one consumer (libxl) that leaked domain objs because there was no Unref after a Ref on many API's. Additionally, there was a possibility of a deadlock because of a missed Unlock. This reduces a lot of code and reduces the number of virObjectUnlock consumers. Now *obviously* I don't have all these domain types available, but since the goal was to remove the FindBy*Ref APIs, I had to touch much more than I really want to. Of course only a couple are really active anyway and I'm hoping they'll take a peek at their modules (e.g. libxl, vz, and bhyve in particular). Once/if this can get accomplished, fixing the Add and Remove API's is the next task. Those are (to say the least) *really* confusing because the caller should never have to call virObjectRef afterwards, but some do because virDomainObjListAddLocked doesn't make enough references on the obj (places the object in 2 lists, but only accounts for 1). Lots of consumers that have to roll their own "adjustments" because of that. John Ferlan (20): bhyve: Use virDomainObjListFindBy{UUID|ID}Ref libxl: Fix possible deadlock in libxlDomainMigrateBegin3Params libxl: Properly cleanup after libxlDomObjFromDomain libxl: Use virDomainObjListFindBy{UUID|ID}Ref openvz: Cleanup indention openvz: Create accessors to virDomainObjListFindByUUID openvz: Add more descriptive error message on Find failure openvz: Use virDomainObjListFindBy{UUID|ID}Ref uml: Create accessors to virDomainObjListFindByUUID uml: Add more specific error message on failed FindBy call uml: Use virDomainObjListFindBy{UUID|ID}Ref vmware: Create accessors to virDomainObjListFindByUUID vmware: Add more descriptive error message on Find failure vmware: Properly clean up in vmwareDomainLookupByName vmware: Use virDomainObjListFindBy{UUID|ID}Ref vz: Unify vzDomObjFromDomain{Ref} vz: Use virDomainObjListFindBy{UUID|ID}Ref test: Use virDomainObjListFindByUUIDRef conf: Rework/rename virDomainObjListFindByUUIDRef conf: Rework/rename virDomainObjListFindByIDRef src/bhyve/bhyve_driver.c | 52 ++---- src/conf/virdomainobjlist.c | 66 ++------ src/conf/virdomainobjlist.h | 4 - src/libvirt_private.syms | 2 - src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 99 ++++------- src/libxl/libxl_migration.c | 3 +- src/lxc/lxc_driver.c | 7 +- src/openvz/openvz_driver.c | 392 ++++++++++++++----------------------------- src/qemu/qemu_driver.c | 9 +- src/test/test_driver.c | 8 +- src/uml/uml_driver.c | 327 +++++++++++------------------------- src/util/virclosecallbacks.c | 4 +- src/vmware/vmware_driver.c | 234 +++++++++----------------- src/vz/vz_driver.c | 117 +++++++------ src/vz/vz_sdk.c | 13 +- src/vz/vz_utils.c | 34 +--- src/vz/vz_utils.h | 1 - 18 files changed, 458 insertions(+), 916 deletions(-) -- 2.13.6

3 38

[libvirt] [PATCH 0/8] Move the minimum QEMU version closer to 1.3.0
by Ján Tomko 30 Mar '18

30 Mar '18

1.3.0 was released in December 2012, it merged KVM and QEMU and is above our 1.2.0 requirement for QMP capability probing. Ján Tomko (8): virQEMUCapsParseHelpStr: remove unused check_yajl parameter Mandate QEMU >= 0.15.0 Deprecate QEMU_CAPS_PCI_MULTIFUNCTION Deprecate QEMU_CAPS_NETDEV Clean up qemuDomainAttachNetDevice Remove unused qemuDomainNetVLAN Remove qemuDomainSupportsNetdev Deprecate QEMU_CAPS_MONITOR_JSON src/qemu/qemu_capabilities.c | 62 +----- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_capspriv.h | 1 - src/qemu/qemu_command.c | 41 +--- src/qemu/qemu_domain.c | 16 -- src/qemu/qemu_domain.h | 6 - src/qemu/qemu_driver.c | 18 +- src/qemu/qemu_hotplug.c | 138 +++--------- src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_process.c | 8 +- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 3 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 3 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 3 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 3 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 3 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 - tests/qemuhelpdata/qemu-0.12.1 | 198 ----------------- tests/qemuhelpdata/qemu-0.12.1-device | 62 ------ 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/qemuhelptest.c | 130 +---------- .../aarch64-aavmf-virtio-mmio.args | 6 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +- .../qemuxml2argvdata/aarch64-cpu-passthrough.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 6 +- tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 2 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +- tests/qemuxml2argvdata/aarch64-pci-serial.args | 2 +- .../aarch64-usb-controller-nec-xhci.args | 2 +- .../aarch64-usb-controller-qemu-xhci.args | 2 +- tests/qemuxml2argvdata/aarch64-video-default.args | 2 +- .../aarch64-video-virtio-gpu-pci.args | 8 +- .../aarch64-virt-2.6-virtio-pci-default.args | 7 +- .../qemuxml2argvdata/aarch64-virt-default-nic.args | 6 +- tests/qemuxml2argvdata/aarch64-virt-virtio.args | 6 +- .../aarch64-virtio-pci-default.args | 7 +- .../aarch64-virtio-pci-manual-addresses.args | 12 +- tests/qemuxml2argvdata/acpi-table.args | 2 +- tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 2 +- tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 2 +- tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 6 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 6 +- tests/qemuxml2argvdata/autoindex.args | 2 +- tests/qemuxml2argvdata/balloon-ccw-deflate.args | 2 +- tests/qemuxml2argvdata/balloon-device-auto.args | 2 +- .../balloon-device-deflate-off.args | 2 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 2 +- tests/qemuxml2argvdata/balloon-device-period.args | 2 +- tests/qemuxml2argvdata/balloon-device.args | 2 +- tests/qemuxml2argvdata/balloon-mmio-deflate.args | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/bios-nvram.args | 2 +- tests/qemuxml2argvdata/bios.args | 2 +- tests/qemuxml2argvdata/blkdeviotune-group-num.args | 2 +- .../qemuxml2argvdata/blkdeviotune-max-length.args | 2 +- tests/qemuxml2argvdata/blkdeviotune-max.args | 2 +- tests/qemuxml2argvdata/blkdeviotune.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.args | 2 +- tests/qemuxml2argvdata/blkiotune.args | 2 +- tests/qemuxml2argvdata/boot-cdrom.args | 2 +- tests/qemuxml2argvdata/boot-complex-bootindex.args | 13 +- tests/qemuxml2argvdata/boot-complex.args | 12 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +- tests/qemuxml2argvdata/boot-floppy.args | 2 +- .../boot-menu-disable-drive-bootindex.args | 2 +- .../qemuxml2argvdata/boot-menu-disable-drive.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable.args | 2 +- .../boot-menu-enable-bootindex.args | 2 +- .../boot-menu-enable-with-timeout.args | 2 +- tests/qemuxml2argvdata/boot-menu-enable.args | 2 +- tests/qemuxml2argvdata/boot-multi.args | 2 +- tests/qemuxml2argvdata/boot-network.args | 2 +- tests/qemuxml2argvdata/boot-order.args | 8 +- tests/qemuxml2argvdata/boot-strict.args | 13 +- tests/qemuxml2argvdata/bootindex-floppy-q35.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc-old.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 2 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 2 +- .../channel-virtio-autoassign.args | 2 +- tests/qemuxml2argvdata/channel-virtio-default.args | 2 +- tests/qemuxml2argvdata/channel-virtio-state.args | 2 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 2 +- tests/qemuxml2argvdata/channel-virtio.args | 2 +- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- tests/qemuxml2argvdata/clock-catchup.args | 2 +- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-hpet-off.args | 2 +- .../clock-localtime-basis-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime.args | 2 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/clock-utc.args | 2 +- tests/qemuxml2argvdata/clock-variable.args | 2 +- tests/qemuxml2argvdata/console-compat-auto.args | 2 +- tests/qemuxml2argvdata/console-compat-chardev.args | 2 +- tests/qemuxml2argvdata/console-compat.args | 2 +- tests/qemuxml2argvdata/console-sclp.args | 2 +- tests/qemuxml2argvdata/console-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/console-virtio-many.args | 2 +- tests/qemuxml2argvdata/console-virtio-s390.args | 2 +- tests/qemuxml2argvdata/console-virtio.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 7 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable2.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-none.args | 2 +- .../qemuxml2argvdata/cpu-check-default-none2.args | 2 +- .../cpu-check-default-partial.args | 2 +- .../cpu-check-default-partial2.args | 2 +- tests/qemuxml2argvdata/cpu-check-none.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- .../qemuxml2argvdata/cpu-host-model-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-hotplug-startup.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +- tests/qemuxml2argvdata/cpu-numa-memshared.args | 2 +- .../cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.args | 2 +- tests/qemuxml2argvdata/cpu-s390-features.args | 2 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- tests/qemuxml2argvdata/cputune-numatune.args | 2 +- tests/qemuxml2argvdata/cputune-zero-shares.args | 2 +- tests/qemuxml2argvdata/cputune.args | 2 +- tests/qemuxml2argvdata/debug-threads.args | 2 +- tests/qemuxml2argvdata/default-kvm-host-arch.args | 2 +- tests/qemuxml2argvdata/default-qemu-host-arch.args | 2 +- tests/qemuxml2argvdata/disk-aio.args | 2 +- tests/qemuxml2argvdata/disk-blockio.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-empty.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 2 +- .../qemuxml2argvdata/disk-cdrom-network-ftps.args | 2 +- .../qemuxml2argvdata/disk-cdrom-network-http.args | 2 +- .../qemuxml2argvdata/disk-cdrom-network-https.args | 2 +- .../qemuxml2argvdata/disk-cdrom-network-tftp.args | 2 +- .../disk-cdrom-tray-no-device-cap.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +- tests/qemuxml2argvdata/disk-cdrom.args | 2 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 8 +- tests/qemuxml2argvdata/disk-drive-boot-cdrom.args | 2 +- tests/qemuxml2argvdata/disk-drive-boot-disk.args | 2 +- .../disk-drive-cache-directsync.args | 2 +- .../qemuxml2argvdata/disk-drive-cache-unsafe.args | 2 +- .../qemuxml2argvdata/disk-drive-cache-v2-none.args | 2 +- tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args | 2 +- tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args | 2 +- .../qemuxml2argvdata/disk-drive-copy-on-read.args | 2 +- .../qemuxml2argvdata/disk-drive-detect-zeroes.args | 2 +- tests/qemuxml2argvdata/disk-drive-discard.args | 2 +- tests/qemuxml2argvdata/disk-drive-fmt-qcow.args | 2 +- .../disk-drive-network-gluster.args | 2 +- .../disk-drive-network-iscsi-auth.args | 2 +- .../disk-drive-network-iscsi-lun.args | 2 +- .../qemuxml2argvdata/disk-drive-network-iscsi.args | 2 +- .../disk-drive-network-nbd-export.args | 2 +- .../disk-drive-network-nbd-ipv6-export.args | 2 +- .../disk-drive-network-nbd-ipv6.args | 2 +- .../disk-drive-network-nbd-unix.args | 2 +- tests/qemuxml2argvdata/disk-drive-network-nbd.args | 2 +- .../disk-drive-network-rbd-auth-AES.args | 2 +- .../disk-drive-network-rbd-auth.args | 2 +- .../disk-drive-network-rbd-ipv6.args | 2 +- tests/qemuxml2argvdata/disk-drive-network-rbd.args | 2 +- .../disk-drive-network-sheepdog.args | 2 +- .../disk-drive-network-source-auth.args | 2 +- .../disk-drive-network-tlsx509-vxhs.args | 2 +- .../qemuxml2argvdata/disk-drive-network-vxhs.args | 2 +- tests/qemuxml2argvdata/disk-drive-no-boot.args | 2 +- .../qemuxml2argvdata/disk-drive-readonly-disk.args | 2 +- .../disk-drive-readonly-no-device.args | 2 +- .../disk-drive-shared-locking.args | 2 +- tests/qemuxml2argvdata/disk-drive-shared.args | 2 +- .../disk-floppy-tray-no-device-cap.args | 2 +- tests/qemuxml2argvdata/disk-floppy-tray.args | 2 +- tests/qemuxml2argvdata/disk-floppy.args | 2 +- tests/qemuxml2argvdata/disk-geometry.args | 2 +- .../disk-hostdev-scsi-virtio-iscsi-auth-AES.args | 2 +- tests/qemuxml2argvdata/disk-ide-drive-split.args | 2 +- tests/qemuxml2argvdata/disk-ide-wwn.args | 2 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 6 +- tests/qemuxml2argvdata/disk-iscsi.args | 2 +- .../qemuxml2argvdata/disk-many-format-probing.args | 2 +- tests/qemuxml2argvdata/disk-many.args | 2 +- tests/qemuxml2argvdata/disk-order.args | 2 +- tests/qemuxml2argvdata/disk-sata-device.args | 2 +- tests/qemuxml2argvdata/disk-scsi-device-auto.args | 2 +- tests/qemuxml2argvdata/disk-scsi-device.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-split.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 2 +- .../disk-scsi-lun-passthrough.args | 2 +- tests/qemuxml2argvdata/disk-scsi-megasas.args | 2 +- tests/qemuxml2argvdata/disk-scsi-mptsas1068.args | 2 +- tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args | 2 +- tests/qemuxml2argvdata/disk-scsi-vscsi.args | 2 +- tests/qemuxml2argvdata/disk-serial.args | 2 +- tests/qemuxml2argvdata/disk-snapshot.args | 2 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 2 +- tests/qemuxml2argvdata/disk-source-pool.args | 2 +- .../disk-usb-device-removable.args | 2 +- tests/qemuxml2argvdata/disk-usb-device.args | 2 +- tests/qemuxml2argvdata/disk-virtio-ccw-many.args | 2 +- tests/qemuxml2argvdata/disk-virtio-ccw.args | 2 +- .../qemuxml2argvdata/disk-virtio-drive-queues.args | 2 +- tests/qemuxml2argvdata/disk-virtio-s390.args | 2 +- tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args | 2 +- .../disk-virtio-scsi-cmd_per_lun.args | 2 +- .../disk-virtio-scsi-ioeventfd.args | 2 +- .../disk-virtio-scsi-max_sectors.args | 2 +- .../disk-virtio-scsi-num_queues.args | 2 +- tests/qemuxml2argvdata/disk-virtio.args | 2 +- tests/qemuxml2argvdata/encrypted-disk-usage.args | 2 +- tests/qemuxml2argvdata/encrypted-disk.args | 2 +- tests/qemuxml2argvdata/eoi-disabled.args | 2 +- tests/qemuxml2argvdata/eoi-enabled.args | 2 +- tests/qemuxml2argvdata/event_idx.args | 8 +- .../fd-memory-no-numa-topology.args | 2 +- .../qemuxml2argvdata/fd-memory-numa-topology.args | 2 +- .../qemuxml2argvdata/fd-memory-numa-topology2.args | 2 +- .../qemuxml2argvdata/fd-memory-numa-topology3.args | 2 +- tests/qemuxml2argvdata/fips-enabled.args | 2 +- tests/qemuxml2argvdata/floppy-drive-fat.args | 2 +- tests/qemuxml2argvdata/fs9p-ccw.args | 2 +- tests/qemuxml2argvdata/fs9p.args | 2 +- .../qemuxml2argvdata/graphics-sdl-fullscreen.args | 2 +- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- .../graphics-spice-agent-file-xfer.args | 2 +- .../graphics-spice-agentmouse.args | 2 +- .../graphics-spice-auto-socket-cfg.args | 2 +- .../graphics-spice-auto-socket.args | 2 +- .../graphics-spice-compression.args | 2 +- tests/qemuxml2argvdata/graphics-spice-no-args.args | 2 +- tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 2 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 2 +- tests/qemuxml2argvdata/graphics-spice-socket.args | 2 +- tests/qemuxml2argvdata/graphics-spice-timeout.args | 7 +- .../qemuxml2argvdata/graphics-spice-usb-redir.args | 2 +- tests/qemuxml2argvdata/graphics-spice.args | 2 +- .../graphics-vnc-auto-socket-cfg.args | 2 +- .../qemuxml2argvdata/graphics-vnc-auto-socket.args | 2 +- .../graphics-vnc-no-listen-attr.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-none.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-policy.args | 2 +- .../graphics-vnc-remove-generated-socket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 2 +- .../graphics-vnc-socket-new-cmdline.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-socket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-websocket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc.args | 2 +- .../qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +- .../hostdev-pci-address-device.args | 2 +- tests/qemuxml2argvdata/hostdev-pci-address.args | 2 +- .../hostdev-scsi-lsi-iscsi-auth.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-readonly.args | 2 +- .../hostdev-scsi-vhost-scsi-ccw.args | 2 +- .../hostdev-scsi-vhost-scsi-pci.args | 2 +- .../hostdev-scsi-vhost-scsi-pcie.args | 2 +- .../hostdev-scsi-virtio-iscsi-auth.args | 2 +- .../hostdev-scsi-virtio-iscsi.args | 2 +- .../qemuxml2argvdata/hostdev-scsi-virtio-scsi.args | 2 +- .../hostdev-usb-address-device-boot.args | 2 +- .../hostdev-usb-address-device.args | 2 +- tests/qemuxml2argvdata/hostdev-usb-address.args | 2 +- .../qemuxml2argvdata/hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hotplug-base.args | 2 +- tests/qemuxml2argvdata/hugepages-memaccess.args | 2 +- tests/qemuxml2argvdata/hugepages-memaccess2.args | 2 +- tests/qemuxml2argvdata/hugepages-numa.args | 2 +- tests/qemuxml2argvdata/hugepages-pages.args | 2 +- tests/qemuxml2argvdata/hugepages-pages2.args | 2 +- tests/qemuxml2argvdata/hugepages-pages3.args | 2 +- tests/qemuxml2argvdata/hugepages-pages5.args | 2 +- tests/qemuxml2argvdata/hugepages-pages6.args | 2 +- tests/qemuxml2argvdata/hugepages-pages7.args | 2 +- tests/qemuxml2argvdata/hugepages-shared.args | 2 +- tests/qemuxml2argvdata/hugepages.args | 2 +- tests/qemuxml2argvdata/hyperv-off.args | 2 +- tests/qemuxml2argvdata/hyperv-panic.args | 2 +- tests/qemuxml2argvdata/hyperv.args | 2 +- tests/qemuxml2argvdata/input-usbmouse-addr.args | 2 +- tests/qemuxml2argvdata/input-usbmouse.args | 2 +- tests/qemuxml2argvdata/input-usbtablet.args | 2 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 2 +- .../qemuxml2argvdata/intel-iommu-caching-mode.args | 7 +- .../qemuxml2argvdata/intel-iommu-device-iotlb.args | 2 +- tests/qemuxml2argvdata/intel-iommu-eim.args | 2 +- tests/qemuxml2argvdata/intel-iommu-machine.args | 2 +- tests/qemuxml2argvdata/intel-iommu.args | 2 +- .../iothreads-disk-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/iothreads-disk.args | 2 +- tests/qemuxml2argvdata/iothreads-ids-partial.args | 2 +- tests/qemuxml2argvdata/iothreads-ids.args | 2 +- .../iothreads-virtio-scsi-ccw.args | 2 +- .../iothreads-virtio-scsi-pci.args | 2 +- tests/qemuxml2argvdata/iothreads.args | 2 +- tests/qemuxml2argvdata/kvm-features-off.args | 2 +- tests/qemuxml2argvdata/kvm-features.args | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +- tests/qemuxml2argvdata/kvm.args | 2 +- tests/qemuxml2argvdata/kvmclock+eoi-disabled.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- tests/qemuxml2argvdata/luks-disks-source.args | 2 +- tests/qemuxml2argvdata/luks-disks.args | 2 +- .../qemuxml2argvdata/mach-virt-console-virtio.args | 2 +- .../qemuxml2argvdata/mach-virt-serial-native.args | 2 +- tests/qemuxml2argvdata/mach-virt-serial-pci.args | 2 +- tests/qemuxml2argvdata/mach-virt-serial-usb.args | 2 +- .../machine-aeskeywrap-off-cap.args | 2 +- .../machine-aeskeywrap-off-caps.args | 2 +- .../machine-aeskeywrap-on-cap.args | 2 +- .../machine-aeskeywrap-on-caps.args | 2 +- tests/qemuxml2argvdata/machine-aliases1.args | 2 +- tests/qemuxml2argvdata/machine-aliases2.args | 2 +- tests/qemuxml2argvdata/machine-core-cfg-off.args | 2 +- tests/qemuxml2argvdata/machine-core-off.args | 2 +- tests/qemuxml2argvdata/machine-core-on.args | 2 +- .../machine-deakeywrap-off-cap.args | 2 +- .../machine-deakeywrap-off-caps.args | 2 +- .../machine-deakeywrap-on-cap.args | 2 +- .../machine-deakeywrap-on-caps.args | 2 +- .../machine-keywrap-none-caps.args | 2 +- tests/qemuxml2argvdata/machine-keywrap-none.args | 2 +- .../machine-loadparm-multiple-disks-nets-s390.args | 13 +- .../machine-loadparm-net-s390.args | 8 +- tests/qemuxml2argvdata/machine-loadparm-s390.args | 2 +- tests/qemuxml2argvdata/machine-smm-opt.args | 2 +- tests/qemuxml2argvdata/machine-usb-opt.args | 2 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 2 +- tests/qemuxml2argvdata/master-key.args | 2 +- .../qemuxml2argvdata/memory-hotplug-dimm-addr.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- .../memory-hotplug-nvdimm-access.args | 2 +- .../memory-hotplug-nvdimm-label.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm.args | 2 +- .../memory-hotplug-ppc64-nonuma.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/memtune.args | 2 +- tests/qemuxml2argvdata/migrate-numa-unaligned.args | 2 +- tests/qemuxml2argvdata/migrate.args | 2 +- tests/qemuxml2argvdata/minimal-msg-timestamp.args | 2 +- tests/qemuxml2argvdata/minimal.args | 2 +- tests/qemuxml2argvdata/misc-acpi.args | 2 +- tests/qemuxml2argvdata/misc-disable-s3.args | 2 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 2 +- tests/qemuxml2argvdata/misc-enable-s4.args | 2 +- tests/qemuxml2argvdata/misc-no-reboot.args | 2 +- tests/qemuxml2argvdata/misc-uuid.args | 2 +- tests/qemuxml2argvdata/mlock-off.args | 2 +- tests/qemuxml2argvdata/mlock-on.args | 2 +- tests/qemuxml2argvdata/mlock-unsupported.args | 2 +- .../qemuxml2argvdata/multifunction-pci-device.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 2 +- tests/qemuxml2argvdata/net-client.args | 7 +- tests/qemuxml2argvdata/net-eth-hostip.args | 7 +- tests/qemuxml2argvdata/net-eth-ifname.args | 7 +- tests/qemuxml2argvdata/net-eth-names.args | 11 +- tests/qemuxml2argvdata/net-eth.args | 7 +- .../qemuxml2argvdata/net-hostdev-multidomain.args | 2 +- .../net-hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev.args | 2 +- tests/qemuxml2argvdata/net-mcast.args | 7 +- tests/qemuxml2argvdata/net-server.args | 7 +- tests/qemuxml2argvdata/net-udp.args | 8 +- tests/qemuxml2argvdata/net-user-addr.args | 2 +- tests/qemuxml2argvdata/net-user.args | 7 +- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 2 +- tests/qemuxml2argvdata/net-vhostuser.args | 2 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 12 +- tests/qemuxml2argvdata/net-virtio-device.args | 8 +- .../net-virtio-disable-offloads.args | 6 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +- .../qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 8 +- tests/qemuxml2argvdata/net-virtio-s390.args | 6 +- tests/qemuxml2argvdata/net-virtio.args | 7 +- tests/qemuxml2argvdata/no-kvm-pit-device.args | 2 +- tests/qemuxml2argvdata/nographics-display.args | 2 +- tests/qemuxml2argvdata/nographics-vga.args | 2 +- tests/qemuxml2argvdata/nographics.args | 2 +- tests/qemuxml2argvdata/nosharepages.args | 2 +- .../numad-auto-memory-vcpu-cpuset.args | 2 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- .../numad-auto-vcpu-static-numatune.args | 2 +- .../numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad.args | 2 +- .../numatune-auto-nodeset-invalid.args | 2 +- tests/qemuxml2argvdata/numatune-auto-prefer.args | 2 +- tests/qemuxml2argvdata/numatune-distances.args | 2 +- .../numatune-memnode-no-memory.args | 2 +- tests/qemuxml2argvdata/numatune-memnode.args | 2 +- tests/qemuxml2argvdata/numatune-memory.args | 2 +- tests/qemuxml2argvdata/panic-double.args | 2 +- tests/qemuxml2argvdata/panic-no-address.args | 2 +- tests/qemuxml2argvdata/panic.args | 2 +- .../qemuxml2argvdata/parallel-parport-chardev.args | 2 +- tests/qemuxml2argvdata/parallel-tcp-chardev.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +- tests/qemuxml2argvdata/pci-bridge-many-disks.args | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 153 +++++++------ tests/qemuxml2argvdata/pci-expander-bus.args | 153 +++++++------ tests/qemuxml2argvdata/pci-many.args | 2 +- tests/qemuxml2argvdata/pci-rom.args | 14 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 157 +++++++------ .../pcie-root-port-model-generic.args | 2 +- .../pcie-root-port-model-ioh3420.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- tests/qemuxml2argvdata/pcie-root.args | 2 +- .../pcie-switch-downstream-port.args | 2 +- .../pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/pcihole64.args | 2 +- tests/qemuxml2argvdata/pmu-feature-off.args | 2 +- tests/qemuxml2argvdata/pmu-feature.args | 2 +- tests/qemuxml2argvdata/ppc-dtb.args | 2 +- .../ppc64-usb-controller-legacy.args | 2 +- .../ppc64-usb-controller-qemu-xhci.args | 2 +- tests/qemuxml2argvdata/ppc64-usb-controller.args | 2 +- tests/qemuxml2argvdata/ppce500-serial.args | 2 +- tests/qemuxml2argvdata/pseries-basic.args | 2 +- tests/qemuxml2argvdata/pseries-console-virtio.args | 2 +- .../pseries-cpu-compat-power9.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-compat.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +- tests/qemuxml2argvdata/pseries-features.args | 2 +- tests/qemuxml2argvdata/pseries-hostdevs-1.args | 2 +- tests/qemuxml2argvdata/pseries-hostdevs-2.args | 2 +- tests/qemuxml2argvdata/pseries-hostdevs-3.args | 2 +- .../pseries-machine-max-cpu-compat.args | 2 +- tests/qemuxml2argvdata/pseries-many-buses-1.args | 2 +- tests/qemuxml2argvdata/pseries-many-buses-2.args | 2 +- tests/qemuxml2argvdata/pseries-many-devices.args | 2 +- tests/qemuxml2argvdata/pseries-nvram.args | 2 +- tests/qemuxml2argvdata/pseries-panic-missing.args | 2 +- .../qemuxml2argvdata/pseries-panic-no-address.args | 2 +- .../pseries-phb-default-missing.args | 2 +- tests/qemuxml2argvdata/pseries-phb-numa-node.args | 2 +- tests/qemuxml2argvdata/pseries-phb-simple.args | 2 +- tests/qemuxml2argvdata/pseries-serial-native.args | 2 +- tests/qemuxml2argvdata/pseries-serial-pci.args | 2 +- tests/qemuxml2argvdata/pseries-serial-usb.args | 2 +- tests/qemuxml2argvdata/pseries-usb-default.args | 2 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +- .../pseries-vio-user-assigned.args | 2 +- tests/qemuxml2argvdata/pseries-vio.args | 2 +- tests/qemuxml2argvdata/pv-spinlock-disabled.args | 2 +- tests/qemuxml2argvdata/pv-spinlock-enabled.args | 2 +- tests/qemuxml2argvdata/q35-acpi-nouefi.args | 2 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 2 +- .../qemuxml2argvdata/q35-default-devices-only.args | 2 +- tests/qemuxml2argvdata/q35-multifunction.args | 2 +- tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 2 +- tests/qemuxml2argvdata/q35-pci-force-address.args | 7 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 2 +- tests/qemuxml2argvdata/q35-pcie.args | 2 +- .../qemuxml2argvdata/q35-pm-disable-fallback.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable.args | 2 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 2 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +- .../qemuxml2argvdata/qemu-ns-commandline-ns0.args | 2 +- .../qemuxml2argvdata/qemu-ns-commandline-ns1.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 2 +- .../qemu-ns-domain-commandline-ns0.args | 2 +- .../qemu-ns-domain-commandline.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +- tests/qemuxml2argvdata/qemu-ns.args | 2 +- .../qemuxml2argvdata/reboot-timeout-disabled.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.args | 2 +- tests/qemuxml2argvdata/restore-v2.args | 2 +- .../s390-allow-bogus-usb-controller.args | 2 +- .../s390-allow-bogus-usb-none.args | 2 +- tests/qemuxml2argvdata/s390-panic-missing.args | 2 +- tests/qemuxml2argvdata/s390-panic-no-address.args | 2 +- tests/qemuxml2argvdata/s390-serial-2.args | 2 +- tests/qemuxml2argvdata/s390-serial-console.args | 2 +- tests/qemuxml2argvdata/s390-serial.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +- .../seclabel-dynamic-baselabel.args | 2 +- .../seclabel-dynamic-labelskip.args | 2 +- .../seclabel-dynamic-override.args | 2 +- .../qemuxml2argvdata/seclabel-dynamic-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +- tests/qemuxml2argvdata/seclabel-none.args | 2 +- .../seclabel-static-labelskip.args | 2 +- .../qemuxml2argvdata/seclabel-static-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-static.args | 2 +- .../serial-dev-chardev-iobase.args | 2 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 2 +- tests/qemuxml2argvdata/serial-file-chardev.args | 2 +- tests/qemuxml2argvdata/serial-file-log.args | 2 +- tests/qemuxml2argvdata/serial-many-chardev.args | 2 +- tests/qemuxml2argvdata/serial-pty-chardev.args | 2 +- .../qemuxml2argvdata/serial-spiceport-nospice.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- tests/qemuxml2argvdata/serial-tcp-chardev.args | 2 +- .../serial-tcp-telnet-chardev.args | 2 +- .../serial-tcp-tlsx509-chardev-notls.args | 2 +- .../serial-tcp-tlsx509-chardev-verify.args | 2 +- .../serial-tcp-tlsx509-chardev.args | 2 +- .../serial-tcp-tlsx509-secret-chardev.args | 2 +- tests/qemuxml2argvdata/serial-udp-chardev.args | 2 +- tests/qemuxml2argvdata/serial-unix-chardev.args | 2 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 2 +- tests/qemuxml2argvdata/shmem.args | 2 +- tests/qemuxml2argvdata/smartcard-controller.args | 2 +- .../smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- .../smartcard-passthrough-spicevmc.args | 2 +- .../smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/smbios.args | 2 +- tests/qemuxml2argvdata/smp.args | 2 +- tests/qemuxml2argvdata/sound-device.args | 2 +- tests/qemuxml2argvdata/sound.args | 2 +- tests/qemuxml2argvdata/tpm-passthrough.args | 2 +- .../usb-controller-default-q35.args | 2 +- .../usb-controller-explicit-q35.args | 2 +- .../qemuxml2argvdata/usb-controller-qemu-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +- tests/qemuxml2argvdata/usb-hub.args | 2 +- tests/qemuxml2argvdata/usb-ich9-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-ich9-companion.args | 2 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +- tests/qemuxml2argvdata/usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/usb-none.args | 2 +- tests/qemuxml2argvdata/usb-piix3-controller.args | 2 +- tests/qemuxml2argvdata/usb-port-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-port-missing.args | 2 +- tests/qemuxml2argvdata/usb-ports.args | 2 +- tests/qemuxml2argvdata/usb-redir-boot.args | 2 +- .../qemuxml2argvdata/usb-redir-filter-version.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter.args | 2 +- tests/qemuxml2argvdata/usb-redir.args | 2 +- tests/qemuxml2argvdata/usb-xhci-autoassign.args | 2 +- tests/qemuxml2argvdata/usb1-usb2.args | 2 +- tests/qemuxml2argvdata/user-aliases-usb.args | 2 +- tests/qemuxml2argvdata/user-aliases.args | 20 +- tests/qemuxml2argvdata/vcpu-placement-static.args | 2 +- .../video-device-pciaddr-default.args | 2 +- .../qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-qxl-nodevice.args | 2 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +- .../video-qxl-sec-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +- .../qemuxml2argvdata/video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device.args | 2 +- tests/qemuxml2argvdata/video-vga-nodevice.args | 2 +- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 2 +- .../qemuxml2argvdata/video-virtio-gpu-device.args | 2 +- .../video-virtio-gpu-secondary.args | 2 +- .../video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- .../qemuxml2argvdata/virtio-input-passthrough.args | 2 +- tests/qemuxml2argvdata/virtio-input.args | 2 +- tests/qemuxml2argvdata/virtio-lun.args | 7 +- tests/qemuxml2argvdata/virtio-options.args | 8 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +- tests/qemuxml2argvdata/virtio-rng-default.args | 2 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +- tests/qemuxml2argvdata/virtio-rng-multiple.args | 2 +- tests/qemuxml2argvdata/virtio-rng-random.args | 2 +- tests/qemuxml2argvdata/vmcoreinfo.args | 2 +- tests/qemuxml2argvdata/watchdog-device.args | 2 +- tests/qemuxml2argvdata/watchdog-diag288.args | 2 +- tests/qemuxml2argvdata/watchdog-dump.args | 2 +- tests/qemuxml2argvdata/watchdog-injectnmi.args | 2 +- tests/qemuxml2argvdata/watchdog.args | 2 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +- tests/qemuxml2argvtest.c | 90 ++------ tests/qemuxml2xmltest.c | 35 +-- 648 files changed, 1097 insertions(+), 2336 deletions(-) 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-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 -- 2.16.1

1 9

[libvirt] [PATCH] qemu_monitor_json: Properly check "return" type
by Jiri Denemark 29 Mar '18

29 Mar '18

My commit 2e0d6cdec41 claimed qemuMonitorJSONCheckError guarantees "return" object exists in the JSON reply. But it only makes sure the key is there, while the type of the value is not checked. A lot of callers do not care since they only want to see whether their QMP command failed or not, but any caller which needs to read some data from the reply wants to make sure the correct data type was returned. This patch adds a new API called qemuMonitorJSONCheckReply which calls qemuMonitorJSONCheckError and checks "return" contains a value of the specified type. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 261 ++++++++++++++++++------------------------- 1 file changed, 108 insertions(+), 153 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d80c4f18d1..b251fc9964 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -413,6 +413,36 @@ qemuMonitorJSONCheckError(virJSONValuePtr cmd, } +static int +qemuMonitorJSONCheckReply(virJSONValuePtr cmd, + virJSONValuePtr reply, + virJSONType type) +{ + virJSONValuePtr data; + + if (qemuMonitorJSONCheckError(cmd, reply) < 0) + return -1; + + data = virJSONValueObjectGet(reply, "return"); + if (data->type != type) { + char *cmdstr = virJSONValueToString(cmd, false); + char *retstr = virJSONValueToString(data, false); + + VIR_DEBUG("Unexpected return type %d (expecting %d) for command %s: %s", + data->type, type, cmdstr, retstr); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected type returned by QEMU command '%s'"), + qemuMonitorJSONCommandName(cmd)); + + VIR_FREE(cmdstr); + VIR_FREE(retstr); + return -1; + } + + return 0; +} + + static bool qemuMonitorJSONErrorIsClass(virJSONValuePtr error, const char *klass) @@ -1389,7 +1419,7 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -1616,7 +1646,7 @@ int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -1777,7 +1807,7 @@ qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, } /* See if any other fatal error occurred */ - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -1878,7 +1908,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, } } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -1956,14 +1986,10 @@ qemuMonitorJSONQueryBlock(qemuMonitorPtr mon) return NULL; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0 || - qemuMonitorJSONCheckError(cmd, reply) < 0) + qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(devices = virJSONValueObjectStealArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-block reply was missing device list")); - goto cleanup; - } + devices = virJSONValueObjectStealArray(reply, "return"); cleanup: virJSONValueFree(cmd); @@ -2163,14 +2189,10 @@ qemuMonitorJSONQueryBlockstats(qemuMonitorPtr mon) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(ret = virJSONValueObjectStealArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-blockstats reply was missing device list")); - goto cleanup; - } + ret = virJSONValueObjectStealArray(reply, "return"); cleanup: virJSONValueFree(cmd); @@ -2705,13 +2727,12 @@ qemuMonitorJSONGetMigrationCacheSize(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_NUMBER) < 0) goto cleanup; if (virJSONValueObjectGetNumberUlong(reply, "return", cacheSize) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-migrate-cache-size reply was missing " - "'return' data")); + _("invalid cache size in query-migrate-cache-size reply")); goto cleanup; } @@ -2773,7 +2794,7 @@ qemuMonitorJSONGetMigrationParams(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; result = virJSONValueObjectGet(reply, "return"); @@ -3133,7 +3154,7 @@ int qemuMonitorJSONGetMigrationStats(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; if (qemuMonitorJSONGetMigrationStatsReply(reply, stats, error) < 0) @@ -3225,7 +3246,7 @@ qemuMonitorJSONQueryDump(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; result = virJSONValueObjectGetObject(reply, "return"); @@ -3262,7 +3283,7 @@ qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; caps = virJSONValueObjectGetObject(reply, "return"); @@ -3434,7 +3455,7 @@ qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name) ret = -2; goto cleanup; } - ret = qemuMonitorJSONCheckError(cmd, reply); + ret = qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT); } if (ret == 0) { virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); @@ -3561,11 +3582,8 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, if (!fil) goto cleanup; - if (!(returnArray = virJSONValueObjectGetArray(msg, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-rx-filter reply was missing return data")); - goto cleanup; - } + returnArray = virJSONValueObjectGetArray(msg, "return"); + if (!(entry = virJSONValueArrayGet(returnArray, 0))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query -rx-filter return data missing array element")); @@ -3739,7 +3757,7 @@ qemuMonitorJSONQueryRxFilter(qemuMonitorPtr mon, const char *alias, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; if (qemuMonitorJSONQueryRxFilterParse(reply, filter) < 0) @@ -3776,11 +3794,7 @@ qemuMonitorJSONExtractChardevInfo(virJSONValuePtr reply, size_t i; qemuMonitorChardevInfoPtr entry = NULL; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("character device reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); for (i = 0; i < virJSONValueArraySize(data); i++) { virJSONValuePtr chardev = virJSONValueArrayGet(data, i); @@ -3857,7 +3871,7 @@ qemuMonitorJSONGetChardevInfo(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; ret = qemuMonitorJSONExtractChardevInfo(reply, info); @@ -5035,7 +5049,7 @@ int qemuMonitorJSONGetVersion(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -5101,15 +5115,11 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-machines reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(infolist, n + 1) < 0) @@ -5206,15 +5216,11 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-cpu-definitions reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); if (VIR_ALLOC_N(cpulist, n) < 0) goto cleanup; @@ -5411,7 +5417,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -5494,15 +5500,11 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-commands reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(commandlist, n + 1) < 0) @@ -5559,15 +5561,11 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-events reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(eventlist, n + 1) < 0) @@ -5744,7 +5742,7 @@ int qemuMonitorJSONGetKVMState(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -5784,15 +5782,11 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list-types reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(typelist, n + 1) < 0) @@ -5846,15 +5840,11 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(pathlist, n + 1) < 0) @@ -6085,15 +6075,11 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("device-list-properties reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(proplist, n + 1) < 0) @@ -6140,7 +6126,7 @@ qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -6186,15 +6172,11 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(caps = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(caps)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing migration capabilities")); - goto cleanup; - } + caps = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(caps); if (VIR_ALLOC_N(list, n + 1) < 0) goto cleanup; @@ -6330,15 +6312,11 @@ qemuMonitorJSONGetGICCapabilities(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(caps = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(caps)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing GIC capabilities")); - goto cleanup; - } + caps = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(caps); /* If the returned array was empty we have to return successfully */ if (n == 0) { @@ -6555,16 +6533,11 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s reply data was not an array"), - qmpCmd); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(list, n + 1) < 0) @@ -6792,8 +6765,13 @@ qemuMonitorJSONAttachCharDev(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) - goto cleanup; + if (chr->type == VIR_DOMAIN_CHR_TYPE_PTY) { + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) + goto cleanup; + } else { + if (qemuMonitorJSONCheckError(cmd, reply) < 0) + goto cleanup; + } if (chr->type == VIR_DOMAIN_CHR_TYPE_PTY) { virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); @@ -6939,11 +6917,7 @@ qemuMonitorJSONParseCPUx86Features(virJSONValuePtr data) size_t i; ssize_t n; - if (!data || (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("invalid array of CPUID features")); - goto error; - } + n = virJSONValueArraySize(data); if (!(cpudata = virCPUDataNew(VIR_ARCH_X86_64))) goto error; @@ -6982,7 +6956,7 @@ qemuMonitorJSONGetCPUx86Data(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply)) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; data = virJSONValueObjectGetArray(reply, "return"); @@ -7029,15 +7003,11 @@ qemuMonitorJSONCheckCPUx86(qemuMonitorPtr mon) } } - if (qemuMonitorJSONCheckError(cmd, reply)) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); for (i = 0; i < n; i++) { virJSONValuePtr element = virJSONValueArrayGet(data, i); @@ -7162,15 +7132,11 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-iothreads reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(infolist, n + 1) < 0) @@ -7251,15 +7217,11 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-memory-devices reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); for (i = 0; i < n; i++) { virJSONValuePtr elem = virJSONValueArrayGet(data, i); @@ -7582,7 +7544,7 @@ qemuMonitorJSONGetRTCTime(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGet(reply, "return"); @@ -7741,16 +7703,11 @@ qemuMonitorJSONGetHotpluggableCPUs(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; data = virJSONValueObjectGet(reply, "return"); - - if ((ninfo = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-hotpluggable-cpus reply is not an array")); - goto cleanup; - } + ninfo = virJSONValueArraySize(data); if (VIR_ALLOC_N(info, ninfo) < 0) goto cleanup; @@ -7789,12 +7746,10 @@ qemuMonitorJSONQueryQMPSchema(qemuMonitorPtr mon) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(ret = virJSONValueObjectStealArray(reply, "return"))) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-qmp-schema reply is not an array")); + ret = virJSONValueObjectStealArray(reply, "return"); cleanup: virJSONValueFree(cmd); @@ -7848,7 +7803,7 @@ qemuMonitorJSONQueryNamedBlockNodes(qemuMonitorPtr mon) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; ret = virJSONValueObjectStealArray(reply, "return"); -- 2.16.3

2 1

[libvirt] [PATCH] virsh: add missing help info of --source to domifaddr
by Chen Hanxiao 29 Mar '18

29 Mar '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> commit b4b5c82ce forgot to add this. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 68da11ed5..0f768d394 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2160,7 +2160,7 @@ static const vshCmdOptDef opts_domifaddr[] = { {.name = "source", .type = VSH_OT_STRING, .flags = VSH_OFLAG_NONE, - .help = N_("address source: 'lease' or 'agent'")}, + .help = N_("address source: 'lease', 'agent' or 'arp'")}, {.name = NULL} }; -- 2.14.3

2 2

[libvirt] [PATCH libvirt sparse files under format=qcow2 v1 0/2] Problem: libvirt fails to create fully allocated qcow2 storage objects.
by Wim Ten Have 29 Mar '18

29 Mar '18

From: Wim ten Have <wim.ten.have(a)oracle.com> When virt-install requests to create fully allocated storage object when the parameter sparse=no is set, libvirt doesn't allow that to happen for qcow2 formatted files. Regardless of its XML instuction request libvirt always targets its filesystem object storage with preallocation=metadata if format=qcow2 is in effect. This results in sparse files which could cause problems since total image storage potentially can overrun actual filesystem available space. Wim ten Have (2): libvirt can't create fully allocated qcow2 formatted storage objects. Adjust qemu-img test required to target with preallocation=falloc. include/libvirt/libvirt-storage.h | 5 ++++- src/storage/storage_util.c | 21 +++++++++++++++++---- .../qcow2-nocapacity-convert-prealloc.argv | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) -- 2.14.3

1 2

[libvirt] [PATCH] qemu: Use dynamic buffer for storing PTY aliases
by Michal Privoznik 29 Mar '18

29 Mar '18

https://bugzilla.redhat.com/show_bug.cgi?id=1560976 For historical reasons we've used 32 bytes long static buffer for storing PTY aliases. This breaks users scenario where they try to start a machine with user alias consisting of "ua-$uuid". Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1afb71f113..c0105c8b84 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1949,21 +1949,18 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, int count, virHashTablePtr info) { + char *id = NULL; size_t i; + int ret = -1; for (i = 0; i < count; i++) { virDomainChrDefPtr chr = devices[i]; if (chr->source->type == VIR_DOMAIN_CHR_TYPE_PTY) { - char id[32]; qemuMonitorChardevInfoPtr entry; - if (snprintf(id, sizeof(id), "char%s", - chr->info.alias) >= sizeof(id)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to format device alias " - "for PTY retrieval")); + VIR_FREE(id); + if (virAsprintf(&id, "char%s", chr->info.alias) < 0) return -1; - } entry = virHashLookup(info, id); if (!entry || !entry->ptyPath) { @@ -1973,7 +1970,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, */ virReportError(VIR_ERR_INTERNAL_ERROR, _("no assigned pty for device %s"), id); - return -1; + goto cleanup; } else { /* 'info chardev' had no pty path for this chardev, * but the log output had, so we're fine @@ -1984,11 +1981,14 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, VIR_FREE(chr->source->data.file.path); if (VIR_STRDUP(chr->source->data.file.path, entry->ptyPath) < 0) - return -1; + goto cleanup; } } - return 0; + ret = 0; + cleanup: + VIR_FREE(id); + return ret; } static int @@ -2040,7 +2040,8 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, int agentReason = VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_CHANNEL; qemuMonitorChardevInfoPtr entry; virObjectEventPtr event = NULL; - char id[32]; + char *id = NULL; + int ret = -1; if (booted) agentReason = VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_DOMAIN_STARTED; @@ -2048,13 +2049,10 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, for (i = 0; i < vm->def->nchannels; i++) { virDomainChrDefPtr chr = vm->def->channels[i]; if (chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { - if (snprintf(id, sizeof(id), "char%s", - chr->info.alias) >= sizeof(id)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to format device alias " - "for PTY retrieval")); - return -1; - } + + VIR_FREE(id); + if (virAsprintf(&id, "char%s", chr->info.alias) < 0) + goto cleanup; /* port state not reported */ if (!(entry = virHashLookup(info, id)) || @@ -2071,7 +2069,10 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, } } - return 0; + ret = 0; + cleanup: + VIR_FREE(id); + return ret; } -- 2.16.1

2 4

[libvirt] Entering freeze for libvirt-4.2.0
by Daniel Veillard 29 Mar '18

29 Mar '18

As planned I just tagged the RC1 in git and pushed the signed tarball and rpms at the usual place: ftp://libvirt.org/libvirt/ This seems fine with my minimal testing, and CI at https://ci.centos.org/view/libvirt/ looks pretty good (except libvirt-master-build, weird ...) so this should not be a problem but please give it some testing especially on other arches and platforms. If everything goes well, I will push rc2 on Thursday for a final release over the w.e., but please give it a try first ! thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

Re: [libvirt] [PATCH] snip my name and email
by Daniel P. Berrangé 28 Mar '18

28 Mar '18

On Mon, Mar 26, 2018 at 10:29:06AM +0300, David Kiarie wrote: > I'd like to snip my name and email from these files Any particular reason why ? > --- > src/xenconfig/xen_xl.c | 1 - > src/xenconfig/xen_xl.h | 1 - > 2 files changed, 2 deletions(-) It is also mentioned in test/xlconfigtest.c. NB, your name & email are still recorded in git history and email archives for eternity Your name, but not email, is also mentioned in the news files, and that file isn't one we'd want to remove since its relevant historical record. > > diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c > index e1ec8e7..a3f8af1 100644 > --- a/src/xenconfig/xen_xl.c > +++ b/src/xenconfig/xen_xl.c > @@ -17,7 +17,6 @@ > * License along with this library. If not, see > * <http://www.gnu.org/licenses/>. > * > - * Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> > * Author: Jim Fehlig <jfehlig(a)suse.com> > */ > > diff --git a/src/xenconfig/xen_xl.h b/src/xenconfig/xen_xl.h > index dd96326..8342f53 100644 > --- a/src/xenconfig/xen_xl.h > +++ b/src/xenconfig/xen_xl.h > @@ -17,7 +17,6 @@ > * License along with this library. If not, see > * <http://www.gnu.org/licenses/>. > * > - * Author: Kiarie Kahurani<davidkiarie4(a)gmail.com> > */ > > #ifndef __VIR_XEN_XL_H__ > -- > 2.16.2 > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 7

[libvirt] [PATCH] remote: remove outdated comment about Solaris
by Daniel P. Berrangé 28 Mar '18

28 Mar '18

When removing a conditional in: commit da1ade7a52e040192c5e9396c15ec9225a0a2c48 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Fri Mar 23 10:50:59 2018 +0000 remote: remove some __sun conditionals the corresponding comment was mistakenly left behind. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial fix. src/remote/remote_driver.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 34e5ced0a9..325ef3fa3d 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1344,9 +1344,7 @@ remoteConnectOpen(virConnectPtr conn, /* * If URI is NULL, then do a UNIX connection possibly auto-spawning - * unprivileged server and probe remote server for URI. On Solaris, - * this isn't supported, but we may be privileged enough to connect - * to the UNIX socket anyway. + * unprivileged server and probe remote server for URI. */ if (!conn->uri) { VIR_DEBUG("Auto-probe remote URI"); -- 2.14.3

1 0

[libvirt] [PATCH v2 0/3] Introduce hot plug support for mediated devices
by Erik Skultety 28 Mar '18

28 Mar '18

Libvirt shouldn't forbid the operation as unsupported. In fact, from VFIO point of view, mdevs have supported hot plug since the beginning. Then it's up to the 3rd party vendor driver whether it can cope with this feature reliably or not. Since v1 [1]: - dropped the original patch 1 as that adjustment can be done in a bigger scale across multiple modules as part of a 'bite-sized' task - reworded commit message for patches 2 and 3 - fixed the error path in patch 1 where I mistakenly tried to re-attach all host devices for a domain if the hotplug of an mdev failed [1] https://www.redhat.com/archives/libvir-list/2018-March/msg01631.html Erik Skultety (3): qemu: hotplug: Introduce hot plug support for mediated devices qemu: hotplug: Introduce hot unplug for mediated devices news: Update release news with mediated devices hot {plug,unplug} docs/news.xml | 10 ++++ src/qemu/qemu_hotplug.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+) -- 2.14.3

2 5

[libvirt] [PATCH v2 0/3] Improve handling of multipath devices
by Michal Privoznik 28 Mar '18

28 Mar '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-March/msg01541.html diff to v1: - Moved code to new file virdevmapper.c - Rename to virDevMapperGetTargets because this bug is not specific just to multipath rather than all device mapper targets - Reworked logging as suggested in review to v1 Michal Privoznik (3): util: Introduce virDevMapperGetTargets qemu: 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 | 42 ++++++++++++- src/qemu/qemu_domain.c | 64 +++++++++++++++++++ src/util/Makefile.inc.am | 2 + src/util/virdevmapper.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virdevmapper.h | 32 ++++++++++ 8 files changed, 313 insertions(+), 3 deletions(-) create mode 100644 src/util/virdevmapper.c create mode 100644 src/util/virdevmapper.h -- 2.16.1

2 9

[libvirt] [PATCH 0/4] Introduce support for mediated devices hot plug
by Erik Skultety 28 Mar '18

28 Mar '18

Libvirt shouldn't forbid the operation as unsupported. In fact, from VFIO point of view, mdevs have supported hot plug since the beginning. Then it's up to the 3rd party vendor driver whether it can cope with this feature reliably or not. Erik Skultety (4): qemu: hotplug: Provide a string of a subsystem type instead of an int qemu: hotplug: Introduce hot plug support for mediated devices qemu: hotplug: Introduce hot unplug for mediated devices news: Update release news with mediated devices hot {plug,unplug} docs/news.xml | 14 +++++ src/qemu/qemu_hotplug.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 149 insertions(+), 1 deletion(-) -- 2.14.3

3 15

[libvirt] [[RFC] 0/8] Implement async QEMU event handling in libvirtd.
by Prerna Saxena 28 Mar '18

28 Mar '18

As noted in https://www.redhat.com/archives/libvir-list/2017-May/msg00016.html libvirt-QEMU driver handles all async events from the main loop. Each event handling needs the per-VM lock to make forward progress. In the case where an async event is received for the same VM which has an RPC running, the main loop is held up contending for the same lock. This impacts scalability, and should be addressed on priority. Note that libvirt does have a 2-step deferred handling for a few event categories, but (1) That is insufficient since blockign happens before the handler could disambiguate which one needs to be posted to this other queue. (2) There needs to be homogeniety. The current series builds a framework for recording and handling VM events. It initializes per-VM event queue, and a global event queue pointing to events from all the VMs. Event handling is staggered in 2 stages: - When an event is received, it is enqueued in the per-VM queue as well as the global queues. - The global queue is built into the QEMU Driver as a threadpool (currently with a single thread). - Enqueuing of a new event triggers the global event worker thread, which then attempts to take a lock for this event's VM. - If the lock is available, the event worker runs the function handling this event type. Once done, it dequeues this event from the global as well as per-VM queues. - If the lock is unavailable(ie taken by RPC thread), the event worker thread leaves this as-is and picks up the next event. - Once the RPC thread completes, it looks for events pertaining to the VM in the per-VM event queue. It then processes the events serially (holding the VM lock) until there are no more events remaining for this VM. At this point, the per-VM lock is relinquished. Patch Series status: Strictly RFC only. No compilation issues. I have not had a chance to (stress) test it after rebase to latest master. Note that documentation and test coverage is TBD, since a few open points remain. Known issues/ caveats: - RPC handling time will become non-deterministic. - An event will only be "notified" to a client once the RPC for same VM completes. - Needs careful consideration in all cases where a QMP event is used to "signal" an RPC thread, else will deadlock. Will be happy to drive more discussion in the community and completely implement it. Prerna Saxena (8): Introduce virObjectTrylock() QEMU Event handling: Introduce async event helpers in qemu_event.[ch] Setup global and per-VM event queues. Also initialize per-VM queues when libvirt reconnects to an existing VM. Events: Allow monitor to "enqueue" events to a queue. Also introduce a framework of handlers for each event type, that can be called when the handler is running an event. Events: Plumb event handling calls before a domain's APIs complete. Code refactor: Move helper functions of doCoreDump*, syncNicRxFilter*, and qemuOpenFile* to qemu_process.[ch] Fold back the 2-stage event implementation for a few events : Watchdog, Monitor EOF, Serial changed, Guest panic, Nic RX filter changed .. into single level. Initialize the per-VM event queues in context of domain init. src/Makefile.am | 1 + src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_conf.h | 4 + src/qemu/qemu_driver.c | 1710 +++++++---------------------------- src/qemu/qemu_event.c | 317 +++++++ src/qemu/qemu_event.h | 231 +++++ src/qemu/qemu_monitor.c | 592 ++++++++++-- src/qemu/qemu_monitor.h | 80 +- src/qemu/qemu_monitor_json.c | 291 +++--- src/qemu/qemu_process.c | 2031 ++++++++++++++++++++++++++++++++++-------- src/qemu/qemu_process.h | 88 ++ src/util/virobject.c | 26 + src/util/virobject.h | 4 + src/util/virthread.c | 5 + src/util/virthread.h | 1 + tests/qemumonitortestutils.c | 2 +- 17 files changed, 3411 insertions(+), 1976 deletions(-) create mode 100644 src/qemu/qemu_event.c create mode 100644 src/qemu/qemu_event.h -- 2.9.5

6 19