March 2021 - Devel - libvirt List Archives

[PATCH v2] qemu: don't raise error upon interface update without <frames/> for <rx/> in coalesce
by Kristina Hanicova 23 Mar '21

23 Mar '21

With this, incomplete XML without <frames/> for <rx/> in coalesce won't raise error as before. It will leave the coalesce parameter empty, thanks to passing it as a parameter and return an integer to indicate error state - previously it returned pointer (or NULL for both error and incomplete XML). I also added a test case to test this functionality in the qemuxml2xmltest. The code went through some refactoring: * change of a condition * addition of a parameter * change of order, that allowed removal of VIR_FREE * removal of redundant labels and variables Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1535930 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- diff to v1: - Added qemuxml2xmlout testcase, per Martin's review src/conf/domain_conf.c | 25 +++++++++-------------- tests/qemuxml2argvdata/net-coalesce.xml | 9 ++++++++ tests/qemuxml2xmloutdata/net-coalesce.xml | 8 +++++++- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b731744f04..798594f520 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7516,11 +7516,11 @@ virDomainNetIPInfoParseXML(const char *source, } -static virNetDevCoalescePtr +static int virDomainNetDefCoalesceParseXML(xmlNodePtr node, - xmlXPathContextPtr ctxt) + xmlXPathContextPtr ctxt, + virNetDevCoalescePtr *coalesce) { - virNetDevCoalescePtr ret = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned long long tmp = 0; g_autofree char *str = NULL; @@ -7529,15 +7529,13 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, str = virXPathString("string(./rx/frames/@max)", ctxt); if (!str) - return NULL; - - ret = g_new0(virNetDevCoalesce, 1); + return 0; if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) { virReportError(VIR_ERR_XML_DETAIL, _("cannot parse value '%s' for coalesce parameter"), str); - goto error; + return -1; } if (tmp > UINT32_MAX) { @@ -7545,15 +7543,13 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, _("value '%llu' is too big for coalesce " "parameter, maximum is '%lu'"), tmp, (unsigned long) UINT32_MAX); - goto error; + return -1; } - ret->rx_max_coalesced_frames = tmp; - return ret; + *coalesce = g_new0(virNetDevCoalesce, 1); + (*coalesce)->rx_max_coalesced_frames = tmp; - error: - VIR_FREE(ret); - return NULL; + return 0; } static void @@ -11517,8 +11513,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, node = virXPathNode("./coalesce", ctxt); if (node) { - def->coalesce = virDomainNetDefCoalesceParseXML(node, ctxt); - if (!def->coalesce) + if (virDomainNetDefCoalesceParseXML(node, ctxt, &def->coalesce) < 0) goto error; } diff --git a/tests/qemuxml2argvdata/net-coalesce.xml b/tests/qemuxml2argvdata/net-coalesce.xml index bdcf786429..6fa3641e7d 100644 --- a/tests/qemuxml2argvdata/net-coalesce.xml +++ b/tests/qemuxml2argvdata/net-coalesce.xml @@ -55,6 +55,15 @@ </rx> </coalesce> </interface> + <interface type='network'> + <source network='default'/> + <mac address='52:54:00:e5:48:60'/> + <model type='virtio'/> + <coalesce> + <rx> + </rx> + </coalesce> + </interface> <serial type='pty'> <target port='0'/> </serial> diff --git a/tests/qemuxml2xmloutdata/net-coalesce.xml b/tests/qemuxml2xmloutdata/net-coalesce.xml index 3a37587dde..452ed94de3 100644 --- a/tests/qemuxml2xmloutdata/net-coalesce.xml +++ b/tests/qemuxml2xmloutdata/net-coalesce.xml @@ -56,6 +56,12 @@ <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </interface> + <interface type='network'> + <mac address='52:54:00:e5:48:60'/> + <source network='default'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </interface> <serial type='pty'> <target type='isa-serial' port='0'> <model name='isa-serial'/> @@ -67,7 +73,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </memballoon> </devices> </domain> -- 2.29.2

2 1

[libvirt PATCH] conf: allow for a partial match when searching for an <interface>
by Laine Stump 23 Mar '21

23 Mar '21

Commit 114e3b42 modified virDomainNetFindIdx() to compare the alias name of the <interface> being matched (in addition to already-existing match of MAC address and PCI/CCW address). This was done in response to https://bugzilla.redhat.com/1926190 which complained that it wasn't possible to unplug an interface that had the same MAC address as another <interface> (which is the way interfaces are setup when using <teaming> - the "team" is identified in the guest virtio-net driver by looking for another interface with the same MAC as the virtio-net device) - the reporter of that bug did not have PCI addresses of the devices easily available when attempting to unplug one of the two devices, and so needed some other way to disambiguate the two interfaces with matching MACs. Unfortunately, this caused a regression which was caught during QE testing - in the past it had been possible to use virDomainUpdateDevice (which also calls virDomainNetFindIdx()) to modify the alias name of an existing interface - with the change in commit 114e3b42 this was no longer possible (since we would try to match the new alias, which would of course always fail). The solution to this regression is to allow mismatched alias names when calling virDomainNetFindIdx() for purposes of updating a device (indicated by the new bool argument "partialMatch"). When calling for unplug the old behavior is maintained - in that case the alias name must still match. Because we need to keep track of potentially multiple "partial" matches so that we can go back later and try to disambiguate when necessary, I needed an array to hold the indexes of all the matches during the "first round". There is guidance in glib-adoption.rst saying that new libvirt code should prefer GArray/GPtrArray. A couple of adventurous souls have used GPtrArray, but so far nobody has used GArray, and I decided this was a good chance to try that out. It went okay. Reported-by: Yalan Zhang <yalzhang(a)redhat.com> Signed-off-by: Laine Stump <laine(a)redhat.com> --- I realized while writing this patch that an update-device test case in qemuhotplugtest would have caught this regression and so I probably should add such a test case to prevent it happening again, but the testing harness for update-device was only ever made to work for graphics devices, meaning there's some unknown amount of investigating and rejiggering that needs to be done to make such a test work (a quick attempt failed). Since someone is waiting on the fix for this regression, I'm hoping that I can get a reprieve on the "add a test case to catch thre regression" part that should accompany a bugfix like this in exchange for a promise that I will start looking into that immediately after I get this pushed (and then backported so testing of the bugzilla above can be completed) src/conf/domain_conf.c | 207 +++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 2 +- src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 6 +- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_hotplug.c | 4 +- 6 files changed, 145 insertions(+), 84 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 95602ae57e..f071bf93d0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16871,109 +16871,170 @@ int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net) * virDomainNetFindIdx: * @def: domain definition * @net: interface definition + * @matchPartial: true if mismatched alias is still a match * - * Lookup domain's network interface based on passed @net - * definition. If @net's MAC address was auto generated, - * the MAC comparison is ignored. + * Find a network interface from the domain's nets list by looking for + * a match to @net. The following attributes are compared when + * specified in @net: MAC address, PCI/CCW address, and alias name. + * + * If matchPartial is true, then an entry with mismatched alias name + * still counts as a match (as long as everything else that was + * specified matches). + * + * If @net matches multiple items in nets, that is an error. * * Return: index of match if unique match found, * -1 otherwise and an error is logged. */ int -virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) +virDomainNetFindIdx(virDomainDefPtr def, + virDomainNetDefPtr net, + bool matchPartial) { + guint gi; size_t i; - int matchidx = -1; + g_autoptr(GArray) matches + = g_array_sized_new(false, false, sizeof(size_t), def->nnets); char mac[VIR_MAC_STRING_BUFLEN]; bool MACAddrSpecified = !net->mac_generated; bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI); bool CCWAddrSpecified = virDomainDeviceAddressIsValid(&net->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); + bool ambiguousPartial = false; + g_auto(virBuffer) errBuf = VIR_BUFFER_INITIALIZER; + + /* initialize the matches array to contain the indexes for all + * NetDefs. We will then go through this array for each field we + * want to match on, removing the indexes of NetDefs that don't + * match for that field. At the end we'll have no match, one + * match, or ambiguous (multiple) matches. + */ + for (i = 0; i < def->nnets; i++) + g_array_append_val(matches, i); + + for (gi = 0; gi < matches->len;) { + + i = g_array_index(matches, size_t, gi); + /* + * mac/pci/ccw addresses must always match if they are + * specified in the search template object + */ - for (i = 0; i < def->nnets; i++) { if (MACAddrSpecified && - virMacAddrCmp(&def->nets[i]->mac, &net->mac) != 0) + virMacAddrCmp(&def->nets[i]->mac, &net->mac) != 0) { + g_array_remove_index(matches, gi); continue; + } if (PCIAddrSpecified && !virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci, - &net->info.addr.pci)) + &net->info.addr.pci)) { + g_array_remove_index(matches, gi); continue; + } if (CCWAddrSpecified && !virDomainDeviceCCWAddressEqual(&def->nets[i]->info.addr.ccw, - &net->info.addr.ccw)) - continue; - - if (net->info.alias && - STRNEQ_NULLABLE(def->nets[i]->info.alias, net->info.alias)) { - continue; + &net->info.addr.ccw)) { + g_array_remove_index(matches, gi); + continue; } - if (matchidx >= 0) { - /* there were multiple matches on mac address, and no - * qualifying guest-side PCI/CCW address was given, so we must - * fail (NB: a USB address isn't adequate, since it may - * specify only vendor and product ID, and there may be - * multiples of those. - */ - if (MACAddrSpecified) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("multiple devices matching MAC address %s found"), - virMacAddrFormat(&net->mac, mac)); - } else { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("multiple matching devices found")); - } + /* this NetDef matches all the mandatory fields, so keep it for now */ + gi++; + } - return -1; - } + if (matches->len == 0) + goto cleanup; - matchidx = i; - } - - if (matchidx < 0) { - if (MACAddrSpecified && PCIAddrSpecified) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("no device matching MAC address %s found on " - VIR_PCI_DEVICE_ADDRESS_FMT), - virMacAddrFormat(&net->mac, mac), - net->info.addr.pci.domain, - net->info.addr.pci.bus, - net->info.addr.pci.slot, - net->info.addr.pci.function); - } else if (MACAddrSpecified && CCWAddrSpecified) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("no device matching MAC address %s found on " - VIR_CCW_DEVICE_ADDRESS_FMT), - virMacAddrFormat(&net->mac, mac), - net->info.addr.ccw.cssid, - net->info.addr.ccw.ssid, - net->info.addr.ccw.devno); - } else if (PCIAddrSpecified) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("no device found on " VIR_PCI_DEVICE_ADDRESS_FMT), - net->info.addr.pci.domain, - net->info.addr.pci.bus, - net->info.addr.pci.slot, - net->info.addr.pci.function); - } else if (CCWAddrSpecified) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("no device found on " VIR_CCW_DEVICE_ADDRESS_FMT), - net->info.addr.ccw.cssid, - net->info.addr.ccw.ssid, - net->info.addr.ccw.devno); - } else if (MACAddrSpecified) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("no device matching MAC address %s found"), - virMacAddrFormat(&net->mac, mac)); - } else { - virReportError(VIR_ERR_DEVICE_MISSING, "%s", - _("no matching device found")); + /* A "partial match" is when everything but alias matches. When + * we've already determined that exactly one NetDef matches + * everything else that was specified in the object we're trying + * to match, counting this "partial match" as a success allows for + * finding an interface based on MAC/pci address, with the intent + * to update the alias (i.e. the alias name doesn't match because + * it's the *new* alias name we want to change to). + * + * We can't *always* ignore the alias though, since it is + * sometimes used to disambiguate between multiple NetDefs when + * searching for a NetDef to remove (rather than update) - in + * particular if there are multiple NetDefs with the same MAC + * address, and the caller didn't specify PCI address (because + * they don't know it). Obviously when it's necessary to look at + * the alias in order to disambiguate between two NetDefs, it + * won't be possible to update the alias; updating other + * attributes, or unplugging the device, shouldn't be a problem + * though. + */ + if (matchPartial) { + if (matches->len == 1) + goto cleanup; + + /* by the time we've checked the multiple remaining NetDefs + * for a match to the alias, we'll no longer have the + * information about ambiguity in the match prior to checking + * aliases, but we'll need to know that in order to report the + * proper error, so save that fact now. + */ + ambiguousPartial = true; + } + + if (net->info.alias) { + for (gi = 0; gi < matches->len;) { + i = g_array_index(matches, size_t, gi); + + if (STRNEQ_NULLABLE(def->nets[i]->info.alias, net->info.alias)) + g_array_remove_index(matches, gi); + else + gi++; } } - return matchidx; + + cleanup: + if (matches->len == 1) + return g_array_index(matches, size_t, 0); + + /* make a string describing all the match terms */ + if (MACAddrSpecified) + virBufferAsprintf(&errBuf, "MAC address '%s' ", virMacAddrFormat(&net->mac, mac)); + + if (PCIAddrSpecified) { + g_autofree char *pciAddrStr = virPCIDeviceAddressAsString(&net->info.addr.pci); + + virBufferAsprintf(&errBuf, "PCI address '%s' ", pciAddrStr); + } + + if (CCWAddrSpecified) { + virBufferAsprintf(&errBuf, "CCW address '" VIR_CCW_DEVICE_ADDRESS_FMT "' ", + net->info.addr.ccw.cssid, + net->info.addr.ccw.ssid, + net->info.addr.ccw.devno); + } + + if (net->info.alias) + virBufferAsprintf(&errBuf, "alias name '%s' ", net->info.alias); + + virBufferTrim(&errBuf, " "); + + /* we either matched too many... */ + + if (matches->len > 1 || ambiguousPartial) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("found multiple devices matching requested <interface> (%s)"), + virBufferContentAndReset(&errBuf)); + return -1; + } + + + /* ...or not enough + * (at this point we know matches->len == 0, no need to check) + */ + + virReportError(VIR_ERR_OPERATION_FAILED, + _("found no devices matching requested <interface> (%s)"), + virBufferContentAndReset(&errBuf)); + return -1; } bool diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 87bc7e8625..da32016b01 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3554,7 +3554,7 @@ virDomainDiskRemove(virDomainDefPtr def, size_t i); virDomainDiskDefPtr virDomainDiskRemoveByName(virDomainDefPtr def, const char *name); -int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net); +int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net, bool matchPartial); virDomainNetDefPtr virDomainNetFind(virDomainDefPtr def, const char *device); virDomainNetDefPtr virDomainNetFindByName(virDomainDefPtr def, const char *ifname); bool virDomainHasNet(virDomainDefPtr def, virDomainNetDefPtr net); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 830634b2bd..bfbfdf94e6 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3861,7 +3861,7 @@ libxlDomainDetachNetDevice(libxlDriverPrivatePtr driver, libxl_device_nic_init(&nic); - if ((detachidx = virDomainNetFindIdx(vm->def, net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, net, false)) < 0) goto cleanup; detach = vm->def->nets[detachidx]; @@ -3990,7 +3990,7 @@ libxlDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) return -1; /* this is guaranteed to succeed */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8e0ec82e0b..d96a6f5f2e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3096,7 +3096,7 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef, switch (dev->type) { case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, true)) < 0) return -1; oldDev.data.net = vmdef->nets[idx]; @@ -3150,7 +3150,7 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) return -1; /* this is guaranteed to succeed */ @@ -3962,7 +3962,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, const virNetDevVPortProfile *vport = NULL; virErrorPtr save_err = NULL; - if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, false)) < 0) goto cleanup; detach = vm->def->nets[detachidx]; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f3f8caab44..df69782f9c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7159,7 +7159,7 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, break; case VIR_DOMAIN_DEVICE_NET: - if ((idx = virDomainNetFindIdx(vm->def, dev->data.net)) >= 0) { + if ((idx = virDomainNetFindIdx(vm->def, dev->data.net, true)) >= 0) { oldDev.data.net = vm->def->nets[idx]; if (virDomainDefCompatibleDevice(vm->def, dev, &oldDev, VIR_DOMAIN_DEVICE_ACTION_UPDATE, @@ -7459,7 +7459,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) return -1; /* this is guaranteed to succeed */ @@ -7686,7 +7686,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((pos = virDomainNetFindIdx(vmdef, net)) < 0) + if ((pos = virDomainNetFindIdx(vmdef, net, true)) < 0) return -1; oldDev.data.net = vmdef->nets[pos]; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 58d2abb862..f0cf75e547 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3512,7 +3512,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, g_autoptr(virConnect) conn = NULL; virErrorPtr save_err = NULL; - if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0) + if ((changeidx = virDomainNetFindIdx(vm->def, newdev, true)) < 0) goto cleanup; devslot = &vm->def->nets[changeidx]; olddev = *devslot; @@ -5664,7 +5664,7 @@ qemuDomainDetachPrepNet(virDomainObjPtr vm, { int detachidx; - if ((detachidx = virDomainNetFindIdx(vm->def, match)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, match, false)) < 0) return -1; *detach = vm->def->nets[detachidx]; -- 2.30.2

3 4

[libvirt PATCH] ci: Drop FreeBSD 11 build
by Andrea Bolognani 23 Mar '21

23 Mar '21

FreeBSD 12 was released in December 2018, so according to our platform support policy we can now drop support for the previous major release. It would be going EOL in September anyway. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab-ci.yml | 10 ---------- ci/cirrus/freebsd-11.vars | 8 -------- 2 files changed, 18 deletions(-) delete mode 100644 ci/cirrus/freebsd-11.vars diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a059ad229c..cbc1292839 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -404,16 +404,6 @@ x64-ubuntu-2004: variables: NAME: ubuntu-2004 -x64-freebsd-11-build: - extends: .cirrus_build_job - variables: - NAME: freebsd-11 - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_IMAGE_NAME: freebsd-11-4 - UPDATE_COMMAND: pkg update - INSTALL_COMMAND: pkg install -y - x64-freebsd-12-build: extends: .cirrus_build_job variables: diff --git a/ci/cirrus/freebsd-11.vars b/ci/cirrus/freebsd-11.vars deleted file mode 100644 index 5add0fb058..0000000000 --- a/ci/cirrus/freebsd-11.vars +++ /dev/null @@ -1,8 +0,0 @@ -PACKAGING_COMMAND='pkg' -CC='/usr/bin/clang' -CCACHE='/usr/local/bin/ccache' -MAKE='/usr/local/bin/gmake' -NINJA='/usr/local/bin/ninja' -PYTHON='/usr/local/bin/python3' -PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' -- 2.26.3

2 1

[PATCH 0/2] domain_conf: Don't leak def->os.firmwareFeatures
by Michal Privoznik 23 Mar '21

23 Mar '21

See 2/2. Michal Prívozník (2): domain_conf: Separate virDomainOS clear into a function domain_conf: Don't leak def->os.firmwareFeatures src/conf/domain_conf.c | 55 ++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 23 deletions(-) -- 2.26.2

2 3

[PATCH 1/1] domain_cgroup.c: update domain after setting blkio.weight
by Daniel Henrique Barboza 23 Mar '21

23 Mar '21

Commit ac87d3520ad5 consolidated common cgroup code between the QEMU and lxc drivers in domain_cgroup.c. In this process, in virDomainCgroupSetupDomainBlkioParameters(), a call to virCgroupGetBlkioWeight() went missing. The result is that 'virsh blkiotune' is setting the blkio.weight for the guest in the host cgroup, but not on the domain XML, because virCgroupGetBlkioWeight() is also used to write the blkio.weight value in the domain object. Fix it by adding the virCgroupGetBlkioWeight() call in the virDomainCgroupSetupDomainBlkioParameters() helper. Fixes: 5493217b940ee9ea72b581270adb3ab9ba245148 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1941407 Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- src/hypervisor/domain_cgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hypervisor/domain_cgroup.c b/src/hypervisor/domain_cgroup.c index eb4fa20a9e..05e3aa7e6a 100644 --- a/src/hypervisor/domain_cgroup.c +++ b/src/hypervisor/domain_cgroup.c @@ -104,7 +104,8 @@ virDomainCgroupSetupDomainBlkioParameters(virCgroupPtr cgroup, virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (virCgroupSetBlkioWeight(cgroup, params[i].value.ui) < 0) + if (virCgroupSetBlkioWeight(cgroup, params[i].value.ui) < 0 || + virCgroupGetBlkioWeight(cgroup, &def->blkio.weight) < 0) ret = -1; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS) || -- 2.30.2

2 2

[PATCH 0/2] qemu: fix crash when deleting a dedefined
by Peter Krempa 23 Mar '21

23 Mar '21

Peter Krempa (2): qemuCheckpointDiscardBitmaps: Refuse to delete checkpoint with NULL bitmap name virDomainCheckpointRedefinePrep: Assign default bitmap names when domain XML is missing src/conf/checkpoint_conf.c | 3 +++ src/qemu/qemu_checkpoint.c | 7 +++++++ 2 files changed, 10 insertions(+) -- 2.29.2

2 3

[PATCH v4 00/13] qemu: Prepare for -object QAPIfication
by Peter Krempa 23 Mar '21

23 Mar '21

The qemu changes are merged upstream now, so this series is now required to ensure qemu compatibility with 'object_add' (support for 'props' sub-object is now dropped from qemu, but libvirt would still use it) and also to allow further updates of capability test data, as the build would fail now because of the tripwire which was added to prevent not noticing that -object was qapified. Peter Krempa (13): qemuxml2argvdata: Remove unused output file 'disk-network-tlsx509.x86_64-latest.args' virQEMUQAPISchemaTraverse: Fix quoting in comment qemu: capabilities: Introduce QEMU_CAPS_OBJECT_QAPIFIED qemu: monitor: Make wrapping of 'props' of 'object-add' optional qemuMonitorCreateObjectPropsWrap: Open-code in qemuBuildMemoryBackendProps qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED qemu: command: Use JSON for QAPIfied -object directly tests: qemuxml2argv: Validate generation of JSON props for object-add qemumonitorjsontest: Remove tripwire guarding object-add QAPIfication tests: qemucapabilities: Update qemu caps for object-add qapification qemuxml2argvtest: Add DO_CAPS_LATEST variant of 'numatune-memnode' qemuxml2argvtest: Pin examples of -object usage to qemu-5.2 caps qemu: capabilities: Enable detection of QEMU_CAPS_OBJECT_QAPIFIED src/libvirt_private.syms | 1 - src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 98 +- src/qemu/qemu_monitor.c | 78 +- src/qemu/qemu_monitor.h | 4 - src/qemu/qemu_qapi.c | 2 +- src/util/virqemu.c | 38 - src/util/virqemu.h | 3 - .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.replies | 5103 +++++++++++------ .../caps_6.0.0.x86_64.xml | 86 +- tests/qemumonitorjsontest.c | 14 - .../audio-alsa-best.x86_64-latest.args | 6 +- .../audio-alsa-full.x86_64-latest.args | 6 +- .../audio-alsa-minimal.x86_64-latest.args | 6 +- .../audio-coreaudio-best.x86_64-latest.args | 6 +- .../audio-coreaudio-full.x86_64-latest.args | 6 +- ...audio-coreaudio-minimal.x86_64-latest.args | 6 +- ...udio-default-nographics.x86_64-latest.args | 6 +- .../audio-default-sdl.x86_64-latest.args | 6 +- .../audio-default-spice.x86_64-latest.args | 6 +- .../audio-default-vnc.x86_64-latest.args | 6 +- .../audio-file-best.x86_64-latest.args | 6 +- .../audio-file-full.x86_64-latest.args | 6 +- .../audio-file-minimal.x86_64-latest.args | 6 +- .../audio-jack-full.x86_64-latest.args | 6 +- .../audio-jack-minimal.x86_64-latest.args | 6 +- .../audio-many-backends.x86_64-latest.args | 6 +- .../audio-none-best.x86_64-latest.args | 6 +- .../audio-none-full.x86_64-latest.args | 6 +- .../audio-none-minimal.x86_64-latest.args | 6 +- .../audio-oss-best.x86_64-latest.args | 6 +- .../audio-oss-full.x86_64-latest.args | 6 +- .../audio-oss-minimal.x86_64-latest.args | 6 +- .../audio-pulseaudio-best.x86_64-latest.args | 6 +- .../audio-pulseaudio-full.x86_64-latest.args | 6 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 6 +- .../audio-sdl-best.x86_64-latest.args | 6 +- .../audio-sdl-full.x86_64-latest.args | 6 +- .../audio-sdl-minimal.x86_64-latest.args | 6 +- .../audio-spice-best.x86_64-latest.args | 6 +- .../audio-spice-full.x86_64-latest.args | 6 +- .../audio-spice-minimal.x86_64-latest.args | 6 +- .../blkdeviotune-group-num.x86_64-latest.args | 6 +- ...blkdeviotune-max-length.x86_64-latest.args | 6 +- .../blkdeviotune-max.x86_64-latest.args | 6 +- .../channel-unix-guestfwd.x86_64-latest.args | 6 +- .../console-virtio-unix.x86_64-latest.args | 6 +- .../controller-virtio-scsi.x86_64-latest.args | 6 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 6 +- .../cpu-translation.x86_64-latest.args | 6 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 6 +- .../cputune-cpuset-big-id.x86_64-latest.args | 6 +- .../disk-aio-io_uring.x86_64-latest.args | 6 +- .../disk-aio.x86_64-latest.args | 6 +- ...-backing-chains-noindex.x86_64-latest.args | 12 +- .../disk-cache.x86_64-latest.args | 6 +- .../disk-cdrom-bus-other.x86_64-latest.args | 6 +- ...m-empty-network-invalid.x86_64-latest.args | 6 +- .../disk-cdrom-network.x86_64-latest.args | 6 +- .../disk-cdrom-tray.x86_64-latest.args | 6 +- .../disk-cdrom.x86_64-latest.args | 6 +- .../disk-copy_on_read.x86_64-latest.args | 6 +- .../disk-detect-zeroes.x86_64-latest.args | 6 +- .../disk-discard.x86_64-latest.args | 6 +- .../disk-error-policy.x86_64-latest.args | 6 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 6 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 6 +- .../disk-floppy.x86_64-latest.args | 6 +- .../disk-metadata-cache.x86_64-latest.args | 6 +- .../disk-network-gluster.x86_64-latest.args | 6 +- .../disk-network-http.x86_64-latest.args | 18 +- .../disk-network-iscsi.x86_64-latest.args | 18 +- .../disk-network-nbd.x86_64-latest.args | 6 +- .../disk-network-nfs.x86_64-latest.args | 6 +- .../disk-network-rbd.x86_64-latest.args | 12 +- .../disk-network-sheepdog.x86_64-latest.args | 6 +- ...isk-network-source-auth.x86_64-latest.args | 24 +- ...disk-network-tlsx509-nbd.x86_64-5.2.0.args | 50 + ...isk-network-tlsx509-nbd.x86_64-latest.args | 18 +- .../disk-network-tlsx509.x86_64-latest.args | 90 - .../disk-nvme.x86_64-latest.args | 12 +- .../disk-readonly-disk.x86_64-latest.args | 6 +- .../disk-scsi-device-auto.x86_64-latest.args | 6 +- .../disk-scsi.x86_64-latest.args | 6 +- .../disk-shared.x86_64-latest.args | 6 +- .../disk-slices.x86_64-latest.args | 18 +- .../disk-transient.x86_64-latest.args | 6 +- .../disk-vhostuser.x86_64-latest.args | 8 +- ...virtio-scsi-reservations.x86_64-5.2.0.args | 55 + ...irtio-scsi-reservations.x86_64-latest.args | 14 +- .../eoi-disabled.x86_64-latest.args | 6 +- .../eoi-enabled.x86_64-latest.args | 6 +- .../fips-enabled.x86_64-latest.args | 6 +- .../floppy-drive-fat.x86_64-latest.args | 6 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 6 +- .../genid-auto.x86_64-latest.args | 6 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 6 +- ...egl-headless-rendernode.x86_64-latest.args | 6 +- .../graphics-egl-headless.x86_64-latest.args | 6 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 6 +- .../graphics-vnc-power.x86_64-latest.args | 6 +- .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 42 + ...graphics-vnc-tls-secret.x86_64-latest.args | 17 +- .../graphics-vnc-tls.x86_64-latest.args | 10 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 6 +- ...play-spice-egl-headless.x86_64-latest.args | 6 +- ...ev-display-spice-opengl.x86_64-latest.args | 6 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 6 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 6 +- .../hostdev-scsi-lsi.x86_64-latest.args | 18 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 18 +- .../hugepages-memaccess3.x86_64-latest.args | 11 +- .../hugepages-nvdimm.x86_64-latest.args | 14 +- .../hyperv-off.x86_64-latest.args | 6 +- .../hyperv-panic.x86_64-latest.args | 6 +- .../hyperv-stimer-direct.x86_64-latest.args | 6 +- .../hyperv.x86_64-latest.args | 6 +- .../intel-iommu-aw-bits.x86_64-latest.args | 6 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 6 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 6 +- .../intel-iommu-eim.x86_64-latest.args | 6 +- .../intel-iommu.x86_64-latest.args | 6 +- ...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 57 + ...threads-virtio-scsi-pci.x86_64-latest.args | 10 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 6 +- .../luks-disks-source-qcow2.x86_64-5.2.0.args | 112 + ...luks-disks-source-qcow2.x86_64-latest.args | 54 +- ...memory-default-hugepage.x86_64-latest.args | 9 +- .../memfd-memory-numa.x86_64-latest.args | 9 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 10 +- ...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 44 + ...ry-hotplug-nvdimm-align.x86_64-latest.args | 11 +- ...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 44 + ...ry-hotplug-nvdimm-label.x86_64-latest.args | 10 +- ...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 44 + ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 10 +- ...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 44 + ...hotplug-nvdimm-readonly.x86_64-latest.args | 10 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 10 +- ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 45 + ...ory-hotplug-virtio-pmem.x86_64-latest.args | 10 +- .../mlock-off.x86_64-latest.args | 6 +- .../mlock-on.x86_64-latest.args | 6 +- .../net-vdpa.x86_64-latest.args | 6 +- .../net-vhostuser.x86_64-latest.args | 6 +- .../numatune-hmat.x86_64-latest.args | 16 +- .../numatune-memnode.x86_64-5.2.0.args | 43 + .../numatune-memnode.x86_64-latest.args | 43 + .../os-firmware-bios.x86_64-latest.args | 6 +- ...re-efi-no-enrolled-keys.x86_64-latest.args | 6 +- ...os-firmware-efi-secboot.x86_64-latest.args | 6 +- .../os-firmware-efi.x86_64-latest.args | 6 +- .../parallel-unix-chardev.x86_64-latest.args | 6 +- ...cie-root-port-nohotplug.x86_64-latest.args | 6 +- .../pv-spinlock-disabled.x86_64-latest.args | 6 +- .../pv-spinlock-enabled.x86_64-latest.args | 6 +- .../qemu-ns.x86_64-latest.args | 6 +- .../serial-unix-chardev.x86_64-latest.args | 6 +- ...rtcard-passthrough-unix.x86_64-latest.args | 6 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 6 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 6 +- .../tpm-emulator-tpm2.x86_64-latest.args | 6 +- .../tpm-emulator.x86_64-latest.args | 6 +- .../tpm-passthrough-crb.x86_64-latest.args | 6 +- .../tpm-passthrough.x86_64-latest.args | 6 +- .../tseg-explicit-size.x86_64-latest.args | 6 +- .../usb-redir-unix.x86_64-latest.args | 6 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 10 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 10 +- ...host-user-gpu-secondary.x86_64-latest.args | 7 +- .../vhost-user-vga.x86_64-latest.args | 7 +- .../vhost-vsock-auto.x86_64-latest.args | 6 +- .../vhost-vsock.x86_64-latest.args | 6 +- ...eo-bochs-display-device.x86_64-latest.args | 6 +- ...video-qxl-device-vram64.x86_64-latest.args | 6 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 6 +- ...eo-ramfb-display-device.x86_64-latest.args | 6 +- .../virtio-9p-createmode.x86_64-latest.args | 6 +- .../virtio-9p-multidevs.x86_64-latest.args | 6 +- ...virtio-non-transitional.x86_64-latest.args | 8 +- ...-options-controller-ats.x86_64-latest.args | 6 +- ...ptions-controller-iommu.x86_64-latest.args | 6 +- ...tions-controller-packed.x86_64-latest.args | 6 +- ...virtio-options-disk-ats.x86_64-latest.args | 6 +- ...rtio-options-disk-iommu.x86_64-latest.args | 6 +- ...tio-options-disk-packed.x86_64-latest.args | 6 +- .../virtio-options-fs-ats.x86_64-latest.args | 6 +- ...virtio-options-fs-iommu.x86_64-latest.args | 6 +- ...irtio-options-fs-packed.x86_64-latest.args | 6 +- ...irtio-options-input-ats.x86_64-latest.args | 6 +- ...tio-options-input-iommu.x86_64-latest.args | 6 +- ...io-options-input-packed.x86_64-latest.args | 6 +- ...-options-memballoon-ats.x86_64-latest.args | 6 +- ...loon-freepage-reporting.x86_64-latest.args | 6 +- ...ptions-memballoon-iommu.x86_64-latest.args | 6 +- ...tions-memballoon-packed.x86_64-latest.args | 6 +- .../virtio-options-net-ats.x86_64-latest.args | 6 +- ...irtio-options-net-iommu.x86_64-latest.args | 6 +- ...rtio-options-net-packed.x86_64-latest.args | 6 +- .../virtio-options-rng-ats.x86_64-latest.args | 10 +- ...irtio-options-rng-iommu.x86_64-latest.args | 10 +- ...rtio-options-rng-packed.x86_64-latest.args | 10 +- ...irtio-options-video-ats.x86_64-latest.args | 6 +- ...tio-options-video-iommu.x86_64-latest.args | 6 +- ...io-options-video-packed.x86_64-latest.args | 6 +- .../virtio-options.x86_64-latest.args | 8 +- .../virtio-rng-builtin.x86_64-5.2.0.args | 38 + .../virtio-rng-builtin.x86_64-latest.args | 8 +- .../virtio-rng-egd-unix.x86_64-5.2.0.args | 39 + .../virtio-rng-egd-unix.x86_64-latest.args | 8 +- .../virtio-transitional.x86_64-latest.args | 8 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 6 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 6 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 6 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 6 +- .../x86_64-pc-graphics.x86_64-latest.args | 8 +- .../x86_64-pc-headless.x86_64-latest.args | 8 +- .../x86_64-q35-graphics.x86_64-latest.args | 8 +- .../x86_64-q35-headless.x86_64-latest.args | 8 +- tests/qemuxml2argvtest.c | 32 + 224 files changed, 4876 insertions(+), 2820 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args -- 2.29.2

2 15

Plans for the next release
by Jiri Denemark 23 Mar '21

23 Mar '21

We are getting close to the next release of libvirt. To aim for the release on Apr 01 I suggest entering the freeze on Froday Mar 26 and tagging RC2 on Tuesday Mar 30. I hope this works for everyone. Jirka

2 1

[PULL 0/2] MIPS patches for 2021-03-22
by Philippe Mathieu-Daudé 22 Mar '21

22 Mar '21

The following changes since commit bdee969c0e65d4d509932b1d70e3a3b2ffbff6d5: Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging (2021-03-19 18:01:17 +0000) are available in the Git repository at: https://github.com/philmd/qemu.git tags/mips-fixes-20210322 for you to fetch changes up to 83bbc537a151730741c04e40d23711067330dab9: target/mips: Deprecate Trap-and-Emul KVM support (2021-03-22 11:28:04 +0100) ---------------------------------------------------------------- MIPS patches queue - Fix array overrun (Coverity CID 1450831) - Deprecate KVM TE (Trap-and-Emul) ---------------------------------------------------------------- Jiaxun Yang (1): target/mips: Deprecate Trap-and-Emul KVM support Peter Maydell (1): target/mips/mxu_translate.c: Fix array overrun for D16MIN/D16MAX docs/system/deprecated.rst | 9 +++++++++ target/mips/mxu_translate.c | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) -- 2.26.2

2 3

[libvirt PATCH v3 00/51] Refactor XML parsing boilerplate code
by Tim Wiederhake 22 Mar '21

22 Mar '21

This series replaces some recurring boilerplate code in src/conf/ regarding the extraction of a virTristate(Switch|Bool) XML attribute. The boilerplate code looks roughly like this, g_autofree char *str = NULL; if (str = virXMLPropString(node, ...)) { int val; if ((val = virTristateBoolTypeFromString(str)) <= 0) { virReportError(...) return -1; } def->... = val; } with some variations regarding how `str` is free'd in case of later re-use, the exact error message for invalid values, whether or not `VIR_TRISTATE_(SWITCH|BOOL)_ABSENT` is explicitly checked for (`val < 0` vs. `val <= 0`), whether an intermediate variable is used or the value is assigned directly, and in some cases the conditions in the two if-blocks are merged. As a side effect, this makes the error messages for invalid values in these attributes much more consistent and catches some instances where e.g. `<foo bar="default"/>` would incorrectly be accepted. V1: https://listman.redhat.com/archives/libvir-list/2021-March/msg00853.html V2: https://listman.redhat.com/archives/libvir-list/2021-March/msg00994.html Changes since V2: * Fixed the -Wtautological-unsigned-enum-zero-compare issues in the first part of the series. These issues were solved later in the series, but this change makes it easier to bisect in the future. I was thinking about only re-sending the first couple of patches, but the latter part would have endet up with quite a few conflicts, so I am sending it in its entirety, again. Sorry for the spam! Cheers, Tim Tim Wiederhake (51): conf: Use virTristateXXX in virStorageSource conf: Use virTristateXXX in virStorageSourceNVMeDef conf: Use virTristateXXX in virDomainDeviceInfo conf: Use virTristateXXX in virDomainDiskDef conf: Use virTristateXXX in virDomainActualNetDef conf: Use virTristateXXX in virDomainNetDef conf: Use virTristateXXX in virDomainChrSourceDef conf: Use virTristateXXX in virDomainGraphicsDef conf: Use virTristateXXX in virDomainMemballoonDef conf: Use virTristateXXX in virDomainLoaderDef conf: Use virTristateXXX in virDomainDef conf: Use virTristateXXX in virStorageAdapterFCHost conf: Use virTristateXXX in virStoragePoolSourceDevice conf: Use virTristateXXX in virPCIDeviceAddress virxml: Add virXMLPropTristateBool virxml: Add virXMLPropTristateSwitch domain_conf: Use virXMLPropTristateXXX in virDomainKeyWrapCipherDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainVirtioOptionsParseXML domain_conf: Use virXMLPropTristateXXX in virDomainDeviceInfoParseXML domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNetworkParse domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNVMeParse domain_conf: Use virXMLPropTristateXXX in virDomainDiskDefDriverParseXML domain_conf: Use virXMLPropTristateXXX in virDomainActualNetDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceReconnectDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainNetDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseTCP domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseFile domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseLog domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLVNC domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLSDL domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLSpice domain_conf: Use virXMLPropTristateXXX in virDomainAudioCommonParse domain_conf: Use virXMLPropTristateXXX in virDomainAudioJackParse domain_conf: Use virXMLPropTristateXXX in virDomainAudioOSSParse domain_conf: Use virXMLPropTristateXXX in virDomainAudioDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainMemballoonDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainShmemDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainPerfEventDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainMemoryDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainIOMMUDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainVsockDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainFeaturesDefParse domain_conf: Use virXMLPropTristateXXX in virDomainLoaderDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainVcpuParse backup_conf: Use virXMLPropTristateXXX in virDomainBackupDiskDefParseXML backup_conf: Use virXMLPropTristateXXX in virDomainBackupDefParse device_conf: Use virXMLPropTristateXXX in virPCIDeviceAddressParseXML network_conf: Use virXMLPropTristateXXX in virNetworkForwardNatDefParseXML numa_conf: Use virXMLPropTristateXXX in virDomainNumaDefParseXML storage_adapter_conf: Use virXMLPropTristateXXX in virStorageAdapterParseXMLFCHost storage_conf: Use virXMLPropTristateXXX in virStoragePoolDefParseSource src/conf/backup_conf.c | 32 +- src/conf/device_conf.c | 8 +- src/conf/device_conf.h | 4 +- src/conf/domain_conf.c | 794 +++++++------------------------- src/conf/domain_conf.h | 28 +- src/conf/network_conf.c | 15 +- src/conf/numa_conf.c | 14 +- src/conf/storage_adapter_conf.c | 14 +- src/conf/storage_adapter_conf.h | 2 +- src/conf/storage_conf.c | 17 +- src/conf/storage_conf.h | 2 +- src/conf/storage_source_conf.h | 4 +- src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 3 +- src/qemu/qemu_hotplug.c | 2 +- src/util/virpci.h | 2 +- src/util/virxml.c | 82 ++++ src/util/virxml.h | 9 + 18 files changed, 301 insertions(+), 733 deletions(-) -- 2.26.2

3 56