- Devel - libvirt List Archives

[libvirt PATCH v2 0/4] qemu: Only raise memlock limit if necessary
by Andrea Bolognani 15 Mar '21

15 Mar '21

This feature has been requested by KubeVirt developers and will make it possible for them to make some VFIO-related features, such as migration and hotplug, work correctly. https://bugzilla.redhat.com/show_bug.cgi?id=1916346 Changes from [v1]: * prep patches have been pushed; * parsing /proc file is now explicitly restricted to Linux only and only uses safe libvirt helpers; * the qemu.conf knob has been dropped in favor of adopting a behavior that should work correctly in all scenarios. [v1] https://listman.redhat.com/archives/libvir-list/2021-March/msg00293.html Andrea Bolognani (4): util: Try to get limits from /proc qemu: Don't ignore virProcessGetMaxMemLock() errors qemu: Refactor qemuDomainAdjustMaxMemLock() qemu: Only raise memlock limit if necessary src/qemu/qemu_domain.c | 36 +++++++++------ src/util/virprocess.c | 102 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 13 deletions(-) -- 2.26.2

2 10

[PATCH v3 00/30] qapi/qom: QAPIfy --object and object-add
by Kevin Wolf 15 Mar '21

15 Mar '21

This series adds a QAPI type for the properties of all user creatable QOM types and finally makes the --object command line option (in all binaries) and the object-add monitor commands (in QMP and HMP) use the new ObjectOptions union. This change improves things in more than just one way: 1. Documentation for QOM object types has always been lacking. Adding the schema, we get documentation for every property. 2. It prevents bugs by performing parts of the input validation (e.g. checking presence of mandatory properties) already in QAPI instead of relying on separate manual implementations in each class. 3. It provides QAPI introspection for user creatable objects. 4. Non-scalar properties are now supported everywhere because the command line parsers (including HMP) use the keyval parser now. If you are in the CC list and didn't expect this series, it's probably because you're the maintainer of one of the objects for which I'm adding a QAPI schema description. Please just have a look at the specific patch for your object and check whether the schema and its documentation make sense to you. You can ignore all other patches. In a next step after this series, we can add make use of the QAPI structs in the implementation of the object and separate their configuration from the runtime state. Specifically, the plan is to add a .configure() callback to ObjectClass that allows configuring the object in one place at creation time and keeping QOM property setters only for properties that can actually be changed at runtime. Paolo made an example of what the state could look like after this: https://wiki.qemu.org/Features/QOM-QAPI_integration Finally, the intention is to extend the QAPI schema to have separate 'object' entities and generate some of the code that was written manually in the intermediate state before. This series is available as a git tag at: https://repo.or.cz/qemu/kevin.git qapi-object-v3 v3: - Removed now useless QAuthZListRuleListHack - Made some more ObjectOptions branches conditional - Improved documentation for some properties - Fixed 'qemu-img compare' exit code for option parsing failure v2: - Convert not only object-add, but all external interfaces so that the schema will always be enforced and mismatch between implementation and schema can't go unnoticed. - Rebased, covering properties and object types added since v1 (yes, things do become outdated rather quickly when you touch all user creatable objects) - Changed the "Since:" version number in the schema documentation to refer to the version when the object was introduced rather than 6.0 where the schema will (hopefully) be added - Probably some other minor changes Kevin Wolf (30): qapi/qom: Drop deprecated 'props' from object-add qapi/qom: Add ObjectOptions for iothread qapi/qom: Add ObjectOptions for authz-* qapi/qom: Add ObjectOptions for cryptodev-* qapi/qom: Add ObjectOptions for dbus-vmstate qapi/qom: Add ObjectOptions for memory-backend-* qapi/qom: Add ObjectOptions for rng-*, deprecate 'opened' qapi/qom: Add ObjectOptions for throttle-group qapi/qom: Add ObjectOptions for secret*, deprecate 'loaded' qapi/qom: Add ObjectOptions for tls-*, deprecate 'loaded' qapi/qom: Add ObjectOptions for can-* qapi/qom: Add ObjectOptions for colo-compare qapi/qom: Add ObjectOptions for filter-* qapi/qom: Add ObjectOptions for pr-manager-helper qapi/qom: Add ObjectOptions for confidential-guest-support qapi/qom: Add ObjectOptions for input-* qapi/qom: Add ObjectOptions for x-remote-object qapi/qom: QAPIfy object-add qom: Make "object" QemuOptsList optional qemu-storage-daemon: Implement --object with qmp_object_add() qom: Remove user_creatable_add_dict() qom: Factor out user_creatable_process_cmdline() qemu-io: Use user_creatable_process_cmdline() for --object qemu-nbd: Use user_creatable_process_cmdline() for --object qom: Add user_creatable_add_from_str() qemu-img: Use user_creatable_process_cmdline() for --object hmp: QAPIfy object_add qom: Add user_creatable_parse_str() vl: QAPIfy -object qom: Drop QemuOpts based interfaces qapi/authz.json | 61 ++- qapi/block-core.json | 27 ++ qapi/common.json | 52 +++ qapi/crypto.json | 159 +++++++ qapi/machine.json | 22 +- qapi/net.json | 20 - qapi/qom.json | 644 ++++++++++++++++++++++++++- qapi/ui.json | 13 +- docs/system/deprecated.rst | 25 +- docs/system/removed-features.rst | 5 + include/qom/object_interfaces.h | 106 ++--- hw/block/xen-block.c | 16 +- monitor/hmp-cmds.c | 17 +- monitor/misc.c | 2 - qemu-img.c | 251 ++--------- qemu-io.c | 33 +- qemu-nbd.c | 34 +- qom/object_interfaces.c | 168 +++---- qom/qom-qmp-cmds.c | 28 +- softmmu/vl.c | 109 +++-- storage-daemon/qemu-storage-daemon.c | 27 +- tests/check-qom-proplist.c | 42 +- hmp-commands.hx | 2 +- storage-daemon/qapi/qapi-schema.json | 1 + 24 files changed, 1231 insertions(+), 633 deletions(-) -- 2.29.2

7 77

[libvirt PATCH] qemu_driver: fix setting vcpu_quota if not all vCPUs are online
by Pavel Hrdina 15 Mar '21

15 Mar '21

When switching to g_autoptr this was incorrectly changed from 'continue;' into 'return -1;' resulting into an error when user tries to set vcpu_quota of running VM: error: An error occurred, but the cause is unknown Fixes: e4a8bbfaf2b4cdd741bb441873bb730f9134b714 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b7c89a826a..16c5ccae45 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9204,7 +9204,7 @@ qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup, virDomainVcpuDefPtr vcpu = virDomainDefGetVcpu(vm->def, i); if (!vcpu->online) - return -1; + continue; if (virCgroupNewThread(cgroup, VIR_CGROUP_THREAD_VCPU, i, false, &cgroup_vcpu) < 0) -- 2.30.2

2 1

[libvirt PATCH v2 0/1] ci: Add helper script
by Andrea Bolognani 15 Mar '21

15 Mar '21

Changes from [v1]: * implement (partial) support for running builds and spawning shells inside the container; * make the code more maintainable by using a couple of classes. [v1] https://listman.redhat.com/archives/libvir-list/2021-February/msg00900.h= tml Andrea Bolognani (1): ci: Add helper script ci/cirrus/refresh | 22 ----- ci/containers/refresh | 41 --------- ci/helper | 187 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+), 63 deletions(-) delete mode 100755 ci/cirrus/refresh delete mode 100755 ci/containers/refresh create mode 100755 ci/helper --=20 2.26.2

2 4

[PATCH 00/14] deprecations: remove many old deprecations
by Daniel P. Berrangé 15 Mar '21

15 Mar '21

The following features have been deprecated for well over the 2 release cycle we promise ``-usbdevice`` (since 2.10.0) ``-drive file=3Djson:{...{'driver':'file'}}`` (since 3.0) ``-vnc acl`` (since 4.0.0) ``-mon ...,control=3Dreadline,pretty=3Don|off`` (since 4.1) ``migrate_set_downtime`` and ``migrate_set_speed`` (since 2.8.0) ``query-named-block-nodes`` result ``encryption_key_missing`` (since 2.10.0) ``query-block`` result ``inserted.encryption_key_missing`` (since 2.10.0) ``migrate-set-cache-size`` and ``query-migrate-cache-size`` (since 2.11.0) ``query-named-block-nodes`` and ``query-block`` result dirty-bitmaps[i].sta= tus (ince 4.0) ``query-cpus`` (since 2.12.0) ``query-cpus-fast`` ``arch`` output member (since 3.0.0) ``query-events`` (since 4.0) chardev client socket with ``wait`` option (since 4.0) ``acl_show``, ``acl_reset``, ``acl_policy``, ``acl_add``, ``acl_remove`` (s= ince 4.0.0) ``ide-drive`` (since 4.2) ``scsi-disk`` (since 4.2) AFAICT, libvirt has ceased to use all of these too. There are many more similarly old deprecations not (yet) tackled. Daniel P. Berrang=C3=A9 (14): ui, monitor: remove deprecated VNC ACL option and HMP commands monitor: raise error when 'pretty' option is used with HMP monitor: remove 'query-events' QMP command softmmu: remove '-usbdevice' command line option migrate: remove QMP/HMP commands for speed, downtime and cache size machine: remove 'query-cpus' QMP command machine: remove 'arch' field from 'query-cpus-fast' QMP command chardev: reject use of 'wait' flag for socket client chardevs hw/ide: remove 'ide-drive' device hw/scsi: remove 'scsi-disk' device block: remove 'encryption_key_missing' flag from QAPI block: remove dirty bitmaps 'status' field block: remove 'dirty-bitmaps' field from 'BlockInfo' struct block: remove support for using "file" driver with block/char devices block/dirty-bitmap.c | 38 --- block/file-posix.c | 17 +- block/qapi.c | 6 - chardev/char-socket.c | 12 +- docs/devel/migration.rst | 2 +- docs/qdev-device-use.txt | 2 +- docs/rdma.txt | 2 +- docs/system/deprecated.rst | 117 ------- docs/system/removed-features.rst | 123 +++++++ docs/xbzrle.txt | 5 - hmp-commands-info.hx | 13 - hmp-commands.hx | 121 ------- hw/core/machine-hmp-cmds.c | 8 +- hw/core/machine-qmp-cmds.c | 120 ------- hw/i386/pc.c | 2 - hw/ide/qdev.c | 38 --- hw/ppc/mac_newworld.c | 13 - hw/ppc/mac_oldworld.c | 13 - hw/scsi/scsi-disk.c | 62 ---- hw/sparc64/sun4u.c | 15 - include/block/dirty-bitmap.h | 1 - include/monitor/hmp.h | 4 - migration/migration.c | 45 --- migration/ram.c | 2 +- monitor/hmp-cmds.c | 34 -- monitor/misc.c | 187 ---------- monitor/monitor.c | 4 +- monitor/qmp-cmds-control.c | 24 -- qapi/block-core.json | 64 +--- qapi/control.json | 45 --- qapi/machine.json | 181 +--------- qapi/migration.json | 98 ------ qemu-options.hx | 5 +- scripts/device-crash-test | 2 - softmmu/vl.c | 43 --- tests/acceptance/pc_cpu_hotplug_props.py | 2 +- tests/acceptance/x86_cpu_model_versions.py | 2 +- tests/migration/guestperf/engine.py | 18 +- tests/qemu-iotests/051 | 4 - tests/qemu-iotests/051.pc.out | 20 -- tests/qemu-iotests/124 | 4 - tests/qemu-iotests/181 | 2 +- tests/qemu-iotests/184.out | 6 +- tests/qemu-iotests/191.out | 48 +-- tests/qemu-iotests/194 | 4 +- tests/qemu-iotests/194.out | 4 +- tests/qemu-iotests/226.out | 10 +- tests/qemu-iotests/236 | 2 +- tests/qemu-iotests/236.out | 42 +-- tests/qemu-iotests/246 | 3 +- tests/qemu-iotests/246.out | 66 ++-- tests/qemu-iotests/254 | 2 +- tests/qemu-iotests/254.out | 9 +- tests/qemu-iotests/257.out | 378 +++++++-------------- tests/qemu-iotests/260 | 5 +- tests/qemu-iotests/273.out | 15 +- tests/qtest/migration-test.c | 48 --- tests/qtest/numa-test.c | 6 +- tests/qtest/qmp-test.c | 6 +- tests/qtest/test-hmp.c | 6 +- tests/qtest/test-x86-cpuid-compat.c | 4 +- tests/qtest/vhost-user-test.c | 8 +- ui/vnc.c | 38 --- 63 files changed, 380 insertions(+), 1850 deletions(-) --=20 2.29.2

13 47

[PATCH] bhyve: add <os firmware='efi'> support
by Roman Bogorodskiy 15 Mar '21

15 Mar '21

Implement "<os firmware='efi'>" support for bhyve driver. As there are not really lot of options, try to find "BHYVE_UEFI.fd" firmware which is installed by the sysutils/uefi-edk2-bhyve FreeBSD port. If not found, just use the first found firmware in the firmwares directory (which is configurable via config file). Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- Not extremely happy about the LIBVIRT_BHYVE_FIRMWARE_DIR_OVERRIDE knob, but not sure how to test this otherwise. po/POTFILES.in | 1 + src/bhyve/bhyve_domain.c | 5 + src/bhyve/bhyve_firmware.c | 91 +++++++++++++++++++ src/bhyve/bhyve_firmware.h | 30 ++++++ src/bhyve/bhyve_process.c | 15 +++ src/bhyve/bhyve_process.h | 5 + src/bhyve/meson.build | 1 + .../bhyvexml2argv-firmware-efi.args | 11 +++ .../bhyvexml2argv-firmware-efi.ldargs | 1 + .../bhyvexml2argv-firmware-efi.xml | 22 +++++ tests/bhyvexml2argvtest.c | 83 ++++++++++++++--- 11 files changed, 254 insertions(+), 11 deletions(-) create mode 100644 src/bhyve/bhyve_firmware.c create mode 100644 src/bhyve/bhyve_firmware.h create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml diff --git a/po/POTFILES.in b/po/POTFILES.in index 80c5f145be..413783ee35 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -14,6 +14,7 @@ @SRCDIR@src/bhyve/bhyve_command.c @SRCDIR@src/bhyve/bhyve_domain.c @SRCDIR@src/bhyve/bhyve_driver.c +@SRCDIR@src/bhyve/bhyve_firmware.c @SRCDIR@src/bhyve/bhyve_monitor.c @SRCDIR@src/bhyve/bhyve_parse_command.c @SRCDIR@src/bhyve/bhyve_process.c diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 8fbc554a0a..209e4d3905 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -64,6 +64,9 @@ bhyveDomainDefNeedsISAController(virDomainDefPtr def) if (def->os.bootloader == NULL && def->os.loader) return true; + if (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) + return true; + if (def->nserials || def->nconsoles) return true; @@ -230,6 +233,8 @@ virDomainDefParserConfig virBhyveDriverDomainDefParserConfig = { .domainPostParseCallback = bhyveDomainDefPostParse, .assignAddressesCallback = bhyveDomainDefAssignAddresses, .deviceValidateCallback = bhyveDomainDeviceDefValidate, + + .features = VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT, }; static void diff --git a/src/bhyve/bhyve_firmware.c b/src/bhyve/bhyve_firmware.c new file mode 100644 index 0000000000..ccc3a5ffc8 --- /dev/null +++ b/src/bhyve/bhyve_firmware.c @@ -0,0 +1,91 @@ +/* + * bhyve_firmware.c: bhyve firmware management + * + * Copyright (C) 2021 Roman Bogorodskiy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> +#include <dirent.h> + +#include "viralloc.h" +#include "virlog.h" +#include "virfile.h" +#include "bhyve_conf.h" +#include "bhyve_firmware.h" + +#define VIR_FROM_THIS VIR_FROM_BHYVE + +VIR_LOG_INIT("bhyve.bhyve_firmware"); + + +#define BHYVE_DEFAULT_FIRMWARE "BHYVE_UEFI.fd" + +int +bhyveFirmwareFillDomain(bhyveConnPtr driver, + virDomainDefPtr def, + unsigned int flags) +{ + g_autoptr(DIR) dir = NULL; + virBhyveDriverConfigPtr cfg = virBhyveDriverGetConfig(driver); + const char *firmware_dir_cfg = cfg->firmwareDir; + const char *firmware_dir_env = NULL, *firmware_dir = NULL; + struct dirent *entry; + char *matching_firmware = NULL; + char *first_found = NULL; + + virCheckFlags(0, -1); + + if (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) + return 0; + + if (virDirOpenIfExists(&dir, firmware_dir_cfg) > 0) { + while ((virDirRead(dir, &entry, firmware_dir)) > 0) { + if (STREQ(entry->d_name, BHYVE_DEFAULT_FIRMWARE)) { + matching_firmware = g_strdup(entry->d_name); + break; + } + if (!first_found) + first_found = g_strdup(entry->d_name); + } + } + + if (!matching_firmware) { + if (!first_found) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("no firmwares found in %s"), + firmware_dir_cfg); + return -1; + } else { + matching_firmware = first_found; + } + } + + if (!def->os.loader) + def->os.loader = g_new0(virDomainLoaderDef, 1); + + def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_PFLASH; + def->os.loader->readonly = VIR_TRISTATE_BOOL_YES; + + VIR_FREE(def->os.loader->path); + + firmware_dir_env = g_getenv("LIBVIRT_BHYVE_FIRMWARE_DIR_OVERRIDE"); + firmware_dir = firmware_dir_env ? firmware_dir_env : firmware_dir_cfg; + def->os.loader->path = g_build_filename(firmware_dir, matching_firmware, NULL); + + return 0; +} diff --git a/src/bhyve/bhyve_firmware.h b/src/bhyve/bhyve_firmware.h new file mode 100644 index 0000000000..ae4bc98676 --- /dev/null +++ b/src/bhyve/bhyve_firmware.h @@ -0,0 +1,30 @@ +/* + * bhyve_firmware.h: bhyve firmware management + * + * Copyright (C) 2021 Roman Bogorodskiy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#pragma once + +#include "domain_conf.h" +#include "bhyve_utils.h" + +int +bhyveFirmwareFillDomain(bhyveConnPtr driver, + virDomainDefPtr def, + unsigned int flags); diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 060018bc70..0cfe69688c 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -33,6 +33,7 @@ #include "bhyve_device.h" #include "bhyve_driver.h" #include "bhyve_command.h" +#include "bhyve_firmware.h" #include "bhyve_monitor.h" #include "bhyve_process.h" #include "datatypes.h" @@ -251,6 +252,17 @@ virBhyveProcessStartImpl(bhyveConnPtr driver, return ret; } +int +bhyveProcessPrepareDomain(bhyveConnPtr driver, + virDomainObjPtr vm, + unsigned int flags) +{ + if (bhyveFirmwareFillDomain(driver, vm->def, flags) < 0) + return -1; + + return 0; +} + int virBhyveProcessStart(virConnectPtr conn, virDomainObjPtr vm, @@ -268,6 +280,9 @@ virBhyveProcessStart(virConnectPtr conn, conn, bhyveProcessAutoDestroy) < 0) return -1; + if (bhyveProcessPrepareDomain(driver, vm, flags) < 0) + return -1; + return virBhyveProcessStartImpl(driver, vm, reason); } diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h index d7b4e0bd4e..133863c1e0 100644 --- a/src/bhyve/bhyve_process.h +++ b/src/bhyve/bhyve_process.h @@ -23,6 +23,11 @@ #include "bhyve_utils.h" +int +bhyveProcessPrepareDomain(bhyveConnPtr driver, + virDomainObjPtr vm, + unsigned int flags); + int virBhyveProcessStart(virConnectPtr conn, virDomainObjPtr vm, virDomainRunningReason reason, diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 2b65eecf5e..b3551477b7 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -2,6 +2,7 @@ bhyve_sources = files( 'bhyve_capabilities.c', 'bhyve_command.c', 'bhyve_conf.c', + 'bhyve_firmware.c', 'bhyve_parse_command.c', 'bhyve_device.c', 'bhyve_domain.c', diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args new file mode 100644 index 0000000000..40bc84ef27 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args @@ -0,0 +1,11 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,test_firmware_dir/BHYVE_UEFI.fd \ +-s 1:0,lpc \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml new file mode 100644 index 0000000000..302326cb26 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml @@ -0,0 +1,22 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os firmware='efi'> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 197334f9c4..13b8e34c2b 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -7,17 +7,20 @@ # include "datatypes.h" # include "bhyve/bhyve_capabilities.h" +# include "bhyve/bhyve_conf.h" # include "bhyve/bhyve_domain.h" # include "bhyve/bhyve_utils.h" # include "bhyve/bhyve_command.h" +# include "bhyve/bhyve_process.h" # define VIR_FROM_THIS VIR_FROM_BHYVE static bhyveConn driver; typedef enum { - FLAG_EXPECT_FAILURE = 1 << 0, - FLAG_EXPECT_PARSE_ERROR = 1 << 1, + FLAG_EXPECT_FAILURE = 1 << 0, + FLAG_EXPECT_PARSE_ERROR = 1 << 1, + FLAG_EXPECT_PREPARE_ERROR = 1 << 2, } virBhyveXMLToArgvTestFlags; static int testCompareXMLToArgvFiles(const char *xml, @@ -29,7 +32,7 @@ static int testCompareXMLToArgvFiles(const char *xml, g_autofree char *actualargv = NULL; g_autofree char *actualld = NULL; g_autofree char *actualdm = NULL; - g_autoptr(virDomainDef) vmdef = NULL; + g_autoptr(virDomainObj) vm = NULL; g_autoptr(virCommand) cmd = NULL; g_autoptr(virCommand) ldcmd = NULL; g_autoptr(virConnect) conn = NULL; @@ -38,7 +41,10 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(conn = virGetConnect())) goto out; - if (!(vmdef = virDomainDefParseFile(xml, driver.xmlopt, + if (!(vm = virDomainObjNew(driver.xmlopt))) + return -1; + + if (!(vm->def = virDomainDefParseFile(xml, driver.xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) { if (flags & FLAG_EXPECT_PARSE_ERROR) { ret = 0; @@ -54,11 +60,20 @@ static int testCompareXMLToArgvFiles(const char *xml, conn->privateData = &driver; - cmd = virBhyveProcessBuildBhyveCmd(&driver, vmdef, false); - if (vmdef->os.loader) + if (bhyveProcessPrepareDomain(&driver, vm, 0) < 0) { + if (flags & FLAG_EXPECT_PREPARE_ERROR) { + ret = 0; + VIR_TEST_DEBUG("Got expected error: %s", + virGetLastErrorMessage()); + } + goto out; + } + + cmd = virBhyveProcessBuildBhyveCmd(&driver, vm->def, false); + if (vm->def->os.loader) ldcmd = virCommandNew("dummy"); else - ldcmd = virBhyveProcessBuildLoadCmd(&driver, vmdef, "<device.map>", + ldcmd = virBhyveProcessBuildLoadCmd(&driver, vm->def, "<device.map>", &actualdm); if ((cmd == NULL) || (ldcmd == NULL)) { @@ -94,10 +109,10 @@ static int testCompareXMLToArgvFiles(const char *xml, ret = 0; out: - if (vmdef && - vmdef->ngraphics == 1 && - vmdef->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) - virPortAllocatorRelease(vmdef->graphics[0]->data.vnc.port); + if (vm && vm->def && + vm->def->ngraphics == 1 && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) + virPortAllocatorRelease(vm->def->graphics[0]->data.vnc.port); return ret; } @@ -128,10 +143,16 @@ testCompareXMLToArgvHelper(const void *data) return testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->flags); } +# define FAKEFIRMWAREDIRTEMPLATE abs_builddir "/bhyvefakefirmwaredir-XXXXXX" + static int mymain(void) { int ret = 0; + g_autofree char *fakefirmwaredir = NULL; + g_autofree char *emptyfirmwaredir = NULL; + const char *firmwares[] = {"BHYVE_UEFI.fd", "BHYVE_UEFI_CSM.fd", "refind_x64.efi", NULL}; + size_t i; if ((driver.caps = virBhyveCapsBuild()) == NULL) return EXIT_FAILURE; @@ -142,6 +163,35 @@ mymain(void) if (!(driver.remotePorts = virPortAllocatorRangeNew("display", 5900, 65535))) return EXIT_FAILURE; + if (!(driver.config = virBhyveDriverConfigNew())) + return EXIT_FAILURE; + + fakefirmwaredir = g_strdup(FAKEFIRMWAREDIRTEMPLATE); + + if (!g_mkdtemp(fakefirmwaredir)) { + fprintf(stderr, "Cannot create fakefirmwaredir"); + abort(); + } + driver.config->firmwareDir = fakefirmwaredir; + + emptyfirmwaredir = g_strdup(FAKEFIRMWAREDIRTEMPLATE); + + if (!g_mkdtemp(emptyfirmwaredir)) { + fprintf(stderr, "Cannot create emptyfirmwaredir"); + abort(); + } + + i = 0; + while (firmwares[i]) { + g_autofree char *firmware_path = g_strdup_printf("%s/%s", fakefirmwaredir, firmwares[i++]); + + if (virFileTouch(firmware_path, 0600) < 0) { + fprintf(stderr, "Cannot create firmware file"); + abort(); + } + } + + g_setenv("LIBVIRT_BHYVE_FIRMWARE_DIR_OVERRIDE", "test_firmware_dir", TRUE); # define DO_TEST_FULL(name, flags) \ do { \ @@ -162,6 +212,9 @@ mymain(void) # define DO_TEST_PARSE_ERROR(name) \ DO_TEST_FULL(name, FLAG_EXPECT_PARSE_ERROR) +# define DO_TEST_PREPARE_ERROR(name) \ + DO_TEST_FULL(name, FLAG_EXPECT_PREPARE_ERROR) + driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; driver.bhyvecaps = BHYVE_CAP_RTC_UTC | BHYVE_CAP_AHCI32SLOT | \ BHYVE_CAP_NET_E1000 | BHYVE_CAP_LPC_BOOTROM | \ @@ -209,6 +262,10 @@ mymain(void) DO_TEST("sound"); DO_TEST("isa-controller"); DO_TEST_FAILURE("isa-multiple-controllers"); + DO_TEST("firmware-efi"); + g_unsetenv("LIBVIRT_BHYVE_FIRMWARE_DIR_OVERRIDE"); + driver.config->firmwareDir = emptyfirmwaredir; + DO_TEST_PREPARE_ERROR("firmware-efi"); DO_TEST("fs-9p"); DO_TEST("fs-9p-readonly"); DO_TEST_FAILURE("fs-9p-unsupported-type"); @@ -264,9 +321,13 @@ mymain(void) driver.bhyvecaps &= ~BHYVE_CAP_VNC_PASSWORD; DO_TEST_FAILURE("vnc-password"); + virFileDeleteTree(fakefirmwaredir); + virFileDeleteTree(emptyfirmwaredir); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); virPortAllocatorRangeFree(driver.remotePorts); + virObjectUnref(driver.config); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.30.0

3 2

[PATCH v3 00/13] Prepare for -object QAPIfication
by Peter Krempa 12 Mar '21

12 Mar '21

v3 now uses JSON to configure objects which is possible with the following qemu patch: https://lists.gnu.org/archive/html/qemu-devel/2021-03/msg04436.html The use of JSON completely avoids problems with conversion of the JSON definition which we create regardless (especially bitmaps/arrays for the host-nodes property) to command line arguments which was lossy with the traditional arguments. 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 | 3262 ++++++++++++----- .../caps_6.0.0.x86_64.xml | 89 +- 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 +- ...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 + 223 files changed, 4071 insertions(+), 1781 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

1 13

[PATCH 0/4] Couple of qemu:///embed related fixes
by Michal Privoznik 12 Mar '21

12 Mar '21

*** BLURB HERE *** Michal Prívozník (4): qemu_shim: Don't hang if failed to start domain docs: Lift restriction on running API from the event loop thread virConnectOpen: Require root dir to be absolute path qemu_shim: Always pre-create root dir docs/drvqemu.html.in | 8 ++++++-- src/libvirt.c | 6 ++++++ src/qemu/qemu_shim.c | 20 ++++++++++++++------ 3 files changed, 26 insertions(+), 8 deletions(-) -- 2.26.2

3 13

[PATCH 0/2] Fix exec-restart of virtlogd and virtlockd
by Peter Krempa 12 Mar '21

12 Mar '21

Peter Krempa (2): virnetdaemon: Introduce virNetDaemonQuitExecRestart virtlo(g|ck)d: Fix exec-restart src/libvirt_remote.syms | 1 + src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/rpc/virnetdaemon.c | 19 +++++++++++++++++++ src/rpc/virnetdaemon.h | 1 + 5 files changed, 23 insertions(+), 2 deletions(-) -- 2.29.2

3 9

[PATCH v2] qemu_shim: Don't hang if failed to start domain
by Michal Privoznik 12 Mar '21

12 Mar '21

The qemu shim spawns a separate thread in which the event loop is ran. The virEventRunDefaultImpl() call is wrapped in a while() loop, just like it should. There are few lines of code around which try to ensure that domain is destroyed (when quitting) and that the last round of event loop is ran after the virDomainDestroy() call. Only after that the loop is quit from and the thread quits. However, if domain creation fails, there is no @dom to call destroy over, the @quit flag is never set and while() never exits. Set the flag regardless of @dom pointer. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1920337 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2021-March/msg00011.html Thanks to Andrea who made me realize that this can be written better. diff to v1: - Instead of exiting from while() early, let the event loop run another iteration (it should be no-op anyway). src/qemu/qemu_shim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index d85497bd3a..8b3afd0324 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -45,9 +45,9 @@ qemuShimEventLoop(void *opaque G_GNUC_UNUSED) while (!quit) { g_mutex_lock(&eventLock); if (eventQuitFlag && !eventPreventQuitFlag) { + quit = true; if (dom) { virDomainDestroy(dom); - quit = true; } } g_mutex_unlock(&eventLock); -- 2.26.2

1 0

[PATCH] virConfLoadConfig: Refactor cleanup
by Yi Li 12 Mar '21

12 Mar '21

Switch to using the 'g_auto*' helpers. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/util/virconf.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index 16107bce96..11046a1d45 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -1505,26 +1505,19 @@ virConfLoadConfigPath(const char *name) int virConfLoadConfig(virConfPtr *conf, const char *name) { - char *path = NULL; - int ret = -1; + g_autofree char *path = NULL; *conf = NULL; if (!(path = virConfLoadConfigPath(name))) - goto cleanup; + return -1; - if (!virFileExists(path)) { - ret = 0; - goto cleanup; - } + if (!virFileExists(path)) + return 0; VIR_DEBUG("Loading config file '%s'", path); if (!(*conf = virConfReadFile(path, 0))) - goto cleanup; - - ret = 0; + return -1; - cleanup: - VIR_FREE(path); - return ret; + return 0; } -- 2.25.3

2 3

[PATCH 0/2] virlockspace: Fix two more crashes of virtlockd on the exec-restart code path
by Peter Krempa 12 Mar '21

12 Mar '21

Peter Krempa (2): virLockSpacePreExecRestart: Avoid use-after-free virLockSpaceNewPostExecRestart: Fix out-of-bounds array access src/util/virlockspace.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.29.2

2 3

[PATCH v2] xenParseVif: Refactor parser
by Peter Krempa 12 Mar '21

12 Mar '21

Use g_strsplit to split the string and avoid use of stack'd strings. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/libxl/xen_common.c | 130 +++++++++++++---------------------------- 1 file changed, 39 insertions(+), 91 deletions(-) v2: - helper variables are made const and strings are borrowed from the array returned by g_strsplit instead of copying/freeing - second argument of xenParseVifBridge turned const to silence compiler diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index c56815d7fc..0d3a3f994a 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1027,7 +1027,7 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat) static int -xenParseVifBridge(virDomainNetDefPtr net, char *bridge) +xenParseVifBridge(virDomainNetDefPtr net, const char *bridge) { char *vlanstr; unsigned int tag; @@ -1141,104 +1141,53 @@ xenParseVif(char *entry, const char *vif_typename) { virDomainNetDefPtr net = NULL; virDomainNetDefPtr ret = NULL; - char *script = NULL; - char model[10]; - char type[10]; - char ip[128]; - char mac[18]; - char bridge[50]; - char vifname[50]; - char rate[50]; - char *key; - - bridge[0] = '\0'; - mac[0] = '\0'; - ip[0] = '\0'; - model[0] = '\0'; - type[0] = '\0'; - vifname[0] = '\0'; - rate[0] = '\0'; - - key = entry; - while (key) { - char *data; - char *nextkey = strchr(key, ','); - - if (!(data = strchr(key, '='))) + g_auto(GStrv) keyvals = NULL; + GStrv keyval; + const char *script = NULL; + const char *model = NULL; + const char *type = NULL; + const char *ip = NULL; + const char *mac = NULL; + const char *bridge = NULL; + const char *vifname = NULL; + const char *rate = NULL; + + keyvals = g_strsplit(entry, ",", 0); + + for (keyval = keyvals; keyval && *keyval; keyval++) { + const char *key = *keyval; + char *val = strchr(key, '='); + + virSkipSpaces(&key); + + if (!val) return NULL; - data++; + + val++; if (STRPREFIX(key, "mac=")) { - int len = nextkey ? (nextkey - data) : strlen(data); - if (virStrncpy(mac, data, len, sizeof(mac)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("MAC address %s too big for destination"), - data); - return NULL; - } + mac = val; } else if (STRPREFIX(key, "bridge=")) { - int len = nextkey ? (nextkey - data) : strlen(data); - if (virStrncpy(bridge, data, len, sizeof(bridge)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Bridge %s too big for destination"), - data); - return NULL; - } + bridge = val; } else if (STRPREFIX(key, "script=")) { - int len = nextkey ? (nextkey - data) : strlen(data); - VIR_FREE(script); - script = g_strndup(data, len); + script = val; } else if (STRPREFIX(key, "model=")) { - int len = nextkey ? (nextkey - data) : strlen(data); - if (virStrncpy(model, data, len, sizeof(model)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Model %s too big for destination"), - data); - return NULL; - } + model = val; } else if (STRPREFIX(key, "type=")) { - int len = nextkey ? (nextkey - data) : strlen(data); - if (virStrncpy(type, data, len, sizeof(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Type %s too big for destination"), - data); - return NULL; - } + type = val; } else if (STRPREFIX(key, "vifname=")) { - int len = nextkey ? (nextkey - data) : strlen(data); - if (virStrncpy(vifname, data, len, sizeof(vifname)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Vifname %s too big for destination"), - data); - return NULL; - } + vifname = val; } else if (STRPREFIX(key, "ip=")) { - int len = nextkey ? (nextkey - data) : strlen(data); - if (virStrncpy(ip, data, len, sizeof(ip)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("IP %s too big for destination"), data); - return NULL; - } + ip = val; } else if (STRPREFIX(key, "rate=")) { - int len = nextkey ? (nextkey - data) : strlen(data); - if (virStrncpy(rate, data, len, sizeof(rate)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("rate %s too big for destination"), data); - return NULL; - } + rate = val; } - - while (nextkey && (nextkey[0] == ',' || - nextkey[0] == ' ' || - nextkey[0] == '\t')) - nextkey++; - key = nextkey; } if (!(net = virDomainNetDefNew(NULL))) goto cleanup; - if (mac[0]) { + if (mac) { if (virMacAddrParse(mac, &net->mac) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("malformed mac address '%s'"), mac); @@ -1246,18 +1195,18 @@ xenParseVif(char *entry, const char *vif_typename) } } - if (bridge[0] || STREQ_NULLABLE(script, "vif-bridge") || + if (bridge || STREQ_NULLABLE(script, "vif-bridge") || STREQ_NULLABLE(script, "vif-vnic")) { net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; } - if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE && bridge[0]) { + if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE && bridge) { if (xenParseVifBridge(net, bridge) < 0) goto cleanup; } - if (ip[0]) { + if (ip) { char **ip_list = g_strsplit(ip, " ", 0); size_t i; @@ -1276,18 +1225,18 @@ xenParseVif(char *entry, const char *vif_typename) if (script && script[0]) net->script = g_strdup(script); - if (model[0]) { + if (model) { if (virDomainNetSetModelString(net, model) < 0) goto cleanup; } else { - if (type[0] && STREQ(type, vif_typename)) + if (type && STREQ(type, vif_typename)) net->model = VIR_DOMAIN_NET_MODEL_NETFRONT; } - if (vifname[0]) + if (vifname && vifname[0]) net->ifname = g_strdup(vifname); - if (rate[0]) { + if (rate) { virNetDevBandwidthPtr bandwidth; unsigned long long kbytes_per_sec; @@ -1304,7 +1253,6 @@ xenParseVif(char *entry, const char *vif_typename) cleanup: virDomainNetDefFree(net); - VIR_FREE(script); return ret; } -- 2.29.2

2 1

Re: [PATCH 1/6] accel: Introduce 'query-accels' QMP command
by Thomas Huth 12 Mar '21

12 Mar '21

On 12/03/2021 08.42, Marc-André Lureau wrote: > > > On Fri, Mar 12, 2021 at 3:14 AM Philippe Mathieu-Daudé <philmd(a)redhat.com > <mailto:philmd@redhat.com>> wrote: > [...] > +## > +# @AcceleratorInfo: > +# > +# Accelerator information. > +# > +# @name: The accelerator name. > +# > +# Since: 6.0 > +## > +{ 'union': 'AcceleratorInfo', > + 'base': {'name': 'Accelerator'}, > + 'discriminator': 'name', > + 'data': { } } > > + > > > Making room for future details, why not. I think we definitely need the additional data section here: For KVM on POWER, it would be good to know whether it's KVM-HV or KVM-PR, for KVM on MIPS it would be good to know whether it's KVM_VM_MIPS_VZ or KVM_VM_MIPS_TE, for KVM on x86 whether it's the AMD flavor or Intel, ... > +## > +# @query-accels: > +# > +# Get a list of AcceleratorInfo for all built-in accelerators. > +# > +# Returns: a list of @AcceleratorInfo describing each accelerator. > +# > +# Since: 6.0 > +# > +# Example: > +# > +# -> { "execute": "query-accels" } > +# <- { "return": [ > +# { > +# "type": "qtest" > +# }, > +# { > +# "type": "kvm" > +# } > +# ] } > +# > +## > +{ 'command': 'query-accels', > + 'returns': ['AcceleratorInfo'] } > > > That's nice, but how do you know which accels are actually enabled? I guess we need two commands in the end, one for querying which accelerators are available, and one for querying the data from the currently active accelerator...? Thomas

4 6

[PATCH 0/5] Document lxc.conf and libxl.conf locations
by Michal Privoznik 12 Mar '21

12 Mar '21

This is a continuation of effort started here, where I documented qemu.conf location: https://listman.redhat.com/archives/libvir-list/2021-March/msg00276.html Michal Prívozník (5): docs: Capitalize QEMU driver reference manpages: Remove reference to a session daemon for LXC docs: Document lxc.conf location manpages: Remove reference to a session daemon for libxl docs: Document libxl.conf location docs/drvlxc.html.in | 10 ++++++++++ docs/drvxen.html.in | 11 +++++++++++ docs/manpages/libvirtd.rst | 17 ++++++++++------- docs/manpages/virtlxcd.rst | 38 +++++++++++-------------------------- docs/manpages/virtqemud.rst | 2 +- docs/manpages/virtxend.rst | 38 +++++++++++-------------------------- 6 files changed, 54 insertions(+), 62 deletions(-) -- 2.26.2

2 6

[libvirt PATCH 00/18] qemu: add support for audio backend configuration
by Daniel P. Berrangé 12 Mar '21

12 Mar '21

Historically we've done almost nothing with audio backend configuration. In QEMU we merely set QEMU_AUDIO_DRV to one of sdl, spice, none depending on <graphics>. We also have the somewhat crazy ability to let QEMU inherit the QEMU_AUDIO_DRV env variable from libvirtd. Fairly recently BHyve wanted audio backend config for OSS so introduced the <audio> element. We designed that to allow QEMU to later extend it, and that's what this series does. We add <audio> types for all the QEMU backends, except the Windows only DSound which isn't relevant for libvirt. The QEMU driver is updated to use this element to configure things. QEMU has many many many more env variables for configuring audio settings, which we can now support. These are all deprecated since 4.0.0 though, so we also add support for the new -audiodev argument. Unfortunately -audiodev isn't introspectable due to limits in QEMU fixed by: https://lists.gnu.org/archive/html/qemu-devel/2021-03/msg00653.html The lack of introspection isn't critical though. We can detect existance of -audiodev by querying for '-vnc audiodev=3DNNN' argument support. We simply lack ability to determine what QEMU audio backends are compiled in. This means we have to delegate error reporting to QEMU itself, which is OK. We'll make use of the query-audiodev command at a later date to track future improvements to QEMU audiodev backends. Daniel P. Berrang=C3=A9 (18): config: cleanup some typos / baggage wrt compiler checks conf: stronger error reporting when parsing audio related params conf: don't force existance of audio child elements conf: add helper to test for sound device codec support conf: add missing iteration over audio backends conf: refactor OSS audio backend specific options conf: add coverage for all QEMU audio backend types conf: add support for audio backend for the VNC server conf: add validation of audio backend IDs conf: rename and improve virDomainDefFindAudioForSound qemu: support use of <audio> elements qemu: populate <audio> element with default config qemu: probe for -vnc audiodev property qemu: add support for generating -audiodev arguments conf: introduce support for common audio settings qemu: wire up support for common audio backend settings conf: add support for audio backend specific settings qemu: wire up support for backend specific audio settings config.h | 10 +- docs/formatdomain.rst | 322 +++++++- docs/schemas/domaincommon.rng | 384 +++++++++- src/bhyve/bhyve_command.c | 30 +- src/conf/domain_conf.c | 693 +++++++++++++++++- src/conf/domain_conf.h | 125 +++- src/conf/domain_validate.c | 67 +- src/libvirt_private.syms | 8 +- src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 484 +++++++++++- src/qemu/qemu_domain.c | 110 ++- src/qemu/qemu_validate.c | 136 +++- .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../redefine.xml | 1 + .../disk_snapshot_redefine.xml | 1 + .../external_vm_redefine.xml | 1 + .../full_domain.xml | 1 + .../qemudomainsnapshotxml2xmlout/metadata.xml | 1 + .../ppc64-modern-bulk-result-conf.xml | 1 + .../ppc64-modern-bulk-result-live.xml | 1 + .../ppc64-modern-individual-result-conf.xml | 1 + .../ppc64-modern-individual-result-live.xml | 1 + .../x86-modern-bulk-result-conf.xml | 1 + .../x86-modern-bulk-result-live.xml | 1 + .../x86-modern-individual-add-result-conf.xml | 1 + .../x86-modern-individual-add-result-live.xml | 1 + .../x86-old-bulk-result-conf.xml | 1 + .../x86-old-bulk-result-live.xml | 1 + .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 1 + ...with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 1 + ...otplug-base-ccw-live-with-2-ccw-virtio.xml | 1 + ...-with-ccw-virtio+ccw-virtio-2-explicit.xml | 1 + ...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 1 + ...uhotplug-base-ccw-live-with-ccw-virtio.xml | 1 + .../qemuhotplug-base-ccw-live.xml | 1 + ...uhotplug-base-live+disk-scsi-multipath.xml | 1 + ...+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 1 + .../qemuhotplug-base-live+disk-scsi.xml | 1 + .../qemuhotplug-base-live+disk-usb.xml | 1 + .../qemuhotplug-base-live+disk-virtio.xml | 1 + .../qemuhotplug-base-live+guestfwd.xml | 1 + .../qemuhotplug-base-live+hostdev-pci.xml | 1 + .../qemuhotplug-base-live+interface-vdpa.xml | 1 + ...qemuhotplug-base-live+ivshmem-doorbell.xml | 1 + .../qemuhotplug-base-live+ivshmem-plain.xml | 1 + .../qemuhotplug-base-live+qemu-agent.xml | 1 + ...uhotplug-base-live+watchdog-user-alias.xml | 1 + .../qemuhotplug-base-live+watchdog.xml | 1 + .../qemuhotplug-base-live.xml | 1 + ...hotplug-base-with-scsi-controller-live.xml | 1 + ...thout-scsi-controller-live+disk-scsi-2.xml | 1 + ...g-console-compat-2-live+console-virtio.xml | 1 + .../qemuhotplug-console-compat-2-live.xml | 1 + ...uhotplug-pseries-base-live+hostdev-pci.xml | 1 + .../qemuhotplug-pseries-base-live.xml | 1 + .../full-xml2xml-out.xml | 1 + .../qemustatusxml2xmldata/backup-pull-in.xml | 1 + .../blockjob-blockdev-in.xml | 1 + .../blockjob-mirror-in.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-bitmaps-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-nbd-tls-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + tests/qemustatusxml2xmldata/upgrade-out.xml | 1 + .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 2 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 2 +- .../aarch64-features-sve.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-host.xml | 1 + tests/qemuxml2argvdata/aarch64-gic-v2.xml | 1 + tests/qemuxml2argvdata/aarch64-gic-v3.xml | 1 + ...arch64-os-firmware-efi.aarch64-latest.args | 2 +- .../aarch64-tpm.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 4 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/audio-alsa-best.args | 41 ++ .../audio-alsa-best.x86_64-latest.args | 42 ++ tests/qemuxml2argvdata/audio-alsa-best.xml | 43 ++ tests/qemuxml2argvdata/audio-alsa-full.args | 29 + tests/qemuxml2argvdata/audio-alsa-full.err | 1 + .../audio-alsa-full.x86_64-latest.args | 43 ++ tests/qemuxml2argvdata/audio-alsa-full.xml | 43 ++ .../qemuxml2argvdata/audio-alsa-minimal.args | 29 + .../audio-alsa-minimal.x86_64-latest.args | 39 + tests/qemuxml2argvdata/audio-alsa-minimal.xml | 36 + .../audio-coreaudio-best.args | 41 ++ .../audio-coreaudio-best.x86_64-latest.args | 42 ++ .../qemuxml2argvdata/audio-coreaudio-best.xml | 43 ++ .../audio-coreaudio-full.args | 29 + .../qemuxml2argvdata/audio-coreaudio-full.err | 1 + .../audio-coreaudio-full.x86_64-latest.args | 43 ++ .../qemuxml2argvdata/audio-coreaudio-full.xml | 43 ++ .../audio-coreaudio-minimal.args | 29 + ...audio-coreaudio-minimal.x86_64-latest.args | 39 + .../audio-coreaudio-minimal.xml | 36 + .../audio-default-nographics.args | 29 + ...udio-default-nographics.x86_64-latest.args | 39 + .../audio-default-nographics.xml | 31 + tests/qemuxml2argvdata/audio-default-sdl.args | 31 + .../audio-default-sdl.x86_64-latest.args | 41 ++ tests/qemuxml2argvdata/audio-default-sdl.xml | 35 + .../qemuxml2argvdata/audio-default-spice.args | 30 + .../audio-default-spice.x86_64-latest.args | 40 + .../qemuxml2argvdata/audio-default-spice.xml | 35 + tests/qemuxml2argvdata/audio-default-vnc.args | 30 + .../audio-default-vnc.x86_64-latest.args | 40 + tests/qemuxml2argvdata/audio-default-vnc.xml | 35 + tests/qemuxml2argvdata/audio-file-best.args | 40 + .../audio-file-best.x86_64-latest.args | 42 ++ tests/qemuxml2argvdata/audio-file-best.xml | 43 ++ tests/qemuxml2argvdata/audio-file-full.args | 29 + tests/qemuxml2argvdata/audio-file-full.err | 1 + .../audio-file-full.x86_64-latest.args | 43 ++ tests/qemuxml2argvdata/audio-file-full.xml | 43 ++ .../qemuxml2argvdata/audio-file-minimal.args | 29 + .../audio-file-minimal.x86_64-latest.args | 39 + tests/qemuxml2argvdata/audio-file-minimal.xml | 36 + tests/qemuxml2argvdata/audio-jack-full.err | 1 + .../audio-jack-full.x86_64-latest.args | 44 ++ tests/qemuxml2argvdata/audio-jack-full.xml | 43 ++ tests/qemuxml2argvdata/audio-jack-minimal.err | 1 + .../audio-jack-minimal.x86_64-latest.args | 39 + tests/qemuxml2argvdata/audio-jack-minimal.xml | 36 + .../qemuxml2argvdata/audio-many-backends.err | 1 + .../audio-many-backends.x86_64-latest.args | 46 ++ .../qemuxml2argvdata/audio-many-backends.xml | 60 ++ tests/qemuxml2argvdata/audio-none-best.args | 39 + .../audio-none-best.x86_64-latest.args | 42 ++ tests/qemuxml2argvdata/audio-none-best.xml | 43 ++ tests/qemuxml2argvdata/audio-none-full.args | 29 + tests/qemuxml2argvdata/audio-none-full.err | 1 + .../audio-none-full.x86_64-latest.args | 42 ++ tests/qemuxml2argvdata/audio-none-full.xml | 43 ++ .../qemuxml2argvdata/audio-none-minimal.args | 29 + .../audio-none-minimal.x86_64-latest.args | 39 + tests/qemuxml2argvdata/audio-none-minimal.xml | 36 + tests/qemuxml2argvdata/audio-oss-best.args | 44 ++ .../audio-oss-best.x86_64-latest.args | 43 ++ tests/qemuxml2argvdata/audio-oss-best.xml | 43 ++ tests/qemuxml2argvdata/audio-oss-full.args | 31 + tests/qemuxml2argvdata/audio-oss-full.err | 1 + .../audio-oss-full.x86_64-latest.args | 44 ++ tests/qemuxml2argvdata/audio-oss-full.xml | 43 ++ tests/qemuxml2argvdata/audio-oss-minimal.args | 29 + .../audio-oss-minimal.x86_64-latest.args | 39 + tests/qemuxml2argvdata/audio-oss-minimal.xml | 36 + .../audio-pulseaudio-best.args | 43 ++ .../audio-pulseaudio-best.x86_64-latest.args | 43 ++ .../audio-pulseaudio-best.xml | 43 ++ .../audio-pulseaudio-full.args | 29 + .../audio-pulseaudio-full.err | 1 + .../audio-pulseaudio-full.x86_64-latest.args | 44 ++ .../audio-pulseaudio-full.xml | 43 ++ .../audio-pulseaudio-minimal.args | 29 + ...udio-pulseaudio-minimal.x86_64-latest.args | 39 + .../audio-pulseaudio-minimal.xml | 36 + tests/qemuxml2argvdata/audio-sdl-best.args | 41 ++ .../audio-sdl-best.x86_64-latest.args | 43 ++ tests/qemuxml2argvdata/audio-sdl-best.xml | 43 ++ tests/qemuxml2argvdata/audio-sdl-full.args | 30 + tests/qemuxml2argvdata/audio-sdl-full.err | 1 + .../audio-sdl-full.x86_64-latest.args | 44 ++ tests/qemuxml2argvdata/audio-sdl-full.xml | 43 ++ tests/qemuxml2argvdata/audio-sdl-minimal.args | 29 + .../audio-sdl-minimal.x86_64-latest.args | 39 + tests/qemuxml2argvdata/audio-sdl-minimal.xml | 36 + tests/qemuxml2argvdata/audio-spice-best.args | 39 + .../audio-spice-best.x86_64-latest.args | 42 ++ tests/qemuxml2argvdata/audio-spice-best.xml | 43 ++ tests/qemuxml2argvdata/audio-spice-full.args | 29 + tests/qemuxml2argvdata/audio-spice-full.err | 1 + .../audio-spice-full.x86_64-latest.args | 42 ++ tests/qemuxml2argvdata/audio-spice-full.xml | 43 ++ .../qemuxml2argvdata/audio-spice-minimal.args | 29 + .../audio-spice-minimal.x86_64-latest.args | 39 + .../qemuxml2argvdata/audio-spice-minimal.xml | 36 + .../blkdeviotune-group-num.x86_64-latest.args | 2 +- .../blkdeviotune-group-num.xml | 1 + ...blkdeviotune-max-length.x86_64-latest.args | 2 +- .../blkdeviotune-max-length.xml | 1 + .../blkdeviotune-max.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/blkdeviotune-max.xml | 1 + tests/qemuxml2argvdata/boot-floppy-q35.xml | 1 + .../channel-unix-guestfwd.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-realtime.xml | 1 + .../clock-timer-armvtimer.aarch64-latest.args | 2 +- .../clock-timer-armvtimer.xml | 1 + .../console-virtio-unix.x86_64-latest.args | 2 +- .../controller-virtio-scsi.x86_64-latest.args | 2 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 2 +- .../cpu-translation.x86_64-latest.args | 2 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 2 +- .../cputune-cpuset-big-id.x86_64-latest.args | 2 +- ...ult-video-type-aarch64.aarch64-latest.args | 4 +- ...default-video-type-ppc64.ppc64-latest.args | 4 +- ...ult-video-type-riscv64.riscv64-latest.args | 2 +- ...default-video-type-s390x.s390x-latest.args | 4 +- .../disk-aio-io_uring.x86_64-latest.args | 2 +- .../disk-aio.x86_64-latest.args | 2 +- .../disk-arm-virtio-sd.aarch64-latest.args | 2 +- ...-backing-chains-noindex.x86_64-latest.args | 2 +- .../disk-cache.x86_64-latest.args | 2 +- .../disk-cdrom-bus-other.x86_64-latest.args | 2 +- ...m-empty-network-invalid.x86_64-latest.args | 2 +- .../disk-cdrom-network.x86_64-latest.args | 2 +- .../disk-cdrom-tray.x86_64-latest.args | 2 +- .../disk-cdrom.x86_64-latest.args | 2 +- .../disk-copy_on_read.x86_64-latest.args | 2 +- .../disk-detect-zeroes.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-detect-zeroes.xml | 1 + .../disk-discard.x86_64-latest.args | 2 +- .../disk-error-policy-s390x.s390x-latest.args | 2 +- .../disk-error-policy.x86_64-latest.args | 2 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 2 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 2 +- .../disk-floppy.x86_64-latest.args | 2 +- .../disk-metadata-cache.x86_64-latest.args | 2 +- .../disk-network-gluster.x86_64-latest.args | 2 +- .../disk-network-http.x86_64-latest.args | 2 +- .../disk-network-iscsi.x86_64-latest.args | 2 +- .../disk-network-nbd.x86_64-latest.args | 2 +- .../disk-network-nfs.x86_64-latest.args | 2 +- .../disk-network-rbd.x86_64-latest.args | 2 +- .../disk-network-sheepdog.x86_64-latest.args | 2 +- ...isk-network-source-auth.x86_64-latest.args | 2 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 2 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 2 +- .../disk-nvme.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-nvme.xml | 1 + .../disk-readonly-disk.x86_64-latest.args | 2 +- .../disk-scsi-device-auto.x86_64-latest.args | 2 +- .../disk-scsi.x86_64-latest.args | 2 +- .../disk-shared.x86_64-latest.args | 2 +- .../disk-slices.x86_64-latest.args | 2 +- .../disk-transient.x86_64-latest.args | 2 +- .../disk-vhostuser.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-virtio-queues.xml | 1 + ...irtio-scsi-reservations.x86_64-latest.args | 2 +- .../disk-virtio-scsi-reservations.xml | 1 + tests/qemuxml2argvdata/downscript.xml | 1 + .../qemuxml2argvdata/encrypted-disk-usage.xml | 1 + .../eoi-disabled.x86_64-latest.args | 2 +- .../eoi-enabled.x86_64-latest.args | 2 +- .../fd-memory-no-numa-topology.xml | 1 + .../fd-memory-numa-topology.xml | 1 + .../fd-memory-numa-topology2.xml | 1 + .../fd-memory-numa-topology3.xml | 1 + .../fips-enabled.x86_64-5.1.0.args | 2 +- .../fips-enabled.x86_64-latest.args | 2 +- .../floppy-drive-fat.x86_64-latest.args | 2 +- .../fs9p-ccw.s390x-latest.args | 2 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 2 +- .../genid-auto.x86_64-latest.args | 2 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 2 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 2 +- .../qemuxml2argvdata/graphics-spice-sasl.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 2 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 4 +- tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 +- .../graphics-vnc-tls.x86_64-2.4.0.args | 2 +- .../graphics-vnc-tls.x86_64-latest.args | 4 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 4 +- ...play-spice-egl-headless.x86_64-latest.args | 2 +- ...ev-display-spice-opengl.x86_64-latest.args | 2 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 4 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 4 +- .../hostdev-scsi-lsi.x86_64-latest.args | 2 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 2 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 2 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 2 +- .../qemuxml2argvdata/hugepages-default-2M.xml | 1 + .../hugepages-default-system-size.xml | 1 + .../qemuxml2argvdata/hugepages-memaccess.xml | 1 + .../qemuxml2argvdata/hugepages-memaccess2.xml | 1 + .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../hugepages-numa-default-dimm.xml | 1 + .../hugepages-nvdimm.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hugepages-nvdimm.xml | 1 + .../hyperv-off.x86_64-latest.args | 2 +- .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../intel-iommu-aw-bits.x86_64-latest.args | 2 +- .../qemuxml2argvdata/intel-iommu-aw-bits.xml | 1 + ...ntel-iommu-caching-mode.x86_64-latest.args | 2 +- .../intel-iommu-caching-mode.xml | 1 + ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 +- .../intel-iommu-device-iotlb.xml | 1 + .../intel-iommu-eim.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/intel-iommu-eim.xml | 1 + .../intel-iommu.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/intel-iommu.xml | 1 + .../iommu-smmuv3.aarch64-latest.args | 2 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 2 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- ...luks-disks-source-qcow2.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/luks-disks.xml | 1 + ...memory-default-hugepage.x86_64-latest.args | 2 +- .../memfd-memory-default-hugepage.xml | 1 + .../memfd-memory-numa.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memfd-memory-numa.xml | 1 + ...y-hotplug-nvdimm-access.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-access.xml | 1 + ...ry-hotplug-nvdimm-align.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-align.xml | 1 + ...ry-hotplug-nvdimm-label.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-label.xml | 1 + ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-pmem.xml | 1 + ...hotplug-nvdimm-readonly.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-readonly.xml | 1 + .../memory-hotplug-nvdimm.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm.xml | 1 + .../memory-hotplug-ppc64-nonuma.xml | 1 + ...ory-hotplug-virtio-pmem.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-pmem.xml | 1 + .../mlock-off.x86_64-latest.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/net-user-addr.xml | 1 + .../net-vdpa.x86_64-latest.args | 2 +- .../net-vhostuser.x86_64-latest.args | 2 +- .../net-virtio-teaming-hostdev.xml | 1 + .../numatune-hmat.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/numatune-hmat.xml | 1 + tests/qemuxml2argvdata/numatune-no-vcpu.xml | 1 + .../os-firmware-bios.x86_64-latest.args | 2 +- ...os-firmware-efi-secboot.x86_64-latest.args | 2 +- .../os-firmware-efi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pages-dimm-discard.xml | 1 + .../pages-discard-hugepages.xml | 1 + tests/qemuxml2argvdata/pages-discard.xml | 1 + .../parallel-unix-chardev.x86_64-latest.args | 2 +- ...cie-root-port-nohotplug.x86_64-latest.args | 2 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 4 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 2 +- .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- .../qemu-ns.x86_64-latest.args | 2 +- .../riscv64-virt-graphics.riscv64-latest.args | 4 +- .../riscv64-virt-headless.riscv64-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 2 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390x-ccw-graphics.s390x-latest.args | 4 +- .../s390x-ccw-headless.s390x-latest.args | 2 +- .../serial-tcp-tlsx509-chardev-notls.xml | 1 + .../serial-unix-chardev.x86_64-latest.args | 2 +- ...rtcard-passthrough-unix.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/smbios-type-fwcfg.xml | 1 + .../tpm-emulator-spapr.ppc64-latest.args | 2 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 2 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 2 +- .../tpm-emulator-tpm2.x86_64-latest.args | 2 +- .../tpm-emulator.x86_64-latest.args | 2 +- .../tpm-passthrough-crb.x86_64-latest.args | 2 +- .../tpm-passthrough.x86_64-latest.args | 2 +- .../tseg-explicit-size.x86_64-latest.args | 2 +- .../usb-redir-unix.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/user-aliases.xml | 1 + .../vcpu-placement-static.xml | 1 + ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- .../vhost-user-fs-fd-memory.xml | 1 + ...vhost-user-fs-hugepages.x86_64-latest.args | 2 +- .../vhost-user-fs-hugepages.xml | 1 + ...host-user-gpu-secondary.x86_64-latest.args | 2 +- .../vhost-user-vga.x86_64-latest.args | 2 +- .../vhost-vsock-auto.x86_64-latest.args | 2 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 2 +- .../vhost-vsock-ccw-iommu.s390x-latest.args | 2 +- .../vhost-vsock-ccw-iommu.xml | 1 + .../vhost-vsock-ccw.s390x-latest.args | 2 +- tests/qemuxml2argvdata/vhost-vsock-ccw.xml | 1 + .../vhost-vsock.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/vhost-vsock.xml | 1 + ...eo-bochs-display-device.x86_64-latest.args | 2 +- ...video-qxl-device-vram64.x86_64-latest.args | 2 +- .../qemuxml2argvdata/video-qxl-resolution.xml | 1 + ...o-qxl-sec-device-vram64.x86_64-latest.args | 2 +- ...eo-ramfb-display-device.x86_64-latest.args | 2 +- .../virtio-9p-createmode.x86_64-latest.args | 2 +- .../virtio-9p-multidevs.x86_64-latest.args | 2 +- ...virtio-non-transitional.x86_64-latest.args | 2 +- ...-options-controller-ats.x86_64-latest.args | 2 +- ...ptions-controller-iommu.x86_64-latest.args | 2 +- ...tions-controller-packed.x86_64-latest.args | 2 +- ...virtio-options-disk-ats.x86_64-latest.args | 2 +- ...rtio-options-disk-iommu.x86_64-latest.args | 2 +- ...tio-options-disk-packed.x86_64-latest.args | 2 +- .../virtio-options-fs-ats.x86_64-latest.args | 2 +- ...virtio-options-fs-iommu.x86_64-latest.args | 2 +- ...irtio-options-fs-packed.x86_64-latest.args | 2 +- ...irtio-options-input-ats.x86_64-latest.args | 2 +- ...tio-options-input-iommu.x86_64-latest.args | 2 +- ...io-options-input-packed.x86_64-latest.args | 2 +- ...-options-memballoon-ats.x86_64-latest.args | 2 +- ...loon-freepage-reporting.x86_64-latest.args | 2 +- ...ptions-memballoon-iommu.x86_64-latest.args | 2 +- ...tions-memballoon-packed.x86_64-latest.args | 2 +- .../virtio-options-net-ats.x86_64-latest.args | 2 +- ...irtio-options-net-iommu.x86_64-latest.args | 2 +- ...rtio-options-net-packed.x86_64-latest.args | 2 +- .../virtio-options-rng-ats.x86_64-latest.args | 2 +- ...irtio-options-rng-iommu.x86_64-latest.args | 2 +- ...rtio-options-rng-packed.x86_64-latest.args | 2 +- ...irtio-options-video-ats.x86_64-latest.args | 2 +- ...tio-options-video-iommu.x86_64-latest.args | 2 +- ...io-options-video-packed.x86_64-latest.args | 2 +- .../virtio-options.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/virtio-options.xml | 1 + .../virtio-rng-builtin.x86_64-latest.args | 2 +- .../virtio-rng-egd-unix.x86_64-latest.args | 2 +- .../virtio-transitional.x86_64-latest.args | 2 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 2 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 2 +- .../x86_64-pc-graphics.x86_64-latest.args | 4 +- .../x86_64-pc-headless.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 4 +- .../x86_64-q35-headless.x86_64-latest.args | 2 +- tests/qemuxml2argvtest.c | 90 +++ .../aarch64-aavmf-virtio-mmio.xml | 1 + ...efault-cpu-kvm-virt-4.2.aarch64-latest.xml | 1 + ...efault-cpu-tcg-virt-4.2.aarch64-latest.xml | 1 + .../aarch64-features-sve.aarch64-latest.xml | 1 + .../aarch64-gic-none-tcg.xml | 1 + ...aarch64-os-firmware-efi.aarch64-latest.xml | 1 + .../qemuxml2xmloutdata/aarch64-pci-serial.xml | 1 + .../aarch64-traditional-pci.xml | 1 + .../aarch64-video-default.xml | 1 + .../aarch64-video-virtio-gpu-pci.xml | 1 + .../aarch64-virt-graphics.aarch64-latest.xml | 1 + .../aarch64-virt-headless.aarch64-latest.xml | 1 + .../aarch64-virtio-pci-default.xml | 1 + .../aarch64-virtio-pci-manual-addresses.xml | 1 + tests/qemuxml2xmloutdata/acpi-table.xml | 1 + tests/qemuxml2xmloutdata/audio-alsa-best.xml | 1 + tests/qemuxml2xmloutdata/audio-alsa-full.xml | 1 + .../qemuxml2xmloutdata/audio-alsa-minimal.xml | 1 + .../audio-coreaudio-best.xml | 1 + .../audio-coreaudio-full.xml | 1 + .../audio-coreaudio-minimal.xml | 1 + ...audio-default-nographics.x86_64-latest.xml | 39 + .../audio-default-nographics.xml | 1 + .../audio-default-sdl.x86_64-latest.xml | 44 ++ .../qemuxml2xmloutdata/audio-default-sdl.xml | 1 + .../audio-default-spice.x86_64-latest.xml | 46 ++ .../audio-default-spice.xml | 1 + .../audio-default-vnc.x86_64-latest.xml | 46 ++ .../qemuxml2xmloutdata/audio-default-vnc.xml | 1 + tests/qemuxml2xmloutdata/audio-file-best.xml | 1 + tests/qemuxml2xmloutdata/audio-file-full.xml | 1 + .../qemuxml2xmloutdata/audio-file-minimal.xml | 1 + tests/qemuxml2xmloutdata/audio-jack-full.xml | 1 + .../audio-many-backends.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/audio-none-best.xml | 1 + tests/qemuxml2xmloutdata/audio-none-full.xml | 1 + .../qemuxml2xmloutdata/audio-none-minimal.xml | 1 + tests/qemuxml2xmloutdata/audio-oss-best.xml | 1 + tests/qemuxml2xmloutdata/audio-oss-full.xml | 1 + .../qemuxml2xmloutdata/audio-oss-minimal.xml | 1 + .../audio-pulseaudio-best.xml | 1 + .../audio-pulseaudio-full.xml | 1 + .../audio-pulseaudio-minimal.xml | 1 + tests/qemuxml2xmloutdata/audio-sdl-best.xml | 1 + tests/qemuxml2xmloutdata/audio-sdl-full.xml | 1 + .../qemuxml2xmloutdata/audio-sdl-minimal.xml | 1 + tests/qemuxml2xmloutdata/audio-spice-best.xml | 1 + tests/qemuxml2xmloutdata/audio-spice-full.xml | 1 + .../audio-spice-minimal.xml | 1 + tests/qemuxml2xmloutdata/autoindex.xml | 1 + .../balloon-device-auto.xml | 1 + .../balloon-device-period.xml | 1 + .../bios-nvram-os-interleave.xml | 1 + tests/qemuxml2xmloutdata/bios-nvram.xml | 1 + .../blkdeviotune.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/blkiotune-device.xml | 1 + tests/qemuxml2xmloutdata/blkiotune.xml | 1 + tests/qemuxml2xmloutdata/boot-cdrom.xml | 1 + tests/qemuxml2xmloutdata/boot-floppy.xml | 1 + .../boot-menu-disable-with-timeout.xml | 1 + .../qemuxml2xmloutdata/boot-menu-disable.xml | 1 + .../boot-menu-enable-with-timeout.xml | 1 + tests/qemuxml2xmloutdata/boot-multi.xml | 1 + tests/qemuxml2xmloutdata/boot-network.xml | 1 + tests/qemuxml2xmloutdata/boot-order.xml | 1 + tests/qemuxml2xmloutdata/channel-guestfwd.xml | 1 + .../channel-unix-source-path-active.xml | 1 + .../channel-unix-source-path-inactive.xml | 1 + .../channel-virtio-auto.xml | 1 + .../channel-virtio-state-active.xml | 1 + .../channel-virtio-state-inactive.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio.xml | 1 + tests/qemuxml2xmloutdata/chardev-label.xml | 1 + tests/qemuxml2xmloutdata/clock-catchup.xml | 1 + tests/qemuxml2xmloutdata/clock-localtime.xml | 1 + .../clock-timer-hyperv-rtc.xml | 1 + tests/qemuxml2xmloutdata/clock-utc.xml | 1 + .../console-compat-auto.xml | 1 + tests/qemuxml2xmloutdata/console-compat.xml | 1 + tests/qemuxml2xmloutdata/console-compat2.xml | 1 + .../console-virtio-many.xml | 1 + tests/qemuxml2xmloutdata/console-virtio.xml | 1 + .../controller-usb-order.xml | 1 + .../controller-virtio-scsi.xml | 1 + ...pu-Icelake-Server-pconfig.x86_64-3.1.0.xml | 1 + ...u-Icelake-Server-pconfig.x86_64-latest.xml | 1 + .../cpu-check-default-none.xml | 1 + .../cpu-check-default-none2.xml | 1 + .../cpu-check-default-partial.xml | 1 + .../cpu-check-default-partial2.xml | 1 + tests/qemuxml2xmloutdata/cpu-check-full.xml | 1 + tests/qemuxml2xmloutdata/cpu-check-none.xml | 1 + .../qemuxml2xmloutdata/cpu-check-partial.xml | 1 + tests/qemuxml2xmloutdata/cpu-empty.xml | 1 + tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 1 + tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 1 + .../qemuxml2xmloutdata/cpu-host-kvmclock.xml | 1 + .../cpu-host-model-features.xml | 1 + .../cpu-host-model-vendor.xml | 1 + .../cpu-host-passthrough-features.xml | 1 + tests/qemuxml2xmloutdata/cpu-kvmclock.xml | 1 + .../qemuxml2xmloutdata/cpu-numa-disjoint.xml | 1 + .../cpu-numa-disordered.xml | 1 + .../qemuxml2xmloutdata/cpu-numa-memshared.xml | 1 + .../cpu-numa-no-memory-element.xml | 1 + tests/qemuxml2xmloutdata/cpu-numa1.xml | 1 + tests/qemuxml2xmloutdata/cpu-numa2.xml | 1 + .../cputune-cpuset-big-id.x86_64-latest.xml | 1 + .../qemuxml2xmloutdata/cputune-iothreads.xml | 1 + .../cputune-iothreadsched-zeropriority.xml | 1 + .../cputune-iothreadsched.xml | 1 + tests/qemuxml2xmloutdata/cputune-numatune.xml | 1 + .../cputune-zero-shares.xml | 1 + tests/qemuxml2xmloutdata/cputune.xml | 1 + .../default-kvm-host-arch.xml | 1 + .../default-qemu-host-arch.xml | 1 + ...ault-video-type-aarch64.aarch64-latest.xml | 1 + .../default-video-type-ppc64.ppc64-latest.xml | 1 + ...ault-video-type-riscv64.riscv64-latest.xml | 1 + .../default-video-type-s390x.s390x-latest.xml | 1 + .../default-video-type-x86_64-caps-test-0.xml | 1 + .../default-video-type-x86_64-caps-test-1.xml | 1 + .../disk-active-commit-active.xml | 1 + .../disk-active-commit-inactive.xml | 1 + .../disk-aio-io_uring.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/disk-aio.xml | 1 + .../disk-arm-virtio-sd.aarch64-latest.xml | 1 + .../disk-backing-chains-active.xml | 1 + .../disk-backing-chains-inactive.xml | 1 + .../disk-backing-chains-index-active.xml | 1 + .../disk-backing-chains-index-inactive.xml | 1 + .../disk-backing-chains-noindex.xml | 1 + tests/qemuxml2xmloutdata/disk-boot-cdrom.xml | 1 + tests/qemuxml2xmloutdata/disk-boot-disk.xml | 1 + .../disk-cache.x86_64-1.5.3.xml | 1 + .../disk-cache.x86_64-2.12.0.xml | 1 + .../disk-cache.x86_64-2.6.0.xml | 1 + .../disk-cache.x86_64-2.7.0.xml | 1 + .../disk-cache.x86_64-latest.xml | 1 + .../disk-cdrom-bus-other.xml | 1 + ...om-empty-network-invalid.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/disk-cdrom.xml | 1 + .../qemuxml2xmloutdata/disk-copy_on_read.xml | 1 + .../disk-discard.x86_64-latest.xml | 1 + .../qemuxml2xmloutdata/disk-error-policy.xml | 1 + tests/qemuxml2xmloutdata/disk-floppy.xml | 1 + tests/qemuxml2xmloutdata/disk-fmt-qcow.xml | 1 + .../disk-metadata-cache.x86_64-latest.xml | 1 + .../qemuxml2xmloutdata/disk-mirror-active.xml | 1 + .../disk-mirror-inactive.xml | 1 + .../disk-mirror-old-active.xml | 1 + .../disk-mirror-old-inactive.xml | 1 + .../disk-network-gluster.xml | 1 + .../disk-network-http.x86_64-latest.xml | 1 + .../qemuxml2xmloutdata/disk-network-iscsi.xml | 1 + tests/qemuxml2xmloutdata/disk-network-nbd.xml | 1 + ...isk-network-nfs-inactive.x86_64-latest.xml | 1 + .../disk-network-nfs.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/disk-network-rbd.xml | 1 + .../disk-network-sheepdog.xml | 1 + .../disk-network-source-auth.xml | 1 + .../disk-network-tlsx509-nbd.xml | 1 + .../disk-network-tlsx509-vxhs.xml | 1 + .../qemuxml2xmloutdata/disk-network-vxhs.xml | 1 + .../disk-scsi-device-auto.xml | 1 + .../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 1 + .../disk-scsi-lun-passthrough-sgio.xml | 1 + .../disk-scsi.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/disk-serial.xml | 1 + .../disk-slices.x86_64-latest.xml | 1 + .../disk-source-pool-mode.xml | 1 + tests/qemuxml2xmloutdata/disk-source-pool.xml | 1 + tests/qemuxml2xmloutdata/disk-usb-device.xml | 1 + .../disk-vhostuser.x86_64-latest.xml | 1 + .../disk-virtio-s390-zpci.xml | 1 + tests/qemuxml2xmloutdata/disk-virtio.xml | 1 + tests/qemuxml2xmloutdata/encrypted-disk.xml | 1 + tests/qemuxml2xmloutdata/eoi-disabled.xml | 1 + tests/qemuxml2xmloutdata/eoi-enabled.xml | 1 + tests/qemuxml2xmloutdata/event_idx.xml | 1 + tests/qemuxml2xmloutdata/floppy-drive-fat.xml | 1 + .../genid-active.x86_64-latest.xml | 1 + .../genid-auto-active.x86_64-latest.xml | 1 + .../genid-auto-inactive.x86_64-latest.xml | 1 + .../genid-inactive.x86_64-latest.xml | 1 + .../graphics-listen-network.xml | 1 + .../graphics-listen-network2.xml | 1 + .../graphics-spice-auto-socket-cfg.xml | 1 + .../graphics-spice-auto-socket.xml | 1 + .../graphics-spice-compression.xml | 1 + .../graphics-spice-egl-headless.xml | 1 + .../graphics-spice-qxl-vga.xml | 1 + .../graphics-spice-socket.xml | 1 + .../graphics-spice-timeout.xml | 1 + tests/qemuxml2xmloutdata/graphics-spice.xml | 1 + .../graphics-vnc-auto-socket-cfg.xml | 1 + .../graphics-vnc-auto-socket.xml | 1 + .../graphics-vnc-egl-headless.xml | 1 + .../graphics-vnc-no-listen-attr.xml | 1 + ...ics-vnc-remove-generated-socket-active.xml | 1 + ...s-vnc-remove-generated-socket-inactive.xml | 1 + .../qemuxml2xmloutdata/graphics-vnc-sasl.xml | 1 + .../graphics-vnc-socket.xml | 1 + tests/qemuxml2xmloutdata/graphics-vnc-tls.xml | 1 + .../graphics-vnc-websocket.xml | 1 + tests/qemuxml2xmloutdata/graphics-vnc.xml | 1 + ...stdev-mdev-display-ramfb.x86_64-latest.xml | 1 + .../hostdev-mdev-display.xml | 1 + .../hostdev-mdev-precreated.xml | 1 + .../hostdev-pci-address-unassigned.xml | 1 + .../hostdev-pci-address.xml | 1 + .../hostdev-pci-multifunction.xml | 1 + .../hostdev-scsi-autogen-address.xml | 1 + .../hostdev-scsi-large-unit.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 1 + .../hostdev-scsi-shareable.xml | 1 + .../hostdev-scsi-vhost-scsi-ccw.xml | 1 + .../hostdev-scsi-vhost-scsi-pci.xml | 1 + .../hostdev-scsi-vhost-scsi-pcie.xml | 1 + .../hostdev-scsi-virtio-scsi.xml | 1 + .../hostdev-subsys-mdev-vfio-ap.xml | 1 + ...subsys-mdev-vfio-ccw-boot.s390x-latest.xml | 1 + .../hostdev-subsys-mdev-vfio-ccw.xml | 1 + .../hostdev-usb-address.xml | 1 + .../hostdev-vfio-zpci-autogenerate-fids.xml | 1 + .../hostdev-vfio-zpci-autogenerate-uids.xml | 1 + .../hostdev-vfio-zpci-autogenerate.xml | 1 + .../hostdev-vfio-zpci-boundaries.xml | 1 + .../hostdev-vfio-zpci-ccw-memballoon.xml | 1 + .../hostdev-vfio-zpci-multidomain-many.xml | 1 + .../qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 1 + tests/qemuxml2xmloutdata/hostdev-vfio.xml | 1 + .../qemuxml2xmloutdata/hugepages-default.xml | 1 + .../qemuxml2xmloutdata/hugepages-nodeset.xml | 1 + .../hugepages-numa-default-2M.xml | 1 + .../hugepages-numa-nodeset-part.xml | 1 + .../hugepages-numa-nodeset.xml | 1 + tests/qemuxml2xmloutdata/hugepages-shared.xml | 1 + tests/qemuxml2xmloutdata/hyperv-off.xml | 1 + tests/qemuxml2xmloutdata/hyperv-panic.xml | 1 + .../hyperv-stimer-direct.xml | 1 + tests/qemuxml2xmloutdata/hyperv.xml | 1 + tests/qemuxml2xmloutdata/input-usbmouse.xml | 1 + tests/qemuxml2xmloutdata/input-usbtablet.xml | 1 + tests/qemuxml2xmloutdata/input-virtio-ccw.xml | 1 + .../intel-iommu.x86_64-2.6.0.xml | 1 + tests/qemuxml2xmloutdata/interface-driver.xml | 1 + tests/qemuxml2xmloutdata/interface-server.xml | 1 + .../iommu-smmuv3.aarch64-latest.xml | 1 + .../iothreads-disk-virtio-ccw.xml | 1 + tests/qemuxml2xmloutdata/iothreads-disk.xml | 1 + .../iothreads-ids-partial.xml | 1 + tests/qemuxml2xmloutdata/iothreads-ids.xml | 1 + .../iothreads-virtio-scsi-ccw.xml | 1 + .../iothreads-virtio-scsi-pci.xml | 1 + tests/qemuxml2xmloutdata/iothreads.xml | 1 + tests/qemuxml2xmloutdata/kvm-features-off.xml | 1 + tests/qemuxml2xmloutdata/kvm-features.xml | 1 + tests/qemuxml2xmloutdata/kvmclock.xml | 1 + tests/qemuxml2xmloutdata/lease.xml | 1 + .../luks-disks-source-qcow2.x86_64-latest.xml | 1 + .../qemuxml2xmloutdata/luks-disks-source.xml | 1 + .../mach-virt-console-virtio.xml | 1 + .../mach-virt-serial-compat.xml | 1 + .../mach-virt-serial-pci.xml | 1 + .../mach-virt-serial-usb.xml | 1 + tests/qemuxml2xmloutdata/machine-core-off.xml | 1 + tests/qemuxml2xmloutdata/machine-core-on.xml | 1 + ...hine-loadparm-multiple-disks-nets-s390.xml | 1 + .../memory-hotplug-dimm.xml | 1 + ...memory-hotplug-nvdimm-ppc64-abi-update.xml | 1 + .../memory-hotplug-nvdimm-ppc64.xml | 1 + ...memory-hotplug-ppc64-nonuma-abi-update.xml | 1 + tests/qemuxml2xmloutdata/memory-hotplug.xml | 1 + .../qemuxml2xmloutdata/memorybacking-set.xml | 1 + .../memorybacking-unset.xml | 1 + .../qemuxml2xmloutdata/memtune-unlimited.xml | 1 + tests/qemuxml2xmloutdata/memtune.xml | 1 + .../qemuxml2xmloutdata/metadata-duplicate.xml | 1 + tests/qemuxml2xmloutdata/metadata.xml | 1 + tests/qemuxml2xmloutdata/migrate.xml | 1 + tests/qemuxml2xmloutdata/minimal.xml | 1 + tests/qemuxml2xmloutdata/misc-acpi.xml | 1 + tests/qemuxml2xmloutdata/misc-disable-s3.xml | 1 + .../misc-disable-suspends.xml | 1 + tests/qemuxml2xmloutdata/misc-enable-s4.xml | 1 + tests/qemuxml2xmloutdata/misc-no-reboot.xml | 1 + tests/qemuxml2xmloutdata/misc-uuid.xml | 1 + tests/qemuxml2xmloutdata/net-bandwidth.xml | 1 + tests/qemuxml2xmloutdata/net-bandwidth2.xml | 1 + tests/qemuxml2xmloutdata/net-coalesce.xml | 1 + tests/qemuxml2xmloutdata/net-eth-hostip.xml | 1 + tests/qemuxml2xmloutdata/net-eth-ifname.xml | 1 + .../net-eth-unmanaged-tap.xml | 1 + tests/qemuxml2xmloutdata/net-eth.xml | 1 + .../net-hostdev-bootorder.xml | 1 + tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 1 + tests/qemuxml2xmloutdata/net-hostdev.xml | 1 + .../net-isolated-port.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/net-many-models.xml | 1 + tests/qemuxml2xmloutdata/net-midonet.xml | 1 + tests/qemuxml2xmloutdata/net-mtu.xml | 1 + tests/qemuxml2xmloutdata/net-openvswitch.xml | 1 + tests/qemuxml2xmloutdata/net-udp.xml | 1 + tests/qemuxml2xmloutdata/net-user.xml | 1 + tests/qemuxml2xmloutdata/net-vdpa.xml | 1 + tests/qemuxml2xmloutdata/net-vhostuser.xml | 1 + .../qemuxml2xmloutdata/net-virtio-device.xml | 1 + .../net-virtio-disable-offloads.xml | 1 + .../net-virtio-network-portgroup.xml | 1 + .../net-virtio-rxtxqueuesize.xml | 1 + .../net-virtio-teaming-network.xml | 1 + .../qemuxml2xmloutdata/net-virtio-teaming.xml | 1 + tests/qemuxml2xmloutdata/net-virtio.xml | 1 + tests/qemuxml2xmloutdata/nosharepages.xml | 1 + .../numad-auto-memory-vcpu-cpuset.xml | 1 + ...to-memory-vcpu-no-cpuset-and-placement.xml | 1 + .../numad-auto-vcpu-no-numatune.xml | 1 + .../numad-static-vcpu-no-numatune.xml | 1 + .../numatune-auto-prefer.xml | 1 + .../qemuxml2xmloutdata/numatune-distances.xml | 1 + .../numatune-memnode-no-memory.xml | 1 + tests/qemuxml2xmloutdata/numatune-memnode.xml | 1 + ...avcpus-topology-mismatch.x86_64-latest.xml | 1 + .../os-firmware-bios.x86_64-latest.xml | 1 + .../os-firmware-efi-secboot.x86_64-latest.xml | 1 + .../os-firmware-efi.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/panic-double.xml | 1 + tests/qemuxml2xmloutdata/panic-isa.xml | 1 + tests/qemuxml2xmloutdata/panic-no-address.xml | 1 + tests/qemuxml2xmloutdata/panic-pseries.xml | 1 + tests/qemuxml2xmloutdata/panic.xml | 1 + tests/qemuxml2xmloutdata/pci-autoadd-addr.xml | 1 + tests/qemuxml2xmloutdata/pci-autoadd-idx.xml | 1 + .../qemuxml2xmloutdata/pci-autofill-addr.xml | 1 + .../pci-bridge-many-disks.xml | 1 + tests/qemuxml2xmloutdata/pci-bridge.xml | 1 + tests/qemuxml2xmloutdata/pci-expander-bus.xml | 1 + tests/qemuxml2xmloutdata/pci-many.xml | 1 + .../pci-rom-disabled-invalid.xml | 1 + tests/qemuxml2xmloutdata/pci-rom-disabled.xml | 1 + tests/qemuxml2xmloutdata/pci-rom.xml | 1 + .../pci-serial-dev-chardev.xml | 1 + .../qemuxml2xmloutdata/pcie-expander-bus.xml | 1 + .../pcie-root-port-model-generic.xml | 1 + .../pcie-root-port-model-ioh3420.xml | 1 + ...pcie-root-port-nohotplug.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/pcie-root-port.xml | 1 + tests/qemuxml2xmloutdata/pcie-root.xml | 1 + .../pcie-switch-downstream-port.xml | 1 + .../pcie-switch-upstream-port.xml | 1 + tests/qemuxml2xmloutdata/pcihole64-gib.xml | 1 + tests/qemuxml2xmloutdata/pcihole64-none.xml | 1 + tests/qemuxml2xmloutdata/pcihole64-q35.xml | 1 + tests/qemuxml2xmloutdata/pcihole64.xml | 1 + tests/qemuxml2xmloutdata/pmu-feature-off.xml | 1 + tests/qemuxml2xmloutdata/pmu-feature.xml | 1 + ...fault-cpu-kvm-pseries-2.7.ppc64-latest.xml | 1 + ...fault-cpu-kvm-pseries-3.1.ppc64-latest.xml | 1 + ...fault-cpu-kvm-pseries-4.2.ppc64-latest.xml | 1 + ...fault-cpu-tcg-pseries-2.7.ppc64-latest.xml | 1 + ...fault-cpu-tcg-pseries-3.1.ppc64-latest.xml | 1 + ...fault-cpu-tcg-pseries-4.2.ppc64-latest.xml | 1 + .../ppc64-pseries-graphics.ppc64-latest.xml | 1 + .../ppc64-pseries-headless.ppc64-latest.xml | 1 + .../ppc64-tpmproxy-single.ppc64-latest.xml | 1 + .../ppc64-tpmproxy-with-tpm.ppc64-latest.xml | 1 + .../ppc64-usb-controller-legacy.xml | 1 + .../ppc64-usb-controller.xml | 1 + .../pseries-console-virtio.xml | 1 + .../pseries-cpu-compat-power9.xml | 1 + .../qemuxml2xmloutdata/pseries-cpu-compat.xml | 1 + .../qemuxml2xmloutdata/pseries-cpu-exact.xml | 1 + tests/qemuxml2xmloutdata/pseries-features.xml | 1 + .../qemuxml2xmloutdata/pseries-hostdevs-1.xml | 1 + .../qemuxml2xmloutdata/pseries-hostdevs-2.xml | 1 + .../qemuxml2xmloutdata/pseries-hostdevs-3.xml | 1 + .../pseries-many-buses-1.xml | 1 + .../pseries-many-buses-2.xml | 1 + .../pseries-many-devices.xml | 1 + tests/qemuxml2xmloutdata/pseries-nvram.xml | 1 + .../pseries-panic-missing.xml | 1 + .../pseries-panic-no-address.xml | 1 + .../pseries-phb-default-missing.xml | 1 + .../pseries-phb-numa-node.xml | 1 + .../qemuxml2xmloutdata/pseries-phb-simple.xml | 1 + .../pseries-serial-native.xml | 1 + .../qemuxml2xmloutdata/pseries-serial-pci.xml | 1 + .../qemuxml2xmloutdata/pseries-serial-usb.xml | 1 + .../pv-spinlock-disabled.xml | 1 + .../pv-spinlock-enabled.xml | 1 + .../q35-default-devices-only.xml | 1 + .../qemuxml2xmloutdata/q35-multifunction.xml | 1 + .../q35-pci-force-address.xml | 1 + tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml | 1 + tests/qemuxml2xmloutdata/q35-pcie.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-multi.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-reorder.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2.xml | 1 + .../q35-virt-manager-basic.xml | 1 + tests/qemuxml2xmloutdata/q35-virtio-pci.xml | 1 + tests/qemuxml2xmloutdata/q35.xml | 1 + tests/qemuxml2xmloutdata/qemu-ns-no-env.xml | 1 + .../reboot-timeout-disabled.xml | 1 + .../reboot-timeout-enabled.xml | 1 + tests/qemuxml2xmloutdata/restore-v2.xml | 1 + .../riscv64-virt-graphics.riscv64-latest.xml | 1 + .../riscv64-virt-headless.riscv64-latest.xml | 1 + tests/qemuxml2xmloutdata/riscv64-virt-pci.xml | 1 + tests/qemuxml2xmloutdata/riscv64-virt.xml | 1 + ...lt-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml | 1 + ...lt-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml | 1 + ...lt-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml | 1 + ...lt-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml | 1 + .../s390-defaultconsole.xml | 1 + .../qemuxml2xmloutdata/s390-panic-missing.xml | 1 + .../s390-panic-no-address.xml | 1 + tests/qemuxml2xmloutdata/s390-panic.xml | 1 + tests/qemuxml2xmloutdata/s390-serial-2.xml | 1 + .../s390-serial-console.xml | 1 + tests/qemuxml2xmloutdata/s390-serial.xml | 1 + .../s390x-ccw-graphics.s390x-latest.xml | 1 + .../s390x-ccw-headless.s390x-latest.xml | 1 + .../qemuxml2xmloutdata/seclabel-dac-none.xml | 1 + .../seclabel-device-multiple.xml | 1 + .../seclabel-dynamic-baselabel-inactive.xml | 1 + .../seclabel-dynamic-labelskip-inactive.xml | 1 + ...seclabel-dynamic-none-relabel-inactive.xml | 1 + .../seclabel-dynamic-none.xml | 1 + .../seclabel-dynamic-override-inactive.xml | 1 + .../seclabel-dynamic-relabel-inactive.xml | 1 + tests/qemuxml2xmloutdata/seclabel-none.xml | 1 + .../seclabel-static-labelskip-active.xml | 1 + .../seclabel-static-labelskip-inactive.xml | 1 + tests/qemuxml2xmloutdata/seclabel-static.xml | 1 + .../serial-spiceport-nospice.xml | 1 + tests/qemuxml2xmloutdata/serial-spiceport.xml | 1 + .../serial-target-port-auto.xml | 1 + .../serial-tcp-tlsx509-chardev.xml | 1 + .../shmem-plain-doorbell.xml | 1 + tests/qemuxml2xmloutdata/shmem.xml | 1 + .../smartcard-controller.xml | 1 + .../smartcard-host-certificates-database.xml | 1 + .../smartcard-host-certificates.xml | 1 + tests/qemuxml2xmloutdata/smartcard-host.xml | 1 + .../smartcard-passthrough-spicevmc.xml | 1 + .../smartcard-passthrough-tcp.xml | 1 + .../smbios-multiple-type2.xml | 1 + tests/qemuxml2xmloutdata/smbios.xml | 1 + tests/qemuxml2xmloutdata/smp.xml | 1 + tests/qemuxml2xmloutdata/sound-device.xml | 1 + tests/qemuxml2xmloutdata/sound.xml | 1 + .../tap-vhost-incorrect.xml | 1 + tests/qemuxml2xmloutdata/tap-vhost.xml | 1 + .../tpm-emulator-tpm2-enc.x86_64-latest.xml | 1 + ...tpm-emulator-tpm2-pstate.x86_64-latest.xml | 1 + .../tpm-emulator-tpm2.x86_64-latest.xml | 1 + .../tpm-emulator.x86_64-latest.xml | 1 + .../tpm-passthrough-crb.x86_64-latest.xml | 1 + .../tpm-passthrough.x86_64-latest.xml | 1 + .../qemuxml2xmloutdata/tseg-explicit-size.xml | 1 + .../usb-controller-default-q35.xml | 1 + .../usb-controller-explicit-q35.xml | 1 + tests/qemuxml2xmloutdata/usb-controller.xml | 1 + .../qemuxml2xmloutdata/usb-ich9-ehci-addr.xml | 1 + tests/qemuxml2xmloutdata/usb-none.xml | 1 + .../usb-piix3-controller.xml | 1 + tests/qemuxml2xmloutdata/usb-port-missing.xml | 1 + .../usb-redir-filter-version.xml | 1 + tests/qemuxml2xmloutdata/usb-redir-filter.xml | 1 + tests/qemuxml2xmloutdata/usb-redir.xml | 1 + tests/qemuxml2xmloutdata/vhost-vsock-auto.xml | 1 + .../vhost-vsock-ccw-auto.xml | 1 + tests/qemuxml2xmloutdata/vhost_queues.xml | 1 + .../video-device-pciaddr-default.xml | 1 + .../qemuxml2xmloutdata/video-none-device.xml | 1 + tests/qemuxml2xmloutdata/video-qxl-heads.xml | 1 + .../qemuxml2xmloutdata/video-qxl-noheads.xml | 1 + .../video-virtio-gpu-ccw-auto.xml | 1 + .../video-virtio-gpu-ccw.xml | 1 + .../video-virtio-gpu-device.xml | 1 + .../video-virtio-gpu-secondary.xml | 1 + .../video-virtio-gpu-spice-gl.xml | 1 + .../video-virtio-gpu-virgl.xml | 1 + .../virtio-9p-createmode.x86_64-latest.xml | 1 + .../virtio-9p-multidevs.x86_64-latest.xml | 1 + .../virtio-input-passthrough.xml | 1 + tests/qemuxml2xmloutdata/virtio-input.xml | 1 + tests/qemuxml2xmloutdata/virtio-lun.xml | 1 + .../virtio-non-transitional.x86_64-latest.xml | 1 + .../virtio-rng-builtin.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/virtio-rng-egd.xml | 1 + .../qemuxml2xmloutdata/virtio-rng-random.xml | 1 + .../virtio-transitional.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/vmcoreinfo.xml | 1 + tests/qemuxml2xmloutdata/watchdog.xml | 1 + ...4-default-cpu-kvm-pc-4.2.x86_64-latest.xml | 1 + ...-default-cpu-kvm-q35-4.2.x86_64-latest.xml | 1 + ...4-default-cpu-tcg-pc-4.2.x86_64-latest.xml | 1 + ...-default-cpu-tcg-q35-4.2.x86_64-latest.xml | 1 + .../x86_64-pc-graphics.x86_64-latest.xml | 1 + .../x86_64-pc-headless.x86_64-latest.xml | 1 + .../x86_64-q35-graphics.x86_64-latest.xml | 1 + .../x86_64-q35-headless.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 54 ++ 957 files changed, 6887 insertions(+), 341 deletions(-) create mode 100644 tests/qemuxml2argvdata/audio-alsa-best.args create mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-alsa-best.xml create mode 100644 tests/qemuxml2argvdata/audio-alsa-full.args create mode 100644 tests/qemuxml2argvdata/audio-alsa-full.err create mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-alsa-full.xml create mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.args create mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.a= rgs create mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.xml create mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.args create mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest= .args create mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.xml create mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.args create mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.err create mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest= .args create mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.xml create mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.args create mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-lat= est.args create mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.xml create mode 100644 tests/qemuxml2argvdata/audio-default-nographics.args create mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-la= test.args create mode 100644 tests/qemuxml2argvdata/audio-default-nographics.xml create mode 100644 tests/qemuxml2argvdata/audio-default-sdl.args create mode 100644 tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.ar= gs create mode 100644 tests/qemuxml2argvdata/audio-default-sdl.xml create mode 100644 tests/qemuxml2argvdata/audio-default-spice.args create mode 100644 tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.= args create mode 100644 tests/qemuxml2argvdata/audio-default-spice.xml create mode 100644 tests/qemuxml2argvdata/audio-default-vnc.args create mode 100644 tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.ar= gs create mode 100644 tests/qemuxml2argvdata/audio-default-vnc.xml create mode 100644 tests/qemuxml2argvdata/audio-file-best.args create mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-file-best.xml create mode 100644 tests/qemuxml2argvdata/audio-file-full.args create mode 100644 tests/qemuxml2argvdata/audio-file-full.err create mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-file-full.xml create mode 100644 tests/qemuxml2argvdata/audio-file-minimal.args create mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.a= rgs create mode 100644 tests/qemuxml2argvdata/audio-file-minimal.xml create mode 100644 tests/qemuxml2argvdata/audio-jack-full.err create mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-jack-full.xml create mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.err create mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.a= rgs create mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.xml create mode 100644 tests/qemuxml2argvdata/audio-many-backends.err create mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.= args create mode 100644 tests/qemuxml2argvdata/audio-many-backends.xml create mode 100644 tests/qemuxml2argvdata/audio-none-best.args create mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-none-best.xml create mode 100644 tests/qemuxml2argvdata/audio-none-full.args create mode 100644 tests/qemuxml2argvdata/audio-none-full.err create mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-none-full.xml create mode 100644 tests/qemuxml2argvdata/audio-none-minimal.args create mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.a= rgs create mode 100644 tests/qemuxml2argvdata/audio-none-minimal.xml create mode 100644 tests/qemuxml2argvdata/audio-oss-best.args create mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-oss-best.xml create mode 100644 tests/qemuxml2argvdata/audio-oss-full.args create mode 100644 tests/qemuxml2argvdata/audio-oss-full.err create mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-oss-full.xml create mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.args create mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.ar= gs create mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.xml create mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.args create mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-lates= t.args create mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.xml create mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.args create mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.err create mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-lates= t.args create mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.xml create mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.args create mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-la= test.args create mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.xml create mode 100644 tests/qemuxml2argvdata/audio-sdl-best.args create mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-sdl-best.xml create mode 100644 tests/qemuxml2argvdata/audio-sdl-full.args create mode 100644 tests/qemuxml2argvdata/audio-sdl-full.err create mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-sdl-full.xml create mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.args create mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.ar= gs create mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.xml create mode 100644 tests/qemuxml2argvdata/audio-spice-best.args create mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-spice-best.xml create mode 100644 tests/qemuxml2argvdata/audio-spice-full.args create mode 100644 tests/qemuxml2argvdata/audio-spice-full.err create mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-spice-full.xml create mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.args create mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.= args create mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.xml create mode 120000 tests/qemuxml2xmloutdata/audio-alsa-best.xml create mode 120000 tests/qemuxml2xmloutdata/audio-alsa-full.xml create mode 120000 tests/qemuxml2xmloutdata/audio-alsa-minimal.xml create mode 120000 tests/qemuxml2xmloutdata/audio-coreaudio-best.xml create mode 120000 tests/qemuxml2xmloutdata/audio-coreaudio-full.xml create mode 120000 tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/audio-default-nographics.x86_64-= latest.xml create mode 120000 tests/qemuxml2xmloutdata/audio-default-nographics.xml create mode 100644 tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-latest.= xml create mode 120000 tests/qemuxml2xmloutdata/audio-default-sdl.xml create mode 100644 tests/qemuxml2xmloutdata/audio-default-spice.x86_64-lates= t.xml create mode 120000 tests/qemuxml2xmloutdata/audio-default-spice.xml create mode 100644 tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-latest.= xml create mode 120000 tests/qemuxml2xmloutdata/audio-default-vnc.xml create mode 120000 tests/qemuxml2xmloutdata/audio-file-best.xml create mode 120000 tests/qemuxml2xmloutdata/audio-file-full.xml create mode 120000 tests/qemuxml2xmloutdata/audio-file-minimal.xml create mode 120000 tests/qemuxml2xmloutdata/audio-jack-full.xml create mode 120000 tests/qemuxml2xmloutdata/audio-many-backends.x86_64-lates= t.xml create mode 120000 tests/qemuxml2xmloutdata/audio-none-best.xml create mode 120000 tests/qemuxml2xmloutdata/audio-none-full.xml create mode 120000 tests/qemuxml2xmloutdata/audio-none-minimal.xml create mode 120000 tests/qemuxml2xmloutdata/audio-oss-best.xml create mode 120000 tests/qemuxml2xmloutdata/audio-oss-full.xml create mode 120000 tests/qemuxml2xmloutdata/audio-oss-minimal.xml create mode 120000 tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml create mode 120000 tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml create mode 120000 tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml create mode 120000 tests/qemuxml2xmloutdata/audio-sdl-best.xml create mode 120000 tests/qemuxml2xmloutdata/audio-sdl-full.xml create mode 120000 tests/qemuxml2xmloutdata/audio-sdl-minimal.xml create mode 120000 tests/qemuxml2xmloutdata/audio-spice-best.xml create mode 120000 tests/qemuxml2xmloutdata/audio-spice-full.xml create mode 120000 tests/qemuxml2xmloutdata/audio-spice-minimal.xml --=20 2.29.2

3 25

[PATCH v4 0/4] Drop deprecated floppy config & bogus -drive if=T
by Markus Armbruster 12 Mar '21

12 Mar '21

v4: * PATCH 3: Move a declaration into a loop [Richard] * PATCH 4: Drop a superfluous call to drive_check_orphaned() [Daniel], fix comments [John] v3: * PATCH 1: New [Daniel] v2: * Rebased, straightforward conflict with commit f5d33dd51f "hw/block/fdc: Remove the check_media_rate property" resolved * PATCH 2: Commit message fixed [Kevin] Markus Armbruster (4): docs/system/deprecated: Fix note on fdc drive properties fdc: Drop deprecated floppy configuration fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common() blockdev: Drop deprecated bogus -drive interface type docs/system/deprecated.rst | 33 -- docs/system/removed-features.rst | 56 +++ include/sysemu/blockdev.h | 1 - blockdev.c | 37 +- hw/block/fdc.c | 73 +--- softmmu/vl.c | 11 +- tests/qemu-iotests/172 | 31 +- tests/qemu-iotests/172.out | 562 +------------------------------ 8 files changed, 82 insertions(+), 722 deletions(-) -- 2.26.2

3 6

[PATCH] Add 'interleave' to the sub-element for video device in rng file
by Kristina Hanicova 11 Mar '21

11 Mar '21

Previously, validation of XML failed if sub-elements of video device were in different order. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1825769 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- docs/schemas/domaincommon.rng | 216 +++++++++++++++++----------------- 1 file changed, 109 insertions(+), 107 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f7f804adc0..e6db2f5b74 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4009,120 +4009,122 @@ --> <define name="video"> <element name="video"> - <optional> - <element name="driver"> - <optional> - <ref name="virtioOptions"/> - </optional> - <optional> - <attribute name="name"> - <choice> - <value>qemu</value> - <value>vhostuser</value> - </choice> - </attribute> - </optional> - <optional> - <attribute name="vgaconf"> - <choice> - <value>io</value> - <value>on</value> - <value>off</value> - </choice> - </attribute> - </optional> - </element> - </optional> - <optional> - <element name="model"> - <choice> - <attribute name="type"> - <choice> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>xen</value> - <value>vbox</value> - <value>virtio</value> - <value>gop</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </choice> - </attribute> - <group> + <interleave> + <optional> + <element name="driver"> + <optional> + <ref name="virtioOptions"/> + </optional> + <optional> + <attribute name="name"> + <choice> + <value>qemu</value> + <value>vhostuser</value> + </choice> + </attribute> + </optional> + <optional> + <attribute name="vgaconf"> + <choice> + <value>io</value> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> + </element> + </optional> + <optional> + <element name="model"> + <choice> <attribute name="type"> - <value>qxl</value> + <choice> + <value>vga</value> + <value>cirrus</value> + <value>vmvga</value> + <value>xen</value> + <value>vbox</value> + <value>virtio</value> + <value>gop</value> + <value>none</value> + <value>bochs</value> + <value>ramfb</value> + </choice> </attribute> - <optional> - <attribute name="ram"> - <ref name="unsignedInt"/> - </attribute> - </optional> - <optional> - <attribute name="vgamem"> - <ref name="unsignedInt"/> - </attribute> - </optional> - <optional> - <attribute name="vram64"> - <ref name="unsignedInt"/> - </attribute> - </optional> - </group> - </choice> - <optional> - <attribute name="vram"> - <ref name="unsignedInt"/> - </attribute> - </optional> - <optional> - <attribute name="heads"> - <ref name="unsignedInt"/> - </attribute> - </optional> - <optional> - <attribute name="primary"> - <ref name="virYesNo"/> - </attribute> - </optional> - <optional> - <element name="acceleration"> - <optional> - <attribute name="accel3d"> - <ref name="virYesNo"/> - </attribute> - </optional> - <optional> - <attribute name="accel2d"> - <ref name="virYesNo"/> - </attribute> - </optional> - <optional> - <attribute name="rendernode"> - <ref name="absFilePath"/> + <group> + <attribute name="type"> + <value>qxl</value> </attribute> - </optional> - </element> - </optional> - <optional> - <element name="resolution"> - <attribute name="x"> + <optional> + <attribute name="ram"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> + <attribute name="vgamem"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> + <attribute name="vram64"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </group> + </choice> + <optional> + <attribute name="vram"> <ref name="unsignedInt"/> </attribute> - <attribute name="y"> + </optional> + <optional> + <attribute name="heads"> <ref name="unsignedInt"/> </attribute> - </element> - </optional> - </element> - </optional> - <optional> - <ref name="alias"/> - </optional> - <optional> - <ref name="address"/> - </optional> + </optional> + <optional> + <attribute name="primary"> + <ref name="virYesNo"/> + </attribute> + </optional> + <optional> + <element name="acceleration"> + <optional> + <attribute name="accel3d"> + <ref name="virYesNo"/> + </attribute> + </optional> + <optional> + <attribute name="accel2d"> + <ref name="virYesNo"/> + </attribute> + </optional> + <optional> + <attribute name="rendernode"> + <ref name="absFilePath"/> + </attribute> + </optional> + </element> + </optional> + <optional> + <element name="resolution"> + <attribute name="x"> + <ref name="unsignedInt"/> + </attribute> + <attribute name="y"> + <ref name="unsignedInt"/> + </attribute> + </element> + </optional> + </element> + </optional> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> + </interleave> </element> </define> <!-- -- 2.29.2

2 1

[libvirt PATCH] spec: Drop BuildDepends on make
by Andrea Bolognani 11 Mar '21

11 Mar '21

make is only used for the syntax-check tests, which we are explicitly skipping when building RPMs. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 1 - mingw-libvirt.spec.in | 1 - 2 files changed, 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8d8b900fbb..f9af330186 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -266,7 +266,6 @@ BuildRequires: python3-docutils BuildRequires: gcc BuildRequires: meson >= 0.54.0 BuildRequires: ninja-build -BuildRequires: make BuildRequires: git %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: perl-interpreter diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 0686cbaf78..288f533d52 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -54,7 +54,6 @@ BuildRequires: libxslt BuildRequires: python3 BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) -BuildRequires: make BuildRequires: meson BuildRequires: ninja-build BuildRequires: python3-docutils -- 2.26.2

2 1

[PATCH 0/2] Properly fix backup job termination
by Peter Krempa 11 Mar '21

11 Mar '21

Peter Krempa (2): backup: Store 'apiFlags' in private section of virDomainBackupDef qemuBackupJobTerminate: Fix job termination for inactive VMs src/conf/backup_conf.h | 2 ++ src/qemu/qemu_backup.c | 33 ++++++++++++++++++--------------- src/qemu/qemu_process.c | 9 ++++++--- 3 files changed, 26 insertions(+), 18 deletions(-) -- 2.29.2

2 3

[PATCH v2 0/3] ui: add support for 'secret' object to provide VNC/SPICE passwords
by Daniel P. Berrangé 11 Mar '21

11 Mar '21

This fixes a long standing limitation of the VNC/SPICE code which was unable to securely accept passswords on the CLI, instead requiring use of separate monitor commands after startup. In v2: - Dropped patch removing ACL commands, as it will move to a bigger deprecation cleanup series - Rebased and resolved conflicts Daniel P. Berrangé (3): ui: introduce "password-secret" option for VNC servers ui: introduce "password-secret" option for SPICE server ui: deprecate "password" option for SPICE server docs/system/deprecated.rst | 8 ++++++++ qemu-options.hx | 18 ++++++++++++++++-- ui/spice-core.c | 32 ++++++++++++++++++++++++++++++-- ui/vnc.c | 23 ++++++++++++++++++++++- 4 files changed, 76 insertions(+), 5 deletions(-) -- 2.29.2

2 4

[PATCH 0/4] ui: add support for 'secret' object to provide VNC/SPICE passwords
by Daniel P. Berrangé 11 Mar '21

11 Mar '21

This fixes a long standing limitation of the VNC/SPICE code which was unable to securely accept passswords on the CLI, instead requiring use of separate monitor commands after startup. This takes the opportunity to also remove previously deprecated ACL functionality from VNC. Daniel P. Berrangé (4): ui: introduce "password-secret" option for VNC servers ui: introduce "password-secret" option for SPICE server ui: deprecate "password" option for SPICE server ui, monitor: remove deprecated VNC ACL option and HMP commands docs/system/deprecated.rst | 24 ++-- docs/system/removed-features.rst | 13 +++ hmp-commands.hx | 76 ------------- monitor/misc.c | 187 ------------------------------- qemu-options.hx | 17 ++- ui/spice-core.c | 32 +++++- ui/vnc.c | 61 ++++------ 7 files changed, 88 insertions(+), 322 deletions(-) -- 2.29.2

3 8

[PATCH 00/23] RFC: get rid of macros when dealing with block io tunes
by Nikolay Shirokovskiy 11 Mar '21

11 Mar '21

Hi, all. I started this work as adding missing parts/fixing issues/etc in block iotune code but then turned to refactoring code. We use a lot of macros in this place and if we get rid of them I belive we will have much more readable/reusable/ extendable code. Most of macros usage is for iterating over unsigned long long values. I'm talking about parsing/formating xml, converting from/to virTypedParameterPtr list etc. These places do not care about tune semantics and thus we can add tools for the said iteration. See patch [1] for the first such conversion. Patches before it partially prepare for this conversion, partially just improve code reuse and add missing parts. The work on removing macros in code handling iotunes is not finished as I wanted to get an approvement that I have taken a right direction. At the same time series shows the potential of the approach (take a look on how qemuDomainSetBlockIoTune and testDomainSetBlockIoTune are looking now!). Some places like qemuDomainSetBlockIoTuneDefaults deal with fields semantics. So we need another approach to remove macros there but it is a matter of a different RFC. Nikolay Shirokovskiy (23): qemu: pass supportGroupNameOption as expected qemu: factor out qemuValidateDomainBlkdeviotune qemu: reuse validation in qemuDomainSetBlockIoTune qemu: remove extra check for QEMU_BLOCK_IOTUNE_MAX conf: factor out virDomainBlockIoTuneValidate qemu: reuse virDomainBlockIoTuneValidate test driver: reuse virDomainBlockIoTuneValidate qemu: reset max iotune setting when needed qemu: add max iotune settings check to virDomainBlockIoTuneValidate qemu: remove iotune max checks test driver: remove iotune max checks qemu: prepare for removing qemuBlockIoTuneSetFlags qemu: use group_name instead of QEMU_BLOCK_IOTUNE_SET_GROUP_NAME qemu: remove qemuBlockIoTuneSetFlags usage in qemuDomainSetBlockIoTune qemu: remove qemuBlockIoTuneSetFlags enum completly conf: get rid of macros in virDomainDiskDefIotuneParse [1] conf: get rid of macros in virDomainDiskDefFormatIotune conf: add virDomainBlockIoTuneFromParams conf: add virDomainBlockIoTuneToEventParams qemu: qemuDomainSetBlockIoTune use functions to convert to/from params test driver: remove TEST_BLOCK_IOTUNE_MAX checks test driver: prepare to delete macros in testDomainSetBlockIoTune test driver: testDomainSetBlockIoTune: use functions to convert to/from params src/conf/domain_conf.c | 303 +++++++++++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 16 +++ src/libvirt_private.syms | 3 + src/qemu/qemu_driver.c | 281 ++++++++++++------------------------------- src/qemu/qemu_validate.c | 100 +++++++++------- src/qemu/qemu_validate.h | 4 + src/test/test_driver.c | 156 ++---------------------- 7 files changed, 380 insertions(+), 483 deletions(-) -- 1.8.3.1

2 42

[PATCH v3 0/4] Drop deprecated floppy config & bogus -drive if=T
by Markus Armbruster 11 Mar '21

11 Mar '21

v3: * PATCH 1: New [Daniel] v2: * Rebased, straightforward conflict with commit f5d33dd51f "hw/block/fdc: Remove the check_media_rate property" resolved * PATCH 2: Commit message fixed [Kevin] Markus Armbruster (3): fdc: Drop deprecated floppy configuration fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common() blockdev: Drop deprecated bogus -drive interface type docs/system/deprecated.rst | 33 -- docs/system/removed-features.rst | 33 ++ include/sysemu/blockdev.h | 1 - blockdev.c | 37 +- hw/block/fdc.c | 73 +--- softmmu/vl.c | 8 +- tests/qemu-iotests/172 | 31 +- tests/qemu-iotests/172.out | 562 +------------------------------ 8 files changed, 59 insertions(+), 719 deletions(-) -- 2.26.2

4 13

[PATCH v2 00/12] qemu: Prepare for QAPIfied object-add
by Peter Krempa 10 Mar '21

10 Mar '21

QEMU plans to QAPIfy object add. This series prepares for the API change (drop of 'props' wrapper for the object) and adds testing based on our qemuxml2argv test data which forces the output to JSON and validates it agains the schema. Based on Kevin's qemu patches: https://listman.redhat.com/archives/libvir-list/2021-February/msg01168.html Last patch forces more files to be processed and as the summary suggest will not be pushed. The patch updating qemucapabilitiesdata will be updated after Kevin's patches hit upstream repo. Peter Krempa (12): qemu: command: Generate commandline of 'masterKey0' secret via JSON qemu: command: Generate commandline of 'sev0' sev-guest object via JSON qemu: command: Generate commandline of iothread objects JSON qemu: capabilities: Introduce QEMU_CAPS_OBJECT_QAPIFIED tests: qemuxml2argv: Validate generation of JSON props for object-add qemu: command: Introduce raw JSON passthrough for '-object' for testing 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 qemumonitorjsontest: Remove bomb guarding object-add tests: qemucapabilities: Update qemu caps for object-add qapification [DON'T PUSH] Force-check all configs with latest capabilities src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 326 +- src/qemu/qemu_monitor.c | 78 +- src/qemu/qemu_monitor.h | 4 - src/util/virqemu.c | 48 +- src/util/virqemu.h | 3 +- .../caps_6.0.0.x86_64.replies | 3238 ++++++++++++----- .../caps_6.0.0.x86_64.xml | 83 +- tests/qemumonitorjsontest.c | 14 - ...v-missing-platform-info.x86_64-2.12.0.args | 2 +- .../launch-security-sev.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvtest.c | 24 +- 13 files changed, 2775 insertions(+), 1054 deletions(-) -- 2.29.2

2 18

[PATCH] XML validate that 'ramfb' has no address
by Kristina Hanicova 10 Mar '21

10 Mar '21

With this, XML fails if config video type 'ramfb' contains address, since address is not supported for 'ramfb' video devices. Previously it didn't raise error. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1891416 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/conf/domain_validate.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index b4e09e21fe..c9c677ddf5 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -151,6 +151,14 @@ virDomainVideoDefValidate(const virDomainVideoDef *video, } } + if (video->type == VIR_DOMAIN_VIDEO_TYPE_RAMFB) { + if (video->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("address not supported for video type ramfb")); + return -1; + } + } + return 0; } -- 2.29.2

2 1

[PATCH] virQEMUCapsInitQMPArch: Refactor cleanup
by Yi Li 10 Mar '21

10 Mar '21

Switch to using the 'g_auto*' helpers. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/qemu/qemu_capabilities.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 790375ac38..447cf77875 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5044,23 +5044,18 @@ static int virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) { - char *archstr = NULL; - int ret = -1; + g_autofree char *archstr = NULL; if (!(archstr = qemuMonitorGetTargetArch(mon))) - goto cleanup; + return -1; if ((qemuCaps->arch = virQEMUCapsArchFromString(archstr)) == VIR_ARCH_NONE) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown QEMU arch %s"), archstr); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - VIR_FREE(archstr); - return ret; + return 0; } -- 2.25.3

2 1

[PATCH 0/4] Discourage use of some GLib functions
by Michal Privoznik 10 Mar '21

10 Mar '21

See 4/4 for the list and explanation. Michal Prívozník (4): qemu_shim: Replace g_file_get_contents() with virFileReadAll() virutil: Do not use g_get_host_name() to obtain hostname syntax-check: Update list of gethostname exceptions docs: Discourage use of some glib functions build-aux/syntax-check.mk | 2 +- docs/glib-adoption.rst | 17 +++++++++++++++++ src/qemu/qemu_shim.c | 18 +++++++++++------- src/util/virutil.c | 12 +++++++++--- 4 files changed, 38 insertions(+), 11 deletions(-) -- 2.26.2

3 8

[PATCH 00/16] Improve virStrcpy and remove virStrncpy
by Peter Krempa 10 Mar '21

10 Mar '21

Peter Krempa (16): util: virstring: Always copy string in virStrcpy virProcessRunInForkHelper: Use virStrcpyStatic for static buffers sanlock: Use virStrcpy instead of virStrncpy virDevMapperGetTargetsImpl: Use virStrcpy instead of virStrncpy virFileLoopDeviceAssociate: Use virStrcpy instead of virStrncpy xenParseXMDisk: Replace g_new + virStrncpy by g_strndup test_driver: Rewrite testBuildFilename xenParseVif: Refactor parser xenParseSxprSound: Refactor parsing of model list openvzReadNetworkConf: Rework parser xenParseXLChannel: Use g_strndup instead of virStrndup xenParseXLUSBController: Avoid use of virStrndup xenParseXLUSB: Rewrite to avoid virStrncpy virNetLibsshAuthenticatePrivkeyCb: Use g_autofree for 'actual_prompt' virNetLibsshAuthenticatePrivkeyCb: Use virStrcpy instead of virStrncpy util: virstring: Remove virStrncpy docs/coding-style.rst | 13 --- src/libvirt_private.syms | 1 - src/libxl/xen_common.c | 182 +++++++++++------------------- src/libxl/xen_xl.c | 84 ++++---------- src/libxl/xen_xm.c | 9 +- src/locking/lock_driver_sanlock.c | 4 +- src/openvz/openvz_conf.c | 77 +++++-------- src/rpc/virnetlibsshsession.c | 17 +-- src/test/test_driver.c | 35 +----- src/util/virdevmapper.c | 2 +- src/util/virfile.c | 3 +- src/util/virprocess.c | 8 +- src/util/virstring.c | 54 +-------- src/util/virstring.h | 5 +- 14 files changed, 137 insertions(+), 357 deletions(-) -- 2.29.2

2 33

RFC: do we want/need the "Ptr" typedefs for internal code ?
by Daniel P. Berrangé 10 Mar '21

10 Mar '21

One of the conventions we have had since the early days of libvirt is that every struct typedef, has a corresponding "Ptr" typedef too. For example typedef struct _virDomainDef virDomainDef; typedef virDomainDef *virDomainDefPtr; Periodically someone has questioned what the purpose of these Ptr typedefs is, and we've not had an compelling answer, other than that's what we've always done. There are a few things that make me question the status quo - If we want a const pointer, we can't use const virDomainDefPtr def because that expands to "struct _virDomainDef * const", which is not what we need semantically. Instead we must write const virDomainDef *def It is not at all obvious why these two are different, but none the less they are, which is confusing to contributors To me this a compelling reason to consider the "Ptr" typedefs a waste of time, if not actively harmful. Please don't suggest adding virDomainDefConstPtr too ! - Writing 'virDomainDefPtr' is actually two characters more typing than 'virDomainDef *'. IOW these "Ptr" typedefs aren't saving us time when writing code. - This convention of having "Ptr" typedefs is atypical among C projects I've worked on. Anything that is peculiar to libvirt is another item that new contributors need to learn, so has a cost to the project that must be weighed against its benefit. We can't do anything about the use "Ptr" in the include/ files because that is public ABI. We can potentially eliminate "Ptr" types everywhere else in the codebase, even the src/libvirt*.c files corresponding to the public includes. Does anyone have suggestions for how these "Ptr" typedefs are benefiting libvirt ? Would anyone miss them ? 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 :|

7 10

[PATCH 0/2] fix crash on invalid construction of a gvariant
by Peter Krempa 10 Mar '21

10 Mar '21

Peter Krempa (2): virSystemdCreateMachine: Use proper format string for uint64_t when constructing gvariant virsystemdtest: Call at least one virSystemdCreateMachine with 'maxthreads' > 0 src/util/virsystemd.c | 5 +++-- tests/virsystemdtest.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.29.2

2 3

Libvirt has been accepted into GSoC 2021
by Michal Privoznik 10 Mar '21

10 Mar '21

Dear list, let me share great news: just like in the past years, libvirt is going to be part of Google Summer of Code also this year [1]. We can expect interested students to show up and discuss possible projects to work on. However, there are some changes made to this year's run [2]: 1) Smaller projects - with everything going on one can hardly expect students to commit to 350 hours of coding over three months. This is now reduced to 175 hours over 10 weeks, 2) More elligible students - now even PhD students and licensed coding school students can apply, 2) Halved stipends - since the amount of work is halved, so are the stipends, 3) Two evaluations - again, shorted time period requires less evaluations. Happy hacking, Michal 1: https://summerofcode.withgoogle.com/organizations/5771368592834560/ 2: https://opensource.googleblog.com/2020/10/google-summer-of-code-2021-is-bri…

1 0

[PULL 05/17] utils: Deprecate hex-with-suffix sizes
by Eric Blake 09 Mar '21

09 Mar '21

Supporting '0x20M' looks odd, particularly since we have a 'B' suffix that is ambiguous for bytes, as well as a less-frequently-used 'E' suffix for extremely large exibytes. In practice, people using hex inputs are specifying values in bytes (and would have written 0x2000000, or possibly relied on default_suffix in the case of qemu_strtosz_MiB), and the use of scaling suffixes makes the most sense for inputs in decimal (where the user would write 32M). But rather than outright dropping support for hex-with-suffix, let's follow our deprecation policy. Sadly, since qemu_strtosz() does not have an Err** parameter, and plumbing that in would be a much larger task, we instead go with just directly emitting the deprecation warning to stderr. Signed-off-by: Eric Blake <eblake(a)redhat.com> Message-Id: <20210211204438.1184395-4-eblake(a)redhat.com> Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/system/deprecated.rst | 8 ++++++++ util/cutils.c | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index cfabe6984677..ecff6bf8c633 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -166,6 +166,14 @@ Using ``-M kernel-irqchip=off`` with x86 machine types that include a local APIC is deprecated. The ``split`` setting is supported, as is using ``-M kernel-irqchip=off`` with the ISA PC machine type. +hexadecimal sizes with scaling multipliers (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Input parameters that take a size value should only use a size suffix +(such as 'k' or 'M') when the base is written in decimal, and not when +the value is hexadecimal. That is, '0x20M' is deprecated, and should +be written either as '32M' or as '0x2000000'. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/util/cutils.c b/util/cutils.c index 189a184859c0..d89a40a8c325 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -250,6 +250,9 @@ static int64_t suffix_mul(char suffix, int64_t unit) * fractional portion is truncated to byte * - 0x7fEE - hexadecimal, unit determined by @default_suffix * + * The following cause a deprecation warning, and may be removed in the future + * - 0xabc{kKmMgGtTpP} - hex with scaling suffix + * * The following are intentionally not supported * - octal, such as 08 * - fractional hex, such as 0x1.8 @@ -272,7 +275,7 @@ static int do_strtosz(const char *nptr, const char **end, int retval; const char *endptr, *f; unsigned char c; - bool mul_required = false; + bool mul_required = false, hex = false; uint64_t val; int64_t mul; double fraction = 0.0; @@ -298,6 +301,7 @@ static int do_strtosz(const char *nptr, const char **end, retval = -EINVAL; goto out; } + hex = true; } else if (*endptr == '.') { /* * Input looks like a fraction. Make sure even 1.k works @@ -320,6 +324,10 @@ static int do_strtosz(const char *nptr, const char **end, c = *endptr; mul = suffix_mul(c, unit); if (mul > 0) { + if (hex) { + warn_report("Using a multiplier suffix on hex numbers " + "is deprecated: %s", nptr); + } endptr++; } else { mul = suffix_mul(default_suffix, unit); -- 2.30.1

1 0

[PATCH v4 0/1] qemu: add per-vcpu delay stats
by Aleksei Zakharov 09 Mar '21

09 Mar '21

Fixed since v3: - Report error if cannot read stats. - Don't fail if cannot read stats. - Add documentation. - Drop unnecessary checks. - Don't delete unrelated whitespace. - Make sure schedstat file is closed before returning. Fixed since v2: - Close schedstat file after use. Fixes since v1: - Collect per-vcpu stats. - Coding style errors - Use glib functions. Aleksei Zakharov (1): qemu: add per-vcpu delay stats docs/manpages/virsh.rst | 4 ++++ src/libvirt-domain.c | 4 ++++ src/qemu/qemu_driver.c | 44 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 50 insertions(+), 2 deletions(-) -- 2.17.1

3 4

[libvirt PATCH 00/17] qemu: Implement external limit manager feature
by Andrea Bolognani 09 Mar '21

09 Mar '21

This feature has been requested by KubeVirt developers and will make it possible for them to make some VFIO-related features, such as migration and hotplug, work correctly. https://bugzilla.redhat.com/show_bug.cgi?id=1916346 The first part of the series, especially the first 9 patches, is preparation work: it addresses a few annoying issues with our APIs that deal with process limits, and makes them all nice, consistent and easy to reason about while moving policy code from the generic code to the QEMU driver where it belongs. Andrea Bolognani (17): util: Document limit-related functions util: Simplify stubs util: Always pass a pid to virProcessSetMax*() util: Introduce virProcess{Get,Set}Limit() qemu: Make some minor tweaks qemu: Set all limits at the same time util: Have virCommand remember whether limits are set qemu: Set limits only when explicitly asked to do so util: Don't special-case setting a limit to zero conf: Rename original_memlock -> originalMemlock tests: Mock virProcessGetMaxMemLock() util: Try to get limits from /proc qemu: Don't ignore virProcessGetMaxMemLock() errors qemu: Refactor qemuDomainAdjustMaxMemLock() qemu: Add external_limit_manager config knob qemu: Wire up external limit manager news: Document external limit manager feature NEWS.rst | 10 + src/conf/domain_conf.h | 5 +- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 12 + src/qemu/qemu_command.c | 4 - src/qemu/qemu_conf.c | 4 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 47 ++-- src/qemu/qemu_migration.c | 2 + src/qemu/qemu_process.c | 30 ++- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircommand.c | 21 +- src/util/virprocess.c | 340 ++++++++++++++++++++--------- src/util/virprocess.h | 2 +- tests/virprocessmock.c | 7 + 15 files changed, 354 insertions(+), 133 deletions(-) -- 2.26.2

3 42

[PATCH] domaincapstest: Return EXIT_SUCCESS / EXIT_FAILURE instead of -1
by Peter Krempa 09 Mar '21

09 Mar '21

The value is used as return value for the process itself. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/domaincapstest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 7a082705c6..65d9f4c635 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -475,7 +475,7 @@ mymain(void) DO_TEST_BHYVE("fbuf", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); #endif /* WITH_BHYVE */ - return ret; + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } #if WITH_QEMU -- 2.29.2

2 1

[PATCH] qemuMigrationSrcRun: Don't jump to 'exit_monitor' from outside of the monitor
by Peter Krempa 09 Mar '21

09 Mar '21

Failure of 'qemuMigrationSetDBusVMState' would jump to 'exit_monitor' but the function isn't called inside of the monitor context. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e44931dcfa..79dcb4a15d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4156,7 +4156,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, } if (qemuMigrationSetDBusVMState(driver, vm) < 0) - goto exit_monitor; + goto error; /* Before EnterMonitor, since already qemuProcessStopCPUs does that */ if (!(flags & VIR_MIGRATE_LIVE) && -- 2.29.2

2 1

[PATCH] meson: Add documentation installation directory option
by Chris Mayo 09 Mar '21

09 Mar '21

Allow the directory to be chosen at installation time, to support local conventions e.g. versioning. Signed-off-by: Chris Mayo <aklhfex(a)gmail.com> --- meson.build | 6 +++++- meson_options.txt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 369548f127..5c7a335947 100644 --- a/meson.build +++ b/meson.build @@ -83,8 +83,12 @@ mandir = prefix / get_option('mandir') sbindir = prefix / get_option('sbindir') sharedstatedir = prefix / get_option('sharedstatedir') +docdir = get_option('docdir') +if docdir == '' + docdir = datadir / 'doc' / meson.project_name() +endif + confdir = sysconfdir / meson.project_name() -docdir = datadir / 'doc' / meson.project_name() pkgdatadir = datadir / meson.project_name() diff --git a/meson_options.txt b/meson_options.txt index e5d79c2b6b..2606648b64 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,6 +7,7 @@ option('expensive_tests', type: 'feature', value: 'auto', description: 'set the option('test_coverage', type: 'boolean', value: false, description: 'turn on code coverage instrumentation') option('git_werror', type: 'feature', value: 'auto', description: 'use -Werror if building from GIT') option('rpath', type: 'feature', value: 'auto', description: 'whether to include rpath information in installed binaries and libraries') +option('docdir', type: 'string', value: '', description: 'documentation installation directory') option('docs', type: 'feature', value: 'auto', description: 'whether to generate documentation') option('tests', type: 'feature', value: 'auto', description: 'whether to build tests') -- 2.28.0

3 2

[libvirt PATCH] util: Fix error reporting in virnetlink
by Andrea Bolognani 09 Mar '21

09 Mar '21

The preprocessor macro we use to check whether we're on Linux has not been spelled properly, and so we will always report the error message intended for other platforms. Fixes: 879bcee08ce0f91f556fddfe452c3fbed5318468 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/util/virnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index a06195bd00..cfb86550a5 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -1231,7 +1231,7 @@ virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr, #else -# if defined(__linux) +# if defined(__linux__) static const char *unsupported = N_("libnl was not available at build time"); # else static const char *unsupported = N_("not supported on non-linux platforms"); -- 2.26.2

2 1

[libvirt PATCH] util: don't log error if SRIOV PF has no associated netdev
by Laine Stump 09 Mar '21

09 Mar '21

Some SRIOV PFs don't have a netdev associated with them (the spec apparently doesn't require it). In most cases when libvirt is dealing with an SRIOV VF, that VF must have a PF, and the PF *must* have an associated netdev (the only way to set the MAC address of a VF is by sending a netlink message to the netdev of that VF's PF). But there are times when we don't need for the PF to have a netdev; in particular, when we're just getting the Switchdev Features for a VF, we don't need the PF netdev - the netdev of the VF (apparently) works just as well. Commit 6452e2f5 (libvirt 5.1.0) *kind of* made libvirt work around PFs with no netdevs in this case - if virNetDevGetPhysicalFunction returned an error when setting up to retrieve Switchdev feature info, it would ignore the error, and then check if the PF netdev name was NULL and, if so it would reset the error object and continue on rather than returning early with a failure. The problem is that by the time this special handling occured, the error message about missing netdev had already been logged, which was harmless to proper operation, but confused the user. Fortunately there are only 2 users of virNetDevGetPhysicalFunction, so it is easy to redefine it's API to state that a missing netdev name is *not* an error - in that case it will still return success, but the caller must be prepared for the PF netdev name to be NULL. After making this change, we can modify the two callers to behave properly with the new semantics (for one of the callers it *is* still an error, so the error message is moved there, but for the other it is okay to continue), and our spurious error messages are a thing of the past. Resolves: https://bugzilla.redhat.com/1924616 Fixes: 6452e2f5e1837bd753ee465e6607ed3c4f62b815 Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/util/virnetdev.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 2b4c8b6280..7b766234ec 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1339,7 +1339,8 @@ virNetDevGetVirtualFunctionIndex(const char *pfname, const char *vfname, * * @ifname : name of the physical function interface name * @pfname : Contains sriov physical function for interface ifname - * upon successful return + * upon successful return (might be NULL if the PF has no + * associated netdev. This is *not* an error) * * Returns 0 on success, -1 on failure * @@ -1361,15 +1362,6 @@ virNetDevGetPhysicalFunction(const char *ifname, char **pfname) return -1; } - if (!*pfname) { - /* The SRIOV standard does not require VF netdevs to have - * the netdev assigned to a PF. */ - virReportError(VIR_ERR_INTERNAL_ERROR, - _("The PF device for VF %s has no network device name"), - ifname); - return -1; - } - return 0; } @@ -1442,6 +1434,17 @@ virNetDevGetVirtualFunctionInfo(const char *vfname, char **pfname, if (virNetDevGetPhysicalFunction(vfname, pfname) < 0) return -1; + if (!*pfname) { + /* The SRIOV standard does not require VF netdevs to have the + * netdev assigned to a PF, but our method of retrieving + * VFINFO does. + */ + virReportError(VIR_ERR_INTERNAL_ERROR, + _("The PF device for VF %s has no network device name, cannot get virtual function info"), + vfname); + return -1; + } + if (virNetDevGetVirtualFunctionIndex(*pfname, vfname, vf) < 0) goto cleanup; @@ -3204,12 +3207,8 @@ virNetDevSwitchdevFeature(const char *ifname, if ((is_vf = virNetDevIsVirtualFunction(ifname)) < 0) return ret; - if (is_vf == 1) { - /* Ignore error if PF does not have netdev assigned. - * In that case pfname == NULL. */ - if (virNetDevGetPhysicalFunction(ifname, &pfname) < 0) - virResetLastError(); - } + if (is_vf == 1 && virNetDevGetPhysicalFunction(ifname, &pfname) < 0) + return ret; pci_device_ptr = pfname ? virNetDevGetPCIDevice(pfname) : virNetDevGetPCIDevice(ifname); -- 2.29.2

2 3

[PATCH] virnetdevbandwidth: Don't generate burst outside of boundaries
by Michal Privoznik 09 Mar '21

09 Mar '21

When generating TC rules for domain's outbound traffic, Libvirt will use the 'average' as the default for 'burst' - it's been this way since the feature introduction in v0.9.4-rc1~22. The reason is that 'average' considers 'burst' for policing. However, when parsing its command line TC uses an unsigned int (with overflow detection) to store the 'burst' size. This means, that the upper limit for the value is UINT_MAX, well UINT_MAX / 1024 because we are putting the value in KiB onto the command line. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1912210 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdevbandwidth.c | 12 +++++++++++- tests/virnetdevbandwidthtest.c | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 612e8f985c..77a97176b0 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -358,7 +358,17 @@ virNetDevBandwidthSet(const char *ifname, if (rx) { average = g_strdup_printf("%llukbps", rx->average); - burst = g_strdup_printf("%llukb", rx->burst ? rx->burst : rx->average); + + if (rx->burst) { + burst = g_strdup_printf("%llukb", rx->burst); + } else { + /* Internally, tc uses uint to store burst size (in bytes). + * Therefore, the largest value we can set is UINT_MAX bytes. + * We're outputting the vale in KiB though. */ + unsigned long long avg = MIN(rx->average, UINT_MAX / 1024); + + burst = g_strdup_printf("%llukb", avg); + } virCommandFree(cmd); cmd = virCommandNew(TC); diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 2e76af3d0c..7c236f50f3 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -156,6 +156,21 @@ mymain(void) TC " filter add dev eth0 parent ffff: protocol all u32 match u32 0 0 " "police rate 5kbps burst 7kb mtu 64kb drop flowid :1\n")); + DO_TEST_SET(("<bandwidth>" + " <inbound average='4294967295'/>" + " <outbound average='4294967295'/>" + "</bandwidth>"), + (TC " qdisc del dev eth0 root\n" + TC " qdisc del dev eth0 ingress\n" + TC " qdisc add dev eth0 root handle 1: htb default 1\n" + TC " class add dev eth0 parent 1: classid 1:1 htb rate 4294967295kbps quantum 366503875\n" + TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 10\n" + TC " filter add dev eth0 parent 1:0 protocol all prio 1 handle 1 fw flowid 1\n" + TC " qdisc add dev eth0 ingress\n" + TC " filter add dev eth0 parent ffff: protocol all u32 match " + "u32 0 0 police rate 4294967295kbps burst 4194303kb mtu 64kb " + "drop flowid :1\n")); + return ret; } -- 2.26.2

2 1

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

08 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). 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> --- src/conf/domain_conf.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 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; } -- 2.29.2

2 1

[libvirt PATCH 0/2] docs: less docs for insecure SASL mechanisms
by Daniel P. Berrangé 08 Mar '21

08 Mar '21

GSSAPI and SCRAM-SHA-256 are the only two SASL mechanisms we especially want people to be using. Even the latter is a little questionable due to storing passwords in cleartext on the server. Daniel P. Berrangé (2): docs: convert auth page into RST format docs: stop mentioning insecure / broken SASL mechanisms docs/auth.html.in | 368 --------------------------------------- docs/auth.rst | 323 ++++++++++++++++++++++++++++++++++ docs/meson.build | 2 +- src/remote/libvirtd.sasl | 11 +- 4 files changed, 330 insertions(+), 374 deletions(-) delete mode 100644 docs/auth.html.in create mode 100644 docs/auth.rst -- 2.29.2

2 8

[PATCH v2 0/3] Drop deprecated floppy config & bogus -drive if=T
by Markus Armbruster 08 Mar '21

08 Mar '21

v2: * Rebased, straightforward conflict with commit f5d33dd51f "hw/block/fdc: Remove the check_media_rate property" resolved * PATCH 2: Commit message fixed [Kevin] Markus Armbruster (3): fdc: Drop deprecated floppy configuration fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common() blockdev: Drop deprecated bogus -drive interface type docs/system/deprecated.rst | 33 -- docs/system/removed-features.rst | 33 ++ include/sysemu/blockdev.h | 1 - blockdev.c | 37 +- hw/block/fdc.c | 73 +--- softmmu/vl.c | 8 +- tests/qemu-iotests/172 | 31 +- tests/qemu-iotests/172.out | 562 +------------------------------ 8 files changed, 59 insertions(+), 719 deletions(-) -- 2.26.2

3 12

[PATCH] virDevMapperGetTargetsImpl: Use correct length when copying into dm.name
by Michal Privoznik 08 Mar '21

08 Mar '21

For reasons unknown, when rewriting this code and dropping libdevmapper I've mistakenly used incorrect length of dm.name. In linux/dm-ioctl.h the dm_ioctl struct is defined as follows: #define DM_NAME_LEN 128 struct dm_ioctl { ... char name[DM_NAME_LEN]; /* device name */ ... }; However, when copying string into this member, DM_TABLE_DEPS was used, which is defined as follows: #define DM_TABLE_DEPS _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, struct dm_ioctl) After decryption, this results in the following size: 3241737483. Fixes: 22494556542c676d1b9e7f1c1f2ea13ac17e1e3e Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virdevmapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index fcb11e954f..2c4c2df999 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -240,7 +240,7 @@ virDevMapperGetTargetsImpl(int controlFD, if (!(sanitizedPath = virDMSanitizepath(path))) return 0; - if (virStrcpy(dm.name, sanitizedPath, DM_TABLE_DEPS) < 0) { + if (virStrcpy(dm.name, sanitizedPath, DM_NAME_LEN) < 0) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Resolved device mapper name too long")); return -1; -- 2.26.2

2 1

[PATCH] meson: tools: depend on keycode generated sources
by Roman Bogorodskiy 05 Mar '21

05 Mar '21

Tools depend on keycode generated sources, so declare that as an explicit dependency, otherwise it might fail with: ../tools/virsh-completer-domain.c:35:10: fatal error: 'virkeynametable_linux.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- I noticed that build failure on FreeBSD 11.x. For some reason, it doesn't show up on newer versions. This is strange, but as the fix appears to be straight-forward, I didn't spend much time figuring out the reason. In case you're interested, a full failing build log is here: https://people.freebsd.org/~novel/misc/libvirt-7.1.0.log It doesn't seem to even try to generate these files. When I inspected filesystem state, these files were missing. src/util/meson.build | 2 ++ tools/meson.build | 1 + 2 files changed, 3 insertions(+) diff --git a/src/util/meson.build b/src/util/meson.build index 0080825bd0..cd3fe18524 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -168,6 +168,8 @@ foreach name : keyname_list ) endforeach +keycode_dep = declare_dependency(sources: keycode_gen_sources) + io_helper_sources = [ 'iohelper.c', ] diff --git a/tools/meson.build b/tools/meson.build index b8c6802f0a..42dc609439 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -186,6 +186,7 @@ executable( tools_dep, readline_dep, thread_dep, + keycode_dep, ], link_args: [ coverage_flags, -- 2.30.0

3 5

[PATCH] docs: Document qemu.conf locations
by Michal Privoznik 05 Mar '21

05 Mar '21

Surprisingly, we never documented the relationship between connection URI and the location of qemu.conf. Users might wonder what qemu.conf is loaded when they are connecting to the session daemon or embed URI. And what to do if the file doesn't exist for the URI they're using. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/drvqemu.html.in | 39 +++++++++++++++++++++++++++++++++++++ docs/manpages/libvirtd.rst | 20 +++++++++++++++++++ docs/manpages/virtqemud.rst | 22 +++++++++++++++++++++ 3 files changed, 81 insertions(+) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 31d3fee213..a784f5768c 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -162,6 +162,45 @@ qemu+ssh://root@example.com/system (remote access, SSH tunnelled) of libvirt, once QMP processing moves to a dedicated thread. </p> + <h2><a id="configFiles">Location of configuration files</a></h2> + + <p> + The QEMU driver comes with sane default values. However, during its + initialization it reads a configuration file which offers system + administrator or an user to override some of that default. The location + of the file depends on the connection URI, as follows: + </p> + + <table> + <tr> + <td><code>qemu:///system</code></td> + <td><code>/etc/libvirt/qemu.conf</code></td> + </tr> + <tr> + <td><code>qemu:///session</code></td> + <td><code>$XDG_CONFIG_HOME/libvirt/qemu.conf</code></td> + </tr> + <tr> + <td><code>qemu:///embed</code></td> + <td><code>$rootdir/etc/qemu.conf</code></td> + </tr> + </table> + + <p> + If <code>$XDG_CONFIG_HOME</code> is not set in the environment, it + defaults to <code>$HOME/.config</code>. For the embed URI the + <code>$rootdir</code> represents the specified root directory from + the connection URI. + </p> + + <p> + Please note, that it is very likely that the only qemu.conf file that + will exist after installing libvirt is the + <code>/etc/libvirt/qemu.conf</code>, if users of the session daemon or + the embed driver want to override a built in value, then they need to + create the file before connecting to the respective URI. + </p> + <h2><a id="security">Driver security architecture</a></h2> <p> diff --git a/docs/manpages/libvirtd.rst b/docs/manpages/libvirtd.rst index ed591f4778..6545dc58d3 100644 --- a/docs/manpages/libvirtd.rst +++ b/docs/manpages/libvirtd.rst @@ -136,6 +136,16 @@ When run as *root* The default configuration file used by ``libvirtd``, unless overridden on the command line using the ``-f`` | ``--config`` option. +If QEMU driver is installed, then the following file is also read: + +* ``@SYSCONFDIR@/libvirt/qemu.conf`` + +This file contains various knobs and default values for virtual machines +created within QEMU driver, and offers a way to override the built in defaults, +for instance (but not limited to): paths to various supplementary binaries, TLS +certificates location, graphical consoles configuration and others. Location of +this file can't be overridden by any command line switch. + * ``@RUNSTATEDIR@/libvirt/libvirt-sock`` * ``@RUNSTATEDIR@/libvirt/libvirt-sock-ro`` @@ -166,6 +176,16 @@ When run as *non-root* The default configuration file used by ``libvirtd``, unless overridden on the command line using the ``-f``|``--config`` option. +If QEMU driver is installed, then the following file is also read: + +* ``$XDG_CONFIG_HOME/libvirt/qemu.conf`` + +If the file exists, it can contain various knobs and default values for virtual +machines created within QEMU driver, and offers a way to override the built in +defaults, for instance (but not limited to): paths to various supplementary +binaries, TLS certificates location, graphical consoles configuration and +others. Location of this file can't be overridden by any command line switch. + * ``$XDG_RUNTIME_DIR/libvirt/libvirt-sock`` The socket ``libvirtd`` will use. diff --git a/docs/manpages/virtqemud.rst b/docs/manpages/virtqemud.rst index fbcc6e45fa..d82d09ee61 100644 --- a/docs/manpages/virtqemud.rst +++ b/docs/manpages/virtqemud.rst @@ -111,6 +111,17 @@ When run as *root* The default configuration file used by ``virtqemud``, unless overridden on the command line using the ``-f`` | ``--config`` option. +In addition to the default configuration file, ``virtqemud`` reads +configuration for the qemu driver from: + +* ``@SYSCONFDIR@/libvirt/qemu.conf`` + +This file contains various knobs and default values for virtual machines +created within QEMU driver, and offers a way to override the built in defaults, +for instance (but not limited to): paths to various supplementary binaries, TLS +certificates location, graphical consoles configuration and others. Location of +this file can't be overridden by any command line switch. + * ``@RUNSTATEDIR@/libvirt/virtqemud-sock`` * ``@RUNSTATEDIR@/libvirt/virtqemud-sock-ro`` * ``@RUNSTATEDIR@/libvirt/virtqemud-admin-sock`` @@ -132,6 +143,17 @@ When run as *non-root* The default configuration file used by ``virtqemud``, unless overridden on the command line using the ``-f``|``--config`` option. +In addition to the default configuration file, ``virtqemud`` reads +configuration for the qemu driver from: + +* ``$XDG_CONFIG_HOME/libvirt/qemu.conf`` + +If the file exists, it can contain various knobs and default values for virtual +machines created within QEMU driver, and offers a way to override the built in +defaults, for instance (but not limited to): paths to various supplementary +binaries, TLS certificates location, graphical consoles configuration and +others. Location of this file can't be overridden by any command line switch. + * ``$XDG_RUNTIME_DIR/libvirt/virtqemud-sock`` * ``$XDG_RUNTIME_DIR/libvirt/virtqemud-admin-sock`` -- 2.26.2

2 2

[PATCH] virFirewallApply: Fix possible NULL dereference on error
by Peter Krempa 05 Mar '21

05 Mar '21

Commit bbc25f0d03d443efd35381463efc81b01cb6ae96 juggled around some error reporting. Unfortunately virFirewallApply tries to report the errno stored in the firewall object and we'd try to do that when the firewall object is NULL too. Report EINVAL if 'firewall' is NULL. Found by Coverity. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virfirewall.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index c1b7d2268b..0dc0cecd53 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -766,8 +766,12 @@ virFirewallApply(virFirewallPtr firewall) goto cleanup; } if (!firewall || firewall->err) { - virReportSystemError(firewall->err, "%s", - _("Unable to create rule")); + int err = EINVAL; + + if (firewall) + err = firewall->err; + + virReportSystemError(err, "%s", _("Unable to create rule")); goto cleanup; } -- 2.29.2

2 1

[libvirt PATCH v2 0/1] qemuProcessUpdateGuestCPU: Check host cpu for forbidden features
by Tim Wiederhake 05 Mar '21

05 Mar '21

V1: https://listman.redhat.com/archives/libvir-list/2021-February/msg01275.ht= ml Changes since V1: * Only check for forbidden features * Check if `check` !=3D none * Renamed patch Tim Wiederhake (1): qemuProcessUpdateGuestCPU: Check host cpu for forbidden features src/qemu/qemu_process.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) --=20 2.26.2

3 3

[PATCH v6 0/5] migration/dirtyrate: Introduce APIs for getting domain memory dirty rate
by Hao Wang 05 Mar '21

05 Mar '21

V5 -> V6: split DomainGetDirtyRateInfo(domdirtyrate) API into two parts: 1. DomainStartDirtyRateCalc(domdirtyrate-calc) for starting dirty rate calculation; 2. qemuDomainGetStatsDirtyRate(domstats --dirtyrate) for querying dirty rate infomation. V4 -> V5: squash 1/7 and bits of 5/7 and 6/7 into 2/7 in v4 (to be 1/5 in v5) squash left of 5/7 into 4/7 in v4 (to be 3/5 in v5) add VIR_DOMAIN_DIRTYRATE_DEFAULT flag remove redundant error report rename virsh api to "domdirtyrate" use vshTablePtr for virsh api output add description in docs/manpages/virsh.rst other format optimize V3 -> V4: define flags to unsigned int fix some compile warnings V2 -> V3: reorganize patchset to fix compile warning V1 -> V2: replace QEMU_JOB_ASYNC with QEMU_JOB_QUERY Sometimes domain's memory dirty rate is expected by user in order to decide whether it's proper to be migrated out or not. We have already completed the QEMU part of the capability: https://patchew.org/QEMU/1600237327-33618-1-git-send-email-zhengchuan@huawe… And this serial of patches introduce the corresponding LIBVIRT part: 1. Calculating Introduce a new API DomainStartDirtyRateCalc and corresponding virsh api (domdirtyrate-calc) for starting dirty rate calculation by calling qmp 'calc-dirty-rate'. # virsh domdirtyrate-calc <domain> [--seconds <sec>] 2. Querying Introduce command 'virsh domstats --dirtyrate' for reporting memory dirty rate infomation by calling qmp 'query-dirty-rate'. The info is listed as: Domain: 'vm0' dirtyrate.calc_status=measured dirtyrate.calc_start_time=502814 dirtyrate.calc_period=1 dirtyrate.megabytes_per_second=2 Hao Wang (5): migration/dirtyrate: Introduce virDomainStartDirtyRateCalc API migration/dirtyrate: Implement qemuDomainStartDirtyRateCalc migration/dirtyrate: Introduce domdirtyrate-calc virsh api migration/dirtyrate: Implement qemuMonitorQueryDirtyRate migration/dirtyrate: Introduce command 'virsh domstats --dirtyrate' docs/manpages/virsh.rst | 33 ++++++++- include/libvirt/libvirt-domain.h | 5 ++ src/driver-hypervisor.h | 6 ++ src/libvirt-domain.c | 57 +++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 115 +++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 24 +++++++ src/qemu/qemu_monitor.h | 18 +++++ src/qemu/qemu_monitor_json.c | 88 +++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 8 +++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 +++- src/remote_protocol-structs | 6 ++ tools/virsh-domain-monitor.c | 7 ++ tools/virsh-domain.c | 63 +++++++++++++++++ 15 files changed, 447 insertions(+), 3 deletions(-) -- 2.23.0

2 10

[PATCH 0/4] Replace virFileMakePath*() with g_mkdir_with_parents()
by Michal Privoznik 04 Mar '21

04 Mar '21

2 7

[PATCH 00/33] Remove the now misleading virReportOOMError infra
by Peter Krempa 04 Mar '21

04 Mar '21

'virReportOOMError' is nowadays mostly useless since an OOM error will trigger yet another allocation failure in the logger when attempting to log the error. Additionally it was also used in few places which can fail with other failures than OOM. To prevent both errorneous usage types, let's remove it completely. In the rare case we'd want to allocate a massive buffer and want to fail gracefully we still can use virReportError with VIR_ERR_NO_MEMORY. The series starts by some cleanup, then removes error handling from places where it's now dead code as we'll abort before the reporting, then converts some real OOM scenarios to abort() directly and lastly fixes the error message for cases where other errors are possible and lastly removes virReportOOMError. Pipelines are stuck, so hopefully it will go through: https://gitlab.com/pipo.sk/libvirt/-/pipelines/261161989 Peter Krempa (33): Remove useless comments for VIR_FROM_THIS definition util: xml: Introduce autoptr cleanup support for 'xmlNode' virDomainDefSetMetadata: Avoid temporary variable for string copy virCommandAddEnv: Make stealing of argument more obvious virCommandAddArgBuffer: Simplify clearing of @buf virCPUx86DataParse: Don't check error from x86FeatureNames virhostcputest: linuxCPUStatsCompareFiles: Don't check return value of virBufferContentAndReset virBuildPath: Remove return value lxc_process: Remove OOM handling from logging setup virDomainDefSetMetadata: Rework memory handling util: vircommand: Remove OOM handling virCloseCallbacksGetForConn: Remove OOM handling virfirewall: Don't check OOM in ADD_ARG macro virfirewall: Remove OOM checks from virFirewallStartTransaction virfirewall: virFirewallAddRuleFullV: Remove OOM check from VIR_APPEND_ELEMENT virfirewall: Remove impossible OOM error reporting util: virnetlink: Add wrapper for 'nlmsg_alloc_simple' util: xml: Add virXMLBufferCreate wrapper util: xml: Add wrapper for 'xmlNewNode' Don't report OOM error on xmlCopyNode failure virXMLXPathContextNew: abort() on allocation failure virXMLParseHelper: abort() on allocation failure util: virprocess: abort() on CPU_ALLOC failure virURIFormat: abort() on failure util: iohelper: Don't handle OOM from posix_memalign hyperv: abort() failure of wsmc_fault_new() vbox: abort() on allocation failure in UTF8<->UTF16 conversion libxl: abort() on failure of libxl_cpu_bitmap_alloc() virVBoxSnapshotConfSaveVboxFile: abort() on failure to allocate xmlDoc and comment util: json: Report non-OOM error on yajl failure storage: Don't report OOM error on failure of glfs_new virVMXConvertToUTF8: Report non-OOM error on failure of xmlBufferCreateStatic util: virerror: Remove virReportOOMError build-aux/syntax-check.mk | 8 -- docs/internals/command.html.in | 8 +- src/conf/domain_conf.c | 62 ++++----- src/conf/network_conf.c | 5 +- src/cpu/cpu_x86.c | 6 +- src/hyperv/hyperv_wmi.c | 8 +- src/hypervisor/virclosecallbacks.c | 15 +-- src/libvirt_private.syms | 3 +- src/libxl/libxl_conf.c | 6 +- src/libxl/libxl_driver.c | 7 +- src/lxc/lxc_process.c | 9 +- src/storage/storage_backend_gluster.c | 3 +- .../storage_file_backend_gluster.c | 3 +- src/test/test_driver.c | 6 +- src/util/iohelper.c | 7 +- src/util/vircommand.c | 119 +++++------------- src/util/virerror.c | 22 ---- src/util/virerror.h | 8 -- src/util/virfcp.c | 3 +- src/util/virfile.c | 7 +- src/util/virfile.h | 2 +- src/util/virfirewall.c | 62 ++------- src/util/virhook.c | 14 +-- src/util/virjson.c | 6 +- src/util/virnetdev.c | 18 +-- src/util/virnetdevbridge.c | 10 +- src/util/virnetdevip.c | 15 +-- src/util/virnetdevvportprofile.c | 6 +- src/util/virnetlink.c | 38 +++--- src/util/virnetlink.h | 4 + src/util/virpci.c | 12 +- src/util/virprocess.c | 12 +- src/util/virscsi.c | 1 - src/util/virscsivhost.c | 1 - src/util/viruri.c | 8 +- src/util/virxml.c | 44 ++++--- src/util/virxml.h | 8 ++ src/vbox/vbox_common.c | 20 --- src/vbox/vbox_common.h | 15 ++- src/vbox/vbox_snapshot_conf.c | 46 ++----- src/vmx/vmx.c | 9 +- tests/virhostcputest.c | 5 +- tools/virsh-domain.c | 5 +- 43 files changed, 214 insertions(+), 462 deletions(-) -- 2.29.2

3 39

[PATCH] tests: Don't return -1 as program return value
by Peter Krempa 04 Mar '21

04 Mar '21

In cases we use -1 for failure internally we still must return EXIT_FAILURE. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemucommandutiltest.c | 3 +-- tests/virnetdevbandwidthtest.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c index 6291c3b787..03947d87bc 100644 --- a/tests/qemucommandutiltest.c +++ b/tests/qemucommandutiltest.c @@ -146,8 +146,7 @@ mymain(void) "server.2.type=tcp," "server.2.host=example.com"); - return ret; - + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } VIR_TEST_MAIN(mymain) diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 2e76af3d0c..6d0443876c 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -156,7 +156,7 @@ mymain(void) TC " filter add dev eth0 parent ffff: protocol all u32 match u32 0 0 " "police rate 5kbps burst 7kb mtu 64kb drop flowid :1\n")); - return ret; + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virnetdevbandwidth")) -- 2.29.2

2 1

[PATCH] conf: Rewrite network virtio driver formatting using virXMLFormatElement
by Peter Krempa 04 Mar '21

04 Mar '21

Simplify the logic picking which element form to format by using virBuffers for the partial properties and virXMLFormatElement for combining them. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/conf/domain_conf.c | 93 ++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 58 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 05b6cb3000..0220db794e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -25428,108 +25428,97 @@ virDomainActualNetDefFormat(virBufferPtr buf, static void -virDomainVirtioNetGuestOptsFormat(char **outstr, +virDomainVirtioNetGuestOptsFormat(virBufferPtr buf, virDomainNetDefPtr def) { - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (def->driver.virtio.guest.csum) { - virBufferAsprintf(&buf, "csum='%s' ", + virBufferAsprintf(buf, " csum='%s'", virTristateSwitchTypeToString(def->driver.virtio.guest.csum)); } if (def->driver.virtio.guest.tso4) { - virBufferAsprintf(&buf, "tso4='%s' ", + virBufferAsprintf(buf, " tso4='%s'", virTristateSwitchTypeToString(def->driver.virtio.guest.tso4)); } if (def->driver.virtio.guest.tso6) { - virBufferAsprintf(&buf, "tso6='%s' ", + virBufferAsprintf(buf, " tso6='%s'", virTristateSwitchTypeToString(def->driver.virtio.guest.tso6)); } if (def->driver.virtio.guest.ecn) { - virBufferAsprintf(&buf, "ecn='%s' ", + virBufferAsprintf(buf, " ecn='%s'", virTristateSwitchTypeToString(def->driver.virtio.guest.ecn)); } if (def->driver.virtio.guest.ufo) { - virBufferAsprintf(&buf, "ufo='%s' ", + virBufferAsprintf(buf, " ufo='%s'", virTristateSwitchTypeToString(def->driver.virtio.guest.ufo)); } - virBufferTrim(&buf, " "); - - *outstr = virBufferContentAndReset(&buf); } static void -virDomainVirtioNetHostOptsFormat(char **outstr, +virDomainVirtioNetHostOptsFormat(virBufferPtr buf, virDomainNetDefPtr def) { - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (def->driver.virtio.host.csum) { - virBufferAsprintf(&buf, "csum='%s' ", + virBufferAsprintf(buf, " csum='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.csum)); } if (def->driver.virtio.host.gso) { - virBufferAsprintf(&buf, "gso='%s' ", + virBufferAsprintf(buf, " gso='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.gso)); } if (def->driver.virtio.host.tso4) { - virBufferAsprintf(&buf, "tso4='%s' ", + virBufferAsprintf(buf, " tso4='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.tso4)); } if (def->driver.virtio.host.tso6) { - virBufferAsprintf(&buf, "tso6='%s' ", + virBufferAsprintf(buf, " tso6='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.tso6)); } if (def->driver.virtio.host.ecn) { - virBufferAsprintf(&buf, "ecn='%s' ", + virBufferAsprintf(buf, " ecn='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.ecn)); } if (def->driver.virtio.host.ufo) { - virBufferAsprintf(&buf, "ufo='%s' ", + virBufferAsprintf(buf, " ufo='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.ufo)); } if (def->driver.virtio.host.mrg_rxbuf) { - virBufferAsprintf(&buf, "mrg_rxbuf='%s' ", + virBufferAsprintf(buf, " mrg_rxbuf='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.mrg_rxbuf)); } - virBufferTrim(&buf, " "); - - *outstr = virBufferContentAndReset(&buf); } static void -virDomainVirtioNetDriverFormat(char **outstr, +virDomainVirtioNetDriverFormat(virBufferPtr buf, virDomainNetDefPtr def) { - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (def->driver.virtio.name) { - virBufferAsprintf(&buf, " name='%s'", + virBufferAsprintf(buf, " name='%s'", virDomainNetBackendTypeToString(def->driver.virtio.name)); } if (def->driver.virtio.txmode) { - virBufferAsprintf(&buf, " txmode='%s'", + virBufferAsprintf(buf, " txmode='%s'", virDomainNetVirtioTxModeTypeToString(def->driver.virtio.txmode)); } if (def->driver.virtio.ioeventfd) { - virBufferAsprintf(&buf, " ioeventfd='%s'", + virBufferAsprintf(buf, " ioeventfd='%s'", virTristateSwitchTypeToString(def->driver.virtio.ioeventfd)); } if (def->driver.virtio.event_idx) { - virBufferAsprintf(&buf, " event_idx='%s'", + virBufferAsprintf(buf, " event_idx='%s'", virTristateSwitchTypeToString(def->driver.virtio.event_idx)); } if (def->driver.virtio.queues) - virBufferAsprintf(&buf, " queues='%u'", def->driver.virtio.queues); + virBufferAsprintf(buf, " queues='%u'", def->driver.virtio.queues); if (def->driver.virtio.rx_queue_size) - virBufferAsprintf(&buf, " rx_queue_size='%u'", + virBufferAsprintf(buf, " rx_queue_size='%u'", def->driver.virtio.rx_queue_size); if (def->driver.virtio.tx_queue_size) - virBufferAsprintf(&buf, " tx_queue_size='%u'", + virBufferAsprintf(buf, " tx_queue_size='%u'", def->driver.virtio.tx_queue_size); - virDomainVirtioOptionsFormat(&buf, def->virtio); - - *outstr = virBufferContentAndReset(&buf); + virDomainVirtioOptionsFormat(buf, def->virtio); } @@ -25834,30 +25823,18 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferEscapeString(buf, "<model type='%s'/>\n", virDomainNetGetModelString(def)); if (virDomainNetIsVirtioModel(def)) { - g_autofree char *str = NULL; - g_autofree char *gueststr = NULL; - g_autofree char *hoststr = NULL; - - virDomainVirtioNetDriverFormat(&str, def); - virDomainVirtioNetGuestOptsFormat(&gueststr, def); - virDomainVirtioNetHostOptsFormat(&hoststr, def); - - if (!gueststr && !hoststr) { - if (str) - virBufferAsprintf(buf, "<driver%s/>\n", str); - } else { - if (str) - virBufferAsprintf(buf, "<driver%s>\n", str); - else - virBufferAddLit(buf, "<driver>\n"); - virBufferAdjustIndent(buf, 2); - if (hoststr) - virBufferAsprintf(buf, "<host %s/>\n", hoststr); - if (gueststr) - virBufferAsprintf(buf, "<guest %s/>\n", gueststr); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "</driver>\n"); - } + g_auto(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverChildBuf = VIR_BUFFER_INIT_CHILD(buf); + g_auto(virBuffer) hostAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) guestAttrBuf = VIR_BUFFER_INITIALIZER; + + virDomainVirtioNetDriverFormat(&driverAttrBuf, def); + virDomainVirtioNetGuestOptsFormat(&guestAttrBuf, def); + virDomainVirtioNetHostOptsFormat(&hostAttrBuf, def); + + virXMLFormatElement(&driverChildBuf, "host", &hostAttrBuf, NULL); + virXMLFormatElement(&driverChildBuf, "guest", &guestAttrBuf, NULL); + virXMLFormatElement(buf, "driver", &driverAttrBuf, &driverChildBuf); } } if (def->backend.tap || def->backend.vhost) { -- 2.29.2

2 1

[PATCH] virBufferAdd: Ensure that the buffer is initialized also when len == 0
by Peter Krempa 04 Mar '21

04 Mar '21

There's an optimization in virBufferAdd which returns early when the length of the added string is 0 (given that auto-indent is disabled). The optimization causes inconsistent behaviour between these two cases: virBufferAdd(buf, "", 0); // this doesn't initialize the buffer and virBufferAdd(buf, "", -1); //this initializes the buffer Since using an empty string is used to prime the buffer to an empty string it can be confusing. Remove the optimization. This fixes such a wrong initialization done in x86FeatureNames. Note that our code in many places expects that if no virBuffer APIs are used on a buffer object, then NULL should be retured, so we can't always prime the buffer to an empty string. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index ebb4108b5d..b9ddf1f5c9 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -156,7 +156,7 @@ virBufferApplyIndent(virBufferPtr buf) void virBufferAdd(virBufferPtr buf, const char *str, int len) { - if (!str || !buf || (len == 0 && buf->indent == 0)) + if (!str || !buf) return; virBufferInitialize(buf); -- 2.29.2

2 1

[PATCH 0/6] util: virerror: Avoid stack'd buffers for error message formatting
by Peter Krempa 04 Mar '21

04 Mar '21

We don't need OOM resiliency nowadays. Peter Krempa (6): util: virerror: Don't use stack'd buffers in error report helpers util: virerror: Avoid a copy of the error messages util: virprocess: Use local maximum error message size qemuProcessReportLogError: Remove unnecessary math for max error message qemuProcessReportLogError: Don't mark "%s: %s" as translatable util: virerror: Remove VIR_ERROR_MAX_LENGTH macro src/qemu/qemu_process.c | 12 +-- src/util/virerror.c | 188 ++++++++++++++++++++++------------------ src/util/virerror.h | 2 - src/util/virprocess.c | 10 ++- 4 files changed, 116 insertions(+), 96 deletions(-) -- 2.29.2

2 8

[PATCH v2 0/6] use g_autofree and g_autoptr
by Kristina Hanicova 04 Mar '21

04 Mar '21

This is v2 from https://listman.redhat.com/archives/libvir-list/2021-February/msg01117.html I split commit 3/4 into more commits and left out autofreeing outer array as suggested by Jan Tomko. Patches 2/6 and 6/6 (previously 2/4 and 4/4) have already been reviewed-by and I am sending them for completness. This uses g_autofree (if possible) in files: vsh-table, netdev_bandwidth_conf and g_autoptr instead of virNetDevBandwidthFree where possible. Kristina Hanicova (6): vsh-table: Use g_autofree where possible netdev_bandwidth_conf: Use g_autofree where possible netdev_bandwidth_conf: Refractor virNetDevBandwidthParse() Use g_steal_pointer where possible Use g_autoptr instead of virNetDevBandwidthFree where possible netdev_bandwidth_conf: Remove redundant variables/labels src/conf/netdev_bandwidth_conf.c | 67 ++++++++++++-------------------- src/network/bridge_driver.c | 6 +-- src/qemu/qemu_driver.c | 11 ++---- src/test/test_driver.c | 3 +- src/util/virnetdevbandwidth.h | 2 + tests/virnetdevbandwidthtest.c | 3 +- tools/vsh-table.c | 13 ++----- 7 files changed, 39 insertions(+), 66 deletions(-) -- 2.29.2

2 8

[libvirt PATCH] docs: Spell out our policy concerning minor releases
by Andrea Bolognani 04 Mar '21

04 Mar '21

We've already applied this policy on multiple occasions, but it's good to have it written down so that there can be no confusion. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/platforms.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/platforms.rst b/docs/platforms.rst index b0ce0c3737..6d55728625 100644 --- a/docs/platforms.rst +++ b/docs/platforms.rst @@ -44,6 +44,7 @@ for the previous major version will be dropped 2 years after the new major version is released or when the vendor itself drops support, whichever comes first. In this context, third-party efforts to extend the lifetime of a distro are not considered, even when they are endorsed by the vendor (eg. Debian LTS). +Within each major release, only the most recent minor release is considered. For the purposes of identifying supported software versions available on Linux, the project will look at CentOS, Debian, Fedora, openSUSE, RHEL, SLES and -- 2.26.2

2 1

[libvirt PATCH 0/2] glib: Avoid yet another crash due to race in event loop code
by Martin Kletzander 04 Mar '21

04 Mar '21

Similarly to commit 0db4743645b7 we need to fix the other event loop as well. To be completely honest I do not completely understand all the details in the original workaround, so I just hope this is the best way to fix the issue. Hopefully-resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1931331 Martin Kletzander (2): util: Move glib event loop workaround to glibcompat glib: Use safe glib event workaround in other event loops src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/util/glibcompat.c | 35 +++++++++++++++++++++++++++++++++++ src/util/glibcompat.h | 11 +++++++++++ src/util/vireventglib.c | 30 ------------------------------ src/util/vireventthread.c | 2 +- 6 files changed, 49 insertions(+), 33 deletions(-) -- 2.30.1

2 5

[PATCH 0/4] Refactoring node_device_conf
by Kristina Hanicova 04 Mar '21

04 Mar '21

This refactors file node_device_conf in order to remove VIR_FREE (if possible) and removes redundant variables and labels. Kristina Hanicova (4): node_device_conf: Use g_autofree where possible node_device_conf: Refactoring functions in order to remove VIR_FREE node_device_conf: use g_autoptr in virNodeDevCapPCIDevIommuGroupParseXML() node_device_conf: Remove redundant variables/labels src/conf/node_device_conf.c | 324 +++++++++++++----------------------- 1 file changed, 118 insertions(+), 206 deletions(-) -- 2.29.2

2 6

[libvirt PATCH 0/5] Some fixes in domain_conf.c: virDomainFeaturesDefParse
by Tim Wiederhake 04 Mar '21

04 Mar '21

Patches 1-4 are minor cleanups, patch 5 is the actual one that I want out of the way before continuing down my rabbit hole of the week. Tim Wiederhake (5): domain_conf: Reduce scope of tmp in virDomainFeaturesDefParse domain_conf: Reduce scope of gic_version in virDomainFeaturesDefParse domain_conf: Reduce scope of node in virDomainFeaturesDefParse domain_conf: Add missing break in switch domain_conf: Fix check for hyperv stimer src/conf/domain_conf.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) -- 2.26.2

2 7

[libvirt PATCH] cpu_map: Fix spelling of svme-addr-chk feature
by Jiri Denemark 04 Mar '21

04 Mar '21

Commit a208176ca1d9eedf8aa6bf12fde6a7a9579ab549 introduced this feature with an incorrect "svme-addr-check" spelling. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu_map/sync_qemu_i386.py | 2 +- src/cpu_map/x86_EPYC-Milan.xml | 2 +- src/cpu_map/x86_features.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpu_map/sync_qemu_i386.py b/src/cpu_map/sync_qemu_i386.py index 3febecdfd1..1a98fa70d7 100755 --- a/src/cpu_map/sync_qemu_i386.py +++ b/src/cpu_map/sync_qemu_i386.py @@ -142,7 +142,7 @@ def translate_feature(name): "CPUID_SS": "ss", "CPUID_SVM_NPT": "npt", "CPUID_SVM_NRIPSAVE": "nrip-save", - "CPUID_SVM_SVME_ADDR_CHK": "svme-addr-check", + "CPUID_SVM_SVME_ADDR_CHK": "svme-addr-chk", "CPUID_TSC": "tsc", "CPUID_VME": "vme", "CPUID_XSAVE_XGETBV1": "xgetbv1", diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml index 53f0cd6aac..3055e175fa 100644 --- a/src/cpu_map/x86_EPYC-Milan.xml +++ b/src/cpu_map/x86_EPYC-Milan.xml @@ -76,7 +76,7 @@ <feature name='sse4a'/> <feature name='ssse3'/> <feature name='svm'/> - <feature name='svme-addr-check'/> + <feature name='svme-addr-chk'/> <feature name='syscall'/> <feature name='tsc'/> <feature name='umip'/> diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index c43520d08f..e98b84f3ef 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -554,7 +554,7 @@ <feature name='pfthreshold'> <cpuid eax_in='0x8000000a' edx='0x00001000'/> </feature> - <feature name='svme-addr-check'> + <feature name='svme-addr-chk'> <cpuid eax_in='0x8000000a' edx='0x10000000'/> </feature> -- 2.30.0

2 1

[PATCH 0/4] use g_autofree and g_autoptr
by Kristina Hanicova 04 Mar '21

04 Mar '21

This uses g_autofree (if possible) in files: vsh-table, netdev_bandwidth_conf and g_autoptr instead of virNetDevBandwidthFree where possible. Kristina Hanicova (4): vsh-table: Use g_autofree where possible netdev_bandwidth_conf: Use g_autofree where possible Use g_autoptr instead of virNetDevBandwidthFree where possible netdev_bandwidth_conf: Remove redundant variables/labels src/conf/netdev_bandwidth_conf.c | 67 ++++++++++++-------------------- src/network/bridge_driver.c | 6 +-- src/qemu/qemu_driver.c | 11 ++---- src/test/test_driver.c | 3 +- src/util/virnetdevbandwidth.h | 2 + tests/virnetdevbandwidthtest.c | 3 +- tools/vsh-table.c | 16 +++----- 7 files changed, 40 insertions(+), 68 deletions(-) -- 2.29.2

4 11

[PATCH 0/5] Clean up various places using strcpy()
by Peter Krempa 03 Mar '21

03 Mar '21

This series + https://listman.redhat.com/archives/libvir-list/2021-March/msg00081.html removes use of strcpy(). Peter Krempa (5): virIndexToDiskName: Make 'idx' unsigned and remove check virIndexToDiskName: Use g_string_prepend(_c) to improve readability remote_daemon_dispatch: Replace g_new + strcpy with g_strdup virHostCPUGetStatsLinux: Avoid 'strcpy' commandhelper: printCwd: Print result directly instead of copying it src/remote/remote_daemon_dispatch.c | 9 +++------ src/util/virhostcpu.c | 6 +++--- src/util/virutil.c | 29 +++++++---------------------- src/util/virutil.h | 2 +- src/vmx/vmx.c | 12 ------------ src/vz/vz_sdk.c | 3 --- tests/commandhelper.c | 7 ++++--- 7 files changed, 18 insertions(+), 50 deletions(-) -- 2.29.2

3 7

[libvirt PATCH 0/3] cgroup cpu.shares cleanup
by Pavel Hrdina 03 Mar '21

03 Mar '21

After the conversion to using systemd DBus APIs the behavior of changed for values outside of valid range. This series fixes the issue by enforcing the range on libvirt side instead of the previous magic conversion done by kernel. Pavel Hrdina (3): vircgroup: enforce range limit for cpu.shares cgroup: use virCgroupSetCpuShares instead of virCgroupSetupCpuShares vircgroup: drop unused function virCgroupSetupCpuShares docs/formatdomain.rst | 3 ++- docs/manpages/virsh.rst | 5 +---- src/conf/domain_validate.c | 10 ++++++++++ src/libvirt_private.syms | 1 - src/lxc/lxc_cgroup.c | 4 +--- src/lxc/lxc_driver.c | 6 ++---- src/qemu/qemu_cgroup.c | 21 +-------------------- src/qemu/qemu_driver.c | 7 +++---- src/util/vircgroup.c | 20 -------------------- src/util/vircgroup.h | 4 ++-- src/util/vircgroupv1.c | 10 ++++++++++ src/util/vircgroupv2.c | 10 ++++++++++ 12 files changed, 42 insertions(+), 59 deletions(-) -- 2.29.2

2 4

[PATCH] gitpublish: Drop custom prefix
by Andrea Bolognani 03 Mar '21

03 Mar '21

Now that all projects except the main library are using GitLab merge requests, all the patches that end up on libvir-list are by definition intended for libvirt itself rather than one of the subprojects, and so it's no longer necessary to include additional information in the mail subject. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitpublish | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitpublish b/.gitpublish index d37bf4174a..857f0d552c 100644 --- a/.gitpublish +++ b/.gitpublish @@ -1,4 +1,3 @@ [gitpublishprofile "default"] base = master to = libvir-list(a)redhat.com -prefix = libvirt PATCH -- 2.26.2

2 3

[PATCH] build: Require glib >= 2.56
by Jim Fehlig 03 Mar '21

03 Mar '21

There are a few uses of g_autoslist in the qemu driver and likely more will come throughout the codebase in the future. g_autoslist first appeared in glib 2.56, so bump the minimum version. https://developer.gnome.org/glib/stable/glib-Miscellaneous-Macros.html#g-au… Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- libvirt.spec.in | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 29b476184d..8d8b900fbb 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -278,7 +278,7 @@ BuildRequires: systemd-units %if %{with_libxl} BuildRequires: xen-devel %endif -BuildRequires: glib2-devel >= 2.48 +BuildRequires: glib2-devel >= 2.56 BuildRequires: libxml2-devel BuildRequires: libxslt BuildRequires: readline-devel diff --git a/meson.build b/meson.build index daa1475c99..c225df42d4 100644 --- a/meson.build +++ b/meson.build @@ -1038,7 +1038,7 @@ if fuse_dep.found() conf.set('WITH_FUSE', 1) endif -glib_version = '2.48.0' +glib_version = '2.56.0' glib_dep = dependency('glib-2.0', version: '>=' + glib_version) gobject_dep = dependency('gobject-2.0', version: '>=' + glib_version) if host_machine.system() == 'windows' -- 2.29.2

5 7

Some confusion about lsilogic controller
by xingchaochao 03 Mar '21

03 Mar '21

Hello, I have been confused by such a phenomenon recently. Libvirt is the master branch , and the VM is centos8.2(kernel is 4.18.0-193.el8.aarch64). When I hot-plug the scsi disk for a virtual machine without a virtio-scsi controller, libvirt will automatically generate an lsilogic controller for the scsi disk. <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none' io='native'/> <source file='/Images/xcc/tmp.img'/> <backingStore/> <target dev='sdt' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> linux-upcHIq:/Images/xcc # virsh list Id Name State ---------------------- 12 g1 running linux-upcHIq:/Images/xcc # virsh attach-device g1 disk.xml Device attached successfully linux-upcHIq:/Images/xcc # virsh dumpxml g1 | grep scsi <target dev='sdt' bus='scsi'/> <alias name='scsi0-0-0'/> <controller type='scsi' index='0' model='lsilogic'> <alias name='scsi0'/> But this scsi disk cannot be found through the lsblk command inside the virtual machine. [root@localhost ~]# lsblk NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT vda 252:0 0 20G 0 disk ├─vda1 252:1 0 600M 0 part /boot/efi ├─vda2 252:2 0 1G 0 part /boot └─vda3 252:3 0 18.4G 0 part ├─cl-root 253:0 0 16.4G 0 lvm / └─cl-swap 253:1 0 2G 0 lvm [SWAP] After hot unplugging the scsi disk, I performed the hot unplug operation of the lsilogic controller. libvirt shows "Device detached successfully", but in fact, the lsilogic controller is not removed from the live XML and persistent XML. Through "virsh dumpxml vmname" and "virsh edit vmname", I can see <controller type='scsi' index='0' model='lsilogic'> is always there. linux-upcHIq:/Images/xcc # virsh detach-device g1 disk.xml Device detached successfully linux-upcHIq:/Images/xcc # virsh dumpxml g1 | grep scsi <controller type='scsi' index='0' model='lsilogic'> <alias name='scsi0'/> linux-upcHIq:/Images/xcc # linux-upcHIq:/Images/xcc # cat lsi.xml <controller type='scsi' index='0' model='lsilogic'> <alias name='scsi0'/> <address type='pci' domain='0x0000' bus='0x03' slot='0x05' function='0x0'/> </controller> linux-upcHIq:/Images/xcc # virsh detach-device g1 lsi.xml Device detached successfully linux-upcHIq:/Images/xcc # virsh dumpxml g1 | grep scsi <controller type='scsi' index='0' model='lsilogic'> <alias name='scsi0'/> I am confused, why libvirt chooses to generate an lsilogic controller for the scsi disk when there is no scsi controller, instead of directly reporting an error and exiting the hot plug operation. After all, the scsi disk based on the lsilogic controller is not perceived inside the virtual machine, and lsilogic will remain in the XML file of the virtual machine.

2 2

[PATCH v2 00/31] qapi/qom: QAPIfy --object and object-add
by Kevin Wolf 02 Mar '21

02 Mar '21

This series adds a QAPI type for the properties of all user creatable QOM types and finally makes the --object command line option (in all binaries) and the object-add monitor commands (in QMP and HMP) use the new ObjectOptions union. This change improves things in more than just one way: 1. Documentation for QOM object types has always been lacking. Adding the schema, we get documentation for every property. 2. It prevents bugs by performing parts of the input validation (e.g. checking presence of mandatory properties) already in QAPI instead of relying on separate manual implementations in each class. 3. It provides QAPI introspection for user creatable objects. 4. Non-scalar properties are now supported everywhere because the command line parsers (including HMP) use the keyval parser now. If you are in the CC list and didn't expect this series, it's probably because you're the maintainer of one of the objects for which I'm adding a QAPI schema description. Please just have a look at the specific patch for your object and check whether the schema and its documentation make sense to you. You can ignore all other patches. In a next step after this series, we can add make use of the QAPI structs in the implementation of the object and separate their configuration from the runtime state. Specifically, the plan is to add a .configure() callback to ObjectClass that allows configuring the object in one place at creation time and keeping QOM property setters only for properties that can actually be changed at runtime. Paolo made an example of what the state could look like after this: https://wiki.qemu.org/Features/QOM-QAPI_integration Finally, the intention is to extend the QAPI schema to have separate 'object' entities and generate some of the code that was written manually in the intermediate state before. This series is available as a git tag at: https://repo.or.cz/qemu/kevin.git qapi-object-v2 v2: - Convert not only object-add, but all external interfaces so that the schema will always be enforced and mismatch between implementation and schema can't go unnoticed. - Rebased, covering properties and object types added since v1 (yes, things do become outdated rather quickly when you touch all user creatable objects) - Changed the "Since:" version number in the schema documentation to refer to the version when the object was introduced rather than 6.0 where the schema will (hopefully) be added - Probably some other minor changes Kevin Wolf (31): tests: Drop 'props' from object-add calls qapi/qom: Drop deprecated 'props' from object-add qapi/qom: Add ObjectOptions for iothread qapi/qom: Add ObjectOptions for authz-* qapi/qom: Add ObjectOptions for cryptodev-* qapi/qom: Add ObjectOptions for dbus-vmstate qapi/qom: Add ObjectOptions for memory-backend-* qapi/qom: Add ObjectOptions for rng-*, deprecate 'opened' qapi/qom: Add ObjectOptions for throttle-group qapi/qom: Add ObjectOptions for secret*, deprecate 'loaded' qapi/qom: Add ObjectOptions for tls-*, deprecate 'loaded' qapi/qom: Add ObjectOptions for can-* qapi/qom: Add ObjectOptions for colo-compare qapi/qom: Add ObjectOptions for filter-* qapi/qom: Add ObjectOptions for pr-manager-helper qapi/qom: Add ObjectOptions for confidential-guest-support qapi/qom: Add ObjectOptions for input-* qapi/qom: Add ObjectOptions for x-remote-object qapi/qom: QAPIfy object-add qom: Make "object" QemuOptsList optional qemu-storage-daemon: Implement --object with qmp_object_add() qom: Remove user_creatable_add_dict() qom: Factor out user_creatable_process_cmdline() qemu-io: Use user_creatable_process_cmdline() for --object qemu-img: Use user_creatable_process_cmdline() for --object qemu-nbd: Use user_creatable_process_cmdline() for --object qom: Add user_creatable_add_from_str() hmp: QAPIfy object_add qom: Add user_creatable_parse_str() vl: QAPIfy -object qom: Drop QemuOpts based interfaces qapi/authz.json | 62 +++ qapi/block-core.json | 27 ++ qapi/common.json | 52 +++ qapi/crypto.json | 159 +++++++ qapi/machine.json | 22 +- qapi/net.json | 20 - qapi/qom.json | 639 ++++++++++++++++++++++++++- qapi/ui.json | 13 +- docs/system/deprecated.rst | 25 +- docs/system/removed-features.rst | 5 + include/qom/object_interfaces.h | 106 ++--- hw/block/xen-block.c | 16 +- monitor/hmp-cmds.c | 17 +- monitor/misc.c | 2 - qemu-img.c | 239 ++-------- qemu-io.c | 33 +- qemu-nbd.c | 34 +- qom/object_interfaces.c | 168 +++---- qom/qom-qmp-cmds.c | 28 +- softmmu/vl.c | 109 +++-- storage-daemon/qemu-storage-daemon.c | 25 +- tests/check-qom-proplist.c | 42 +- tests/qtest/qmp-cmd-test.c | 16 +- tests/qtest/test-netfilter.c | 54 +-- hmp-commands.hx | 2 +- storage-daemon/qapi/qapi-schema.json | 1 + tests/qemu-iotests/087 | 8 +- tests/qemu-iotests/184 | 18 +- tests/qemu-iotests/218 | 2 +- tests/qemu-iotests/235 | 2 +- tests/qemu-iotests/245 | 4 +- tests/qemu-iotests/258 | 6 +- tests/qemu-iotests/258.out | 4 +- tests/qemu-iotests/295 | 2 +- tests/qemu-iotests/296 | 2 +- 35 files changed, 1270 insertions(+), 694 deletions(-) -- 2.29.2

5 81

[PATCH] build-aux: require GNU grep on FreeBSD
by Roman Bogorodskiy 02 Mar '21

02 Mar '21

FreeBSD 13.x and newer ship BSD grep which apparently has some performance issues causing certain syntax check tests to run longer than the default 30 seconds timeout used by meson. However, GNU grep is still available through the textproc/gnugrep port, so require it on FreeBSD if /usr/bin/grep is a BSD grep to make checks pass in a reasonable time. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- build-aux/Makefile.in | 1 + build-aux/meson.build | 24 +++++++++++++++++++----- build-aux/syntax-check.mk | 1 - 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/build-aux/Makefile.in b/build-aux/Makefile.in index 0424ff39fc..415a8df305 100644 --- a/build-aux/Makefile.in +++ b/build-aux/Makefile.in @@ -5,6 +5,7 @@ top_builddir = @top_builddir@ FLAKE8 = @flake8_path@ RUNUTF8 = @runutf8@ PYTHON = @PYTHON3@ +GREP = @GREP@ # include syntax-check.mk file include $(top_srcdir)/build-aux/syntax-check.mk diff --git a/build-aux/meson.build b/build-aux/meson.build index c506feefd2..c44ed6821c 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -10,18 +10,32 @@ syntax_check_conf.set('flake8_path', flake8_path) syntax_check_conf.set('runutf8', ' '.join(runutf8)) syntax_check_conf.set('PYTHON3', python3_prog.path()) -configure_file( - input: 'Makefile.in', - output: '@BASENAME@', - configuration: syntax_check_conf, -) + +grep_prog = find_program('grep') if host_machine.system() == 'freebsd' make_prog = find_program('gmake') + + grep_cmd = run_command(grep_prog, '--version') + if grep_cmd.stdout().startswith('grep (BSD grep') + grep_prog = find_program('/usr/local/bin/grep') + grep_cmd = run_command(grep_prog, '--version') + if grep_cmd.stdout().startswith('grep (BSD grep') + error('GNU grep not found') + endif + endif else make_prog = find_program('make') endif +syntax_check_conf.set('GREP', grep_prog.path()) + +configure_file( + input: 'Makefile.in', + output: '@BASENAME@', + configuration: syntax_check_conf, +) + rc = run_command( 'sed', '-n', 's/^\$sc_[a-zA-Z0-9_-]*\$:.*/\\1/p', diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index e51877648a..6f6603fa6f 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -27,7 +27,6 @@ ME := build-aux/syntax-check.mk # of the module description. But some packages import this file directly, # ignoring the module description. AWK ?= awk -GREP ?= grep # FreeBSD (and probably some other OSes too) ships own version of sed(1), not # compatible with the GNU sed. GNU sed is available as gsed(1), so use this # instead -- 2.30.0

2 1

[PATCH 0/6] virCommand cleanups
by Peter Krempa 02 Mar '21

02 Mar '21

Some cleanups I've accumulated. Peter Krempa (6): virPipeImpl: Don't overwrite error virCommandAddEnvBuffer: Remove unused function util: vircommand: Add wrappers for virCommand error checking virCommandFDSet: Remove return value virCommandSetSendBuffer: Provide saner semantics commandtest: test27: Remove pointless 'cleanup' label src/libvirt_private.syms | 1 - src/qemu/qemu_tpm.c | 50 ++------- src/util/vircommand.c | 230 ++++++++++++++++++--------------------- src/util/vircommand.h | 9 +- src/util/virutil.c | 2 - tests/commandtest.c | 49 ++------- 6 files changed, 131 insertions(+), 210 deletions(-) -- 2.29.2

2 12

[PATCH] feat(usb-hostdev): add ability to filter by USB serial strings too
by Giel van Schijndel 02 Mar '21

02 Mar '21

This patch adds the ability to select a specific USB device when multiple are available with the same vendor and product IDs. As an example, I'm using this to pass through a specific USB mouse to my guest VM. I happen to have two of the exact same model (Logitech MX518), differing only in their serial number, and only wish to pass through one of them to my VM. An example of the config snippet I'm using with this: <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x046d'/> <product id='0xc08e'/> <serial>0D3087538362</serial> </source> </hostdev> Without this patch I would either get an error message on attempted startup, complaining about having found multiple devices with the same product or vendor id. Or alternatively I'd have to set the bus number and device number. Unfortunately the latter tends to change with every reboot, and in my case whenever my monitor comes out of standby (I'm using its builtin USB hub). --- docs/formatdomain.rst | 6 ++ docs/schemas/domaincommon.rng | 10 +++ src/conf/domain_conf.c | 15 ++++ src/conf/domain_conf.h | 3 +- src/hypervisor/virhostdev.c | 14 ++-- src/util/virusb.c | 66 ++++++++++++----- src/util/virusb.h | 2 + tests/virusbtest.c | 71 +++++++++++-------- .../sys_bus_usb/devices/1-1.5.4/serial | 1 + .../sys_bus_usb/devices/1-1.5.5/serial | 1 + .../sys_bus_usb/devices/1-1.5.6/serial | 1 + 11 files changed, 137 insertions(+), 53 deletions(-) create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/serial diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 2587106191..6d011cc789 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3864,6 +3864,7 @@ for PCI (KVM only) and 1.0.6 for SCSI (KVM only)` : <source startupPolicy='optional'> <vendor id='0x1234'/> <product id='0xbeef'/> + <serial>TANT14-B4732</serial> </source> <boot order='2'/> </hostdev> @@ -4041,6 +4042,11 @@ or: optional drop if missing at any start attempt ========= ===================================================================== + :since:`Since 7.1.0`, the ``source`` element of USB devices may contain + the ``serial`` element which can be used in addition to ``vendor`` and + ``product`` to select a specific USB device if multiple devices with the + same vendor and product id are present. + ``pci`` PCI devices can only be described by their ``address``. :since:`Since 6.8.0 (Xen only)` , the ``source`` element of a PCI device diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e6de934456..d6eb29a9a8 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5355,6 +5355,11 @@ <ref name="usbId"/> </attribute> </element> + <optional> + <element name="serial"> + <ref name="usbSerial"/> + </element> + </optional> </define> <define name="usbaddress"> <element name="address"> @@ -7053,6 +7058,11 @@ <param name="pattern">(0x)?[0-9a-fA-F]{1,4}</param> </data> </define> + <define name="usbSerial"> + <data type="string"> + <param name="pattern">[A-Za-z0-9_\.\+\- ]+</param> + </data> + </define> <define name="usbVersion"> <data type="string"> <param name="pattern">[0-9]{1,2}.[0-9]{1,2}</param> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b731744f04..4967d62989 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3078,6 +3078,8 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def) VIR_FREE(def->source.subsys.u.scsi_host.wwpn); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: + VIR_FREE(def->source.subsys.u.usb.serial); + break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: @@ -6703,6 +6705,16 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, "%s", _("usb product needs id")); return -1; } + } else if (!usbsrc->serial && + virXMLNodeNameEqual(cur, "serial")) { + g_autofree char *serial = virXMLNodeContentString(cur); + if (!serial) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("usb serial needs content")); + return -1; + } + + usbsrc->serial = g_steal_pointer(&serial); } else if (virXMLNodeNameEqual(cur, "address")) { g_autofree char *bus = NULL; g_autofree char *device = NULL; @@ -25089,6 +25101,9 @@ virDomainHostdevDefFormatSubsysUSB(virBufferPtr buf, if (usbsrc->vendor) { virBufferAsprintf(&sourceChildBuf, "<vendor id='0x%.4x'/>\n", usbsrc->vendor); virBufferAsprintf(&sourceChildBuf, "<product id='0x%.4x'/>\n", usbsrc->product); + if (usbsrc->serial) { + virBufferEscapeString(&sourceChildBuf, "<serial>%s</serial>\n", usbsrc->serial); + } } if (usbsrc->bus || usbsrc->device) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 930eed60de..a66b815901 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -227,12 +227,13 @@ VIR_ENUM_DECL(virDomainHostdevSubsysSCSIProtocol); struct _virDomainHostdevSubsysUSB { bool autoAddress; /* bus/device were filled automatically based - on vendor/product */ + on vendor/product (optionally serial) */ unsigned bus; unsigned device; unsigned vendor; unsigned product; + char *serial; }; struct _virDomainHostdevSubsysPCI { diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c index 743aaa84d6..f9fd42b24d 100644 --- a/src/hypervisor/virhostdev.c +++ b/src/hypervisor/virhostdev.c @@ -1324,6 +1324,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, virDomainHostdevSubsysUSBPtr usbsrc = &hostdev->source.subsys.u.usb; unsigned vendor = usbsrc->vendor; unsigned product = usbsrc->product; + const char *serial = usbsrc->serial; unsigned bus = usbsrc->bus; unsigned device = usbsrc->device; bool autoAddress = usbsrc->autoAddress; @@ -1332,7 +1333,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, *usb = NULL; if (vendor && bus) { - rc = virUSBDeviceFind(vendor, product, bus, device, + rc = virUSBDeviceFind(vendor, product, serial, bus, device, NULL, autoAddress ? false : mandatory, usb); @@ -1354,7 +1355,8 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, if (vendor) { g_autoptr(virUSBDeviceList) devs = NULL; - rc = virUSBDeviceFindByVendor(vendor, product, NULL, mandatory, &devs); + rc = virUSBDeviceFindByVendor(vendor, product, serial, NULL, mandatory, + &devs); if (rc < 0) { return -1; } else if (rc == 0) { @@ -1362,9 +1364,11 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, } else if (rc > 1) { if (autoAddress) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Multiple USB devices for %x:%x were found," - " but none of them is at bus:%u device:%u"), - vendor, product, bus, device); + _("Multiple USB devices for %x:%x (serial: %s)" + " were found, but none of them is at bus:%u" + " device:%u"), + vendor, product, serial ? serial : "<none>", bus, + device); } else { virReportError(VIR_ERR_OPERATION_FAILED, _("Multiple USB devices for %x:%x, " diff --git a/src/util/virusb.c b/src/util/virusb.c index 6d897600e5..d945d71b98 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -81,21 +81,31 @@ static int virUSBOnceInit(void) VIR_ONCE_GLOBAL_INIT(virUSB); -static int virUSBSysReadFile(const char *f_name, const char *d_name, - int base, unsigned int *value) +static char* virUSBSysReadFile(const char *f_name, const char *d_name) { - g_autofree char *buf = NULL; g_autofree char *filename = NULL; - char *ignore = NULL; + char* buf; filename = g_strdup_printf(USB_SYSFS "/devices/%s/%s", d_name, f_name); if (virFileReadAll(filename, 1024, &buf) < 0) + return NULL; + + return buf; +} + +static int virUSBSysReadIntFile(const char *f_name, const char *d_name, + int base, unsigned int *value) +{ + g_autofree char *buf = NULL; + char *ignore = NULL; + + if (!(buf = virUSBSysReadFile(f_name, d_name))) return -1; if (virStrToLong_ui(buf, &ignore, base, value) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse usb file %s"), filename); + _("Could not parse usb file %s/%s"), d_name, f_name); return -1; } @@ -105,6 +115,7 @@ static int virUSBSysReadFile(const char *f_name, const char *d_name, static virUSBDeviceListPtr virUSBDeviceSearch(unsigned int vendor, unsigned int product, + const char *serial, unsigned int bus, unsigned int devno, const char *vroot, @@ -132,11 +143,11 @@ virUSBDeviceSearch(unsigned int vendor, if (strchr(de->d_name, ':')) continue; - if (virUSBSysReadFile("idVendor", de->d_name, + if (virUSBSysReadIntFile("idVendor", de->d_name, 16, &found_vend) < 0) goto cleanup; - if (virUSBSysReadFile("idProduct", de->d_name, + if (virUSBSysReadIntFile("idProduct", de->d_name, 16, &found_prod) < 0) goto cleanup; @@ -150,13 +161,31 @@ virUSBDeviceSearch(unsigned int vendor, goto cleanup; } - if (virUSBSysReadFile("devnum", de->d_name, + if (virUSBSysReadIntFile("devnum", de->d_name, 10, &found_devno) < 0) goto cleanup; - if ((flags & USB_DEVICE_FIND_BY_VENDOR) && - (found_prod != product || found_vend != vendor)) - continue; + if (flags & USB_DEVICE_FIND_BY_VENDOR) { + if (found_prod != product || found_vend != vendor) + continue; + + if (serial) { + g_autofree char *found_serial = virUSBSysReadFile("serial", de->d_name); + size_t len; + + if (!found_serial) + continue; + len = strlen(found_serial); + if (!len) + continue; + + if (found_serial[len - 1] == '\n') + found_serial[len - 1] = '\0'; + + if (strcmp(found_serial, serial)) + continue; + } + } if (flags & USB_DEVICE_FIND_BY_BUS) { if (found_bus != bus || found_devno != devno) @@ -188,6 +217,7 @@ virUSBDeviceSearch(unsigned int vendor, int virUSBDeviceFindByVendor(unsigned int vendor, unsigned int product, + const char *serial, const char *vroot, bool mandatory, virUSBDeviceListPtr *devices) @@ -195,7 +225,7 @@ virUSBDeviceFindByVendor(unsigned int vendor, virUSBDeviceListPtr list; int count; - if (!(list = virUSBDeviceSearch(vendor, product, 0, 0, + if (!(list = virUSBDeviceSearch(vendor, product, serial, 0, 0, vroot, USB_DEVICE_FIND_BY_VENDOR))) return -1; @@ -203,15 +233,16 @@ virUSBDeviceFindByVendor(unsigned int vendor, if (list->count == 0) { virObjectUnref(list); if (!mandatory) { - VIR_DEBUG("Did not find USB device %04x:%04x", - vendor, product); + VIR_DEBUG("Did not find USB device %04x:%04x (serial %s)", + vendor, product, serial ? serial : "<none>"); if (devices) *devices = NULL; return 0; } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device %04x:%04x"), vendor, product); + _("Did not find USB device %04x:%04x (serial %s)"), + vendor, product, serial ? serial : "<none>"); return -1; } @@ -233,7 +264,7 @@ virUSBDeviceFindByBus(unsigned int bus, { virUSBDeviceListPtr list; - if (!(list = virUSBDeviceSearch(0, 0, bus, devno, + if (!(list = virUSBDeviceSearch(0, 0, NULL, bus, devno, vroot, USB_DEVICE_FIND_BY_BUS))) return -1; @@ -266,6 +297,7 @@ virUSBDeviceFindByBus(unsigned int bus, int virUSBDeviceFind(unsigned int vendor, unsigned int product, + const char *serial, unsigned int bus, unsigned int devno, const char *vroot, @@ -275,7 +307,7 @@ virUSBDeviceFind(unsigned int vendor, virUSBDeviceListPtr list; unsigned int flags = USB_DEVICE_FIND_BY_VENDOR|USB_DEVICE_FIND_BY_BUS; - if (!(list = virUSBDeviceSearch(vendor, product, bus, devno, + if (!(list = virUSBDeviceSearch(vendor, product, serial, bus, devno, vroot, flags))) return -1; diff --git a/src/util/virusb.h b/src/util/virusb.h index 42a3303952..c9d5330fac 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -45,12 +45,14 @@ int virUSBDeviceFindByBus(unsigned int bus, int virUSBDeviceFindByVendor(unsigned int vendor, unsigned int product, + const char* serial, const char *vroot, bool mandatory, virUSBDeviceListPtr *devices); int virUSBDeviceFind(unsigned int vendor, unsigned int product, + const char* serial, unsigned int bus, unsigned int devno, const char *vroot, diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 7df4e3aec3..cba4d57d9a 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -37,12 +37,14 @@ struct findTestInfo { const char *name; unsigned int vendor; unsigned int product; + const char *serial; unsigned int bus; unsigned int devno; const char *vroot; bool mandatory; int how; bool expectFailure; + unsigned int expectResults; }; static int testDeviceFileActor(virUSBDevicePtr dev, @@ -76,12 +78,12 @@ static int testDeviceFind(const void *opaque) switch (info->how) { case FIND_BY_ALL: - rv = virUSBDeviceFind(info->vendor, info->product, + rv = virUSBDeviceFind(info->vendor, info->product, info->serial, info->bus, info->devno, info->vroot, info->mandatory, &dev); break; case FIND_BY_VENDOR: - rv = virUSBDeviceFindByVendor(info->vendor, info->product, + rv = virUSBDeviceFindByVendor(info->vendor, info->product, info->serial, info->vroot, info->mandatory, &devs); break; case FIND_BY_BUS: @@ -117,6 +119,13 @@ static int testDeviceFind(const void *opaque) if (virUSBDeviceFileIterate(device, testDeviceFileActor, NULL) < 0) goto cleanup; } + + if (ndevs != info->expectResults) { + virReportError(VIR_ERR_INTERNAL_ERROR, "different amount of results" + " than expected (%zu != %u)", ndevs, + info->expectResults); + goto cleanup; + } break; } @@ -157,7 +166,7 @@ testUSBList(const void *opaque G_GNUC_UNUSED) goto cleanup; #define EXPECTED_NDEVS_ONE 3 - if (virUSBDeviceFindByVendor(0x1d6b, 0x0002, NULL, true, &devlist) < 0) + if (virUSBDeviceFindByVendor(0x1d6b, 0x0002, NULL, NULL, true, &devlist) < 0) goto cleanup; ndevs = virUSBDeviceListCount(devlist); @@ -181,7 +190,7 @@ testUSBList(const void *opaque G_GNUC_UNUSED) goto cleanup; #define EXPECTED_NDEVS_TWO 3 - if (virUSBDeviceFindByVendor(0x18d1, 0x4e22, NULL, true, &devlist) < 0) + if (virUSBDeviceFindByVendor(0x18d1, 0x4e22, NULL, NULL, true, &devlist) < 0) goto cleanup; ndevs = virUSBDeviceListCount(devlist); @@ -201,7 +210,7 @@ testUSBList(const void *opaque G_GNUC_UNUSED) EXPECTED_NDEVS_ONE + EXPECTED_NDEVS_TWO) < 0) goto cleanup; - if (virUSBDeviceFind(0x18d1, 0x4e22, 1, 20, NULL, true, &dev) < 0) + if (virUSBDeviceFind(0x18d1, 0x4e22, NULL, 1, 20, NULL, true, &dev) < 0) goto cleanup; if (!virUSBDeviceListFind(list, dev)) { @@ -235,48 +244,50 @@ mymain(void) { int rv = 0; -#define DO_TEST_FIND_FULL(name, vend, prod, bus, devno, vroot, mand, how, fail) \ +#define DO_TEST_FIND_FULL(name, vend, prod, serial, bus, devno, vroot, mand, how, fail, expected) \ do { \ - struct findTestInfo data = { name, vend, prod, bus, \ - devno, vroot, mand, how, fail \ + struct findTestInfo data = { name, vend, prod, serial, bus, \ + devno, vroot, mand, how, fail, expected \ }; \ if (virTestRun("USBDeviceFind " name, testDeviceFind, &data) < 0) \ rv = -1; \ } while (0) -#define DO_TEST_FIND(name, vend, prod, bus, devno) \ - DO_TEST_FIND_FULL(name, vend, prod, bus, devno, NULL, true, \ - FIND_BY_ALL, false) -#define DO_TEST_FIND_FAIL(name, vend, prod, bus, devno) \ - DO_TEST_FIND_FULL(name, vend, prod, bus, devno, NULL, true, \ - FIND_BY_ALL, true) +#define DO_TEST_FIND(name, vend, prod, serial, bus, devno, expected) \ + DO_TEST_FIND_FULL(name, vend, prod, serial, bus, devno, NULL, true, \ + FIND_BY_ALL, false, expected) +#define DO_TEST_FIND_FAIL(name, vend, prod, serial, bus, devno) \ + DO_TEST_FIND_FULL(name, vend, prod, serial, bus, devno, NULL, true, \ + FIND_BY_ALL, true, 0) #define DO_TEST_FIND_BY_BUS(name, bus, devno) \ - DO_TEST_FIND_FULL(name, 101, 202, bus, devno, NULL, true, \ - FIND_BY_BUS, false) + DO_TEST_FIND_FULL(name, 101, 202, NULL, bus, devno, NULL, true, \ + FIND_BY_BUS, false, 1) #define DO_TEST_FIND_BY_BUS_FAIL(name, bus, devno) \ - DO_TEST_FIND_FULL(name, 101, 202, bus, devno, NULL, true, \ - FIND_BY_BUS, true) + DO_TEST_FIND_FULL(name, 101, 202, NULL, bus, devno, NULL, true, \ + FIND_BY_BUS, true, 0) -#define DO_TEST_FIND_BY_VENDOR(name, vend, prod) \ - DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, true, \ - FIND_BY_VENDOR, false) -#define DO_TEST_FIND_BY_VENDOR_FAIL(name, vend, prod) \ - DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, true, \ - FIND_BY_VENDOR, true) +#define DO_TEST_FIND_BY_VENDOR(name, vend, prod, serial, expected) \ + DO_TEST_FIND_FULL(name, vend, prod, serial, 123, 456, NULL, true, \ + FIND_BY_VENDOR, false, expected) +#define DO_TEST_FIND_BY_VENDOR_FAIL(name, vend, prod, serial) \ + DO_TEST_FIND_FULL(name, vend, prod, serial, 123, 456, NULL, true, \ + FIND_BY_VENDOR, true, 0) - DO_TEST_FIND("Nexus", 0x18d1, 0x4e22, 1, 20); - DO_TEST_FIND_FAIL("Nexus wrong devnum", 0x18d1, 0x4e22, 1, 25); - DO_TEST_FIND_FAIL("Bogus", 0xf00d, 0xbeef, 1024, 768); + DO_TEST_FIND("Nexus", 0x18d1, 0x4e22, NULL, 1, 20, 1); + DO_TEST_FIND_FAIL("Nexus wrong devnum", 0x18d1, 0x4e22, NULL, 1, 25); + DO_TEST_FIND_FAIL("Bogus", 0xf00d, 0xbeef, NULL, 1024, 768); DO_TEST_FIND_BY_BUS("integrated camera", 1, 5); DO_TEST_FIND_BY_BUS_FAIL("wrong bus/devno combination", 2, 20); DO_TEST_FIND_BY_BUS_FAIL("missing bus", 5, 20); DO_TEST_FIND_BY_BUS_FAIL("missing devnum", 1, 158); - DO_TEST_FIND_BY_VENDOR("Nexus (multiple results)", 0x18d1, 0x4e22); - DO_TEST_FIND_BY_VENDOR_FAIL("Bogus vendor and product", 0xf00d, 0xbeef); - DO_TEST_FIND_BY_VENDOR_FAIL("Valid vendor", 0x1d6b, 0xbeef); + DO_TEST_FIND_BY_VENDOR("Nexus (multiple results)", 0x18d1, 0x4e22, NULL, 3); + DO_TEST_FIND_BY_VENDOR("Nexus (with serial)", 0x18d1, 0x4e22, "TANT14-B4732", 1); + DO_TEST_FIND_BY_VENDOR_FAIL("Bogus vendor and product", 0xf00d, 0xbeef, NULL); + DO_TEST_FIND_BY_VENDOR_FAIL("Valid vendor", 0x1d6b, 0xbeef, NULL); + DO_TEST_FIND_BY_VENDOR_FAIL("Bogus serial", 0x18d1, 0x4e22, "BOGUS"); if (virTestRun("USB List test", testUSBList, NULL) < 0) rv = -1; diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/serial b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/serial new file mode 100644 index 0000000000..6bee213c08 --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/serial @@ -0,0 +1 @@ +20200222113321 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/serial b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/serial new file mode 100644 index 0000000000..14764cdc37 --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/serial @@ -0,0 +1 @@ +0123:4b:01.7 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/serial b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/serial new file mode 100644 index 0000000000..b20f2081b7 --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/serial @@ -0,0 +1 @@ +TANT14-B4732 -- 2.27.0

1 1

[libvirt PATCH] cpu_map: Install x86_EPYC-Milan.xml
by Jiri Denemark 02 Mar '21

02 Mar '21

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu_map/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 48f69f623c..013fc62a02 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -34,6 +34,7 @@ cpumap_data = [ 'x86_Dhyana.xml', 'x86_EPYC-IBPB.xml', 'x86_EPYC.xml', + 'x86_EPYC-Milan.xml', 'x86_EPYC-Rome.xml', 'x86_features.xml', 'x86_Haswell-IBRS.xml', -- 2.30.0

2 1

using libvirt 4.5 with upstream qemu
by Thanos Makatos 02 Mar '21

02 Mar '21

I'm trying to use QEMU master with libvirt 4.5 and QEMU seems to be hanging when I try to start a guest. My environment is a modified CentOS 7.9 installation using libvirt 4.5.0. When I use a modified version of QEMU 2.12 (reasonably close to the stock CentOS version) everything works fine. When I try to use a fairly recent version of QEMU (e.g. v5.2.0-729-g89ff714f4b). qemu 118657 1.6 0.0 0 0 ? Z 14:50 0:00 [qemu-kvm] <defunct> qemu 118664 0.0 0.0 207340 3560 ? Ssl 14:50 0:00 /usr/libexec/qemu-kvm -S -no-user-config -nodefaults -nographic -machine none,accel=kvm:tcg -qmp unix:/var/lib/libvirt/qemu/capabilities.monitor.sock,server,nowait -pidfile /var/lib/libvirt/qemu/capabilities.pidfile -daemonize qemu 118666 0.0 0.0 275008 13916 ? Sl 14:50 0:00 /usr/libexec/qemu-kvm -S -no-user-config -nodefaults -nographic -machine none,accel=kvm:tcg -qmp unix:/var/lib/libvirt/qemu/capabilities.monitor.sock,server,nowait -pidfile /var/lib/libvirt/qemu/capabilities.pidfile -daemonize /var/lib/libvirt/qemu/capabilities.pidfile contains the PID of the 2nd QEMU process and by experimenting I found that by killing the QEMU process NOT in the PID file the same thing happens again (maybe once more or twice) and then the guest boots fine. Does libvirt have some specific QEMU dependency? Is there some compatibility matrix I might have missed? I understand this may not be a supported configuration given that I'm not using vanilla libvirt/QEMU, however I'd appreciate some pointers so I can further debug this. I've trying debugging this in case there's some obvious error but didn't find anything interesting. Any ideas?

4 6

[libvirt PATCH] cpu_map: Add EPYC-Milan x86 CPU model
by Jiri Denemark 02 Mar '21

02 Mar '21

Introduced in QEMU 6.0.0 by 623972ceae091b31331ae4a1dc94fe5cbb891937 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu_map/index.xml | 1 + src/cpu_map/x86_EPYC-Milan.xml | 92 ++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 src/cpu_map/x86_EPYC-Milan.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 2e0685df68..ffe1fa91e5 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -68,6 +68,7 @@ <include filename='x86_EPYC.xml'/> <include filename='x86_EPYC-IBPB.xml'/> <include filename='x86_EPYC-Rome.xml'/> + <include filename='x86_EPYC-Milan.xml'/>  <include filename='x86_Dhyana.xml'/> diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml new file mode 100644 index 0000000000..53f0cd6aac --- /dev/null +++ b/src/cpu_map/x86_EPYC-Milan.xml @@ -0,0 +1,92 @@ +<cpus> + <model name='EPYC-Milan'> + <decode host='on' guest='on'/> + <signature family='25' model='1'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='clzero'/> + <feature name='cmov'/> + <feature name='cr8legacy'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrm'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='npt'/> + <feature name='nrip-save'/> + <feature name='nx'/> + <feature name='osvw'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='perfctr_core'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='sse4a'/> + <feature name='ssse3'/> + <feature name='svm'/> + <feature name='svme-addr-check'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='umip'/> + <feature name='vme'/> + <feature name='wbnoinvd'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> -- 2.30.0

2 1

[PATCH] libxl: Fix node device detach when driver unspecified
by Jim Fehlig 02 Mar '21

02 Mar '21

Commit 887dd0d331 caused a small regression in NodeDeviceDetach in the libxl driver when the 'driver' parameter is not specified. E.g. error: Failed to detach device pci_0000_0a_10_0 error: An error occurred, but the cause is unknown If the driver name is not specified, NULL is passed to virDomainDriverNodeDeviceDetachFlags, in which case virPCIDeviceSetStubDriver is never called to set the stub to pciback. Fix it by setting the driver to "xen" if it is not specified when invoking NodeDeviceDetach. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 75a8d46af0..348434ca72 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5777,6 +5777,9 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev, virCheckFlags(0, -1); + if (!driverName) + driverName = "xen"; + if (driverName && STRNEQ(driverName, "xen")) { virReportError(VIR_ERR_INVALID_ARG, _("unsupported driver name '%s'"), driverName); -- 2.29.2

2 1

[PATCH] hyperv: Fix 32bit compilation
by Cole Robinson 02 Mar '21

02 Mar '21

Example: ../src/hyperv/hyperv_driver.c:3007:54: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 7 has type ‘size_t’ {aka ‘unsigned int’} [-Werror=format=] 3007 | virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach serial port %lu"), i); Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Pushed src/hyperv/hyperv_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 701456cdb3..e4f537bd12 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -3004,7 +3004,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char *xml) /* Attach serials */ for (i = 0; i < def->nserials; i++) { if (hypervDomainAttachSerial(domain, def->serials[i]) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach serial port %lu"), i); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach serial port %zu"), i); goto error; } } @@ -3012,7 +3012,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char *xml) /* Attach networks */ for (i = 0; i < def->nnets; i++) { if (hypervDomainAttachSyntheticEthernetAdapter(domain, def->nets[i], hostname) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach network %lu"), i); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach network %zu"), i); goto error; } } -- 2.29.2

2 1

[PATCH v2 0/3] Use g_autoptr and g_autofree
by Kristina Hanicova 02 Mar '21

02 Mar '21

This is v2 from https://listman.redhat.com/archives/libvir-list/2021-February/msg01129.html I changed variable names in patch 1/3 as suggested by Laine. Patches 2/3 and 3/3 have already been reviewed-by and I am sending them for completeness. This uses g_autofree (if possible) in file networkcommon_conf and g_autoptr instead of virNetDevIPRouteFree where possible. Kristina Hanicova (3): networkcommon_conf: Use g_autofree where possible Use g_autoptr instead of virNetDevIPRouteFree if possible Remove redundant variables/labels src/conf/domain_conf.c | 3 +- src/conf/networkcommon_conf.c | 90 +++++++++++++++-------------------- src/lxc/lxc_native.c | 10 ++-- src/vz/vz_sdk.c | 3 +- 4 files changed, 44 insertions(+), 62 deletions(-) -- 2.29.2

2 4

[libvirt PATCH 0/5] cpu_map: Sync with Qemu
by Tim Wiederhake 01 Mar '21

01 Mar '21

Qemu updated its list of known cpu features. Follow suit. Tim Wiederhake (5): cpu_map/sync_qemu_i386.py: Add mapping for amd-ssbd cpu_map/sync_qemu_i386.py: Add mapping for ibrs cpu_map/sync_qemu_i386.py: Add mapping for svme-addr-check cpumap: Add support for ibrs CPU feature cpumap: Add support for svme-addr-check CPU feature src/cpu_map/sync_qemu_i386.py | 3 +++ src/cpu_map/x86_features.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml | 1 + 4 files changed, 11 insertions(+) -- 2.26.2

2 6

[PATCH] tools: Fix dry run of libvirt_recover_xattrs.sh
by Michal Privoznik 01 Mar '21

01 Mar '21

The libvirt_recover_xattrs.sh script can be used to remove stale XATTRs that were left behind by secdrivers (which should happen only if there' an imbalance between set and restore calls). Anyway, the script has '-n' switch which is supposed to perform just a dry run, i.e. just to report which files have XATTRs set without any attempt to remove them. But, when rewriting the script a few months ago a typo was introduced which made the script report no files even if there were files with XATTRs. Fixes: 5377177f80da40ee7d47601400b50835f093715a Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/libvirt_recover_xattrs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libvirt_recover_xattrs.sh b/tools/libvirt_recover_xattrs.sh index 59f1f3f476..be6ee84b5f 100755 --- a/tools/libvirt_recover_xattrs.sh +++ b/tools/libvirt_recover_xattrs.sh @@ -90,7 +90,7 @@ fix_xattrs() { for i in $(getfattr -R -d -m ${XATTR_PREFIX} --absolute-names ${DIR} 2>/dev/null | grep "^# file:" | cut -d':' -f 2); do if [ ${DRY_RUN} -ne 0 ]; then - getfattr -d -m $p --absolute-names $i | grep -v "^# file:" + getfattr -d -m ${XATTR_PREFIX} --absolute-names $i continue fi -- 2.26.2

2 1

[PATCH 0/4] qemu_tmp: Generate log file path for emulated TPMs more frequently
by Michal Privoznik 01 Mar '21

01 Mar '21

The real fix is in 2/4 and the rest is just cleanups. Long story short, the path to log file is not stored anywhere and thus is forgotten on libvirtd restart which means it's seclabel is not restored properly. Michal Prívozník (4): qemu_tpm: Move logfile path generation into a separate function qemu_tpm: Generate log file path among with storage path qemu_tpm: Drop @logDir argument from qemuTPMEmulatorPrepareHost() virtmp: Fix @path handling in virTPMEmulatorInit() src/qemu/qemu_extdevice.c | 6 +++--- src/qemu/qemu_tpm.c | 45 +++++++++++++++++++++++++++++---------- src/util/virtpm.c | 4 +--- 3 files changed, 38 insertions(+), 17 deletions(-) -- 2.26.2

2 8

[libvirt PATCH v4 00/25] Add support for persistent mediated devices
by Jonathon Jongsma 01 Mar '21

01 Mar '21

This patch series follows the previously-merged series which added support for transient mediated devices. This series expands mdev support to include persistent device definitions. Again, it relies on mdevctl as the backend. It follows the common libvirt pattern of APIs by adding the following new APIs for node devices: - virNodeDeviceDefineXML() - defines a persistent device - virNodeDeviceUndefine() - undefines a persistent device - virNodeDeviceCreate() - starts a previously-defined device It also adds virsh commands mapping to these new APIs: nodedev-define, nodedev-undefine, and nodedev-start. Since we rely on mdevctl for the definition of mediated devices, we need a way to stay up-to-date with devices that are defined by mdevctl (outside of libvirt). The method for staying up-to-date is currently a little bit crude due to the fact that mdevctl does not emit any events when new devices are added or removed. As a workaround, we create a file monitor for the mdevctl config directory and re-query mdevctl when we detect changes within that directory. In the future, mdevctl may introduce a more elegant solution. Changes in v4: - rebase to git master - switch to throwaway thread for querying mdevctl - fixed a bug when removing devices because I was accidentally using virHashForEach() instead of virHashForeachSafe() - use DEFINED/UNDEFINED events instead of STARTED/STOPPED events - changes related to merging information about mdev devices from both udev a= nd mdevctl: - Re-used the same function to copy extra data from mdevctl regardless of whether we're processing a udev event or a mdevctl event (recommended by Erik). This results in slightly more complex handling of the object lifetimes (see patch 9), but it consolidates some code. - nodeDeviceDefCopyFromMdevctl() previously only copied the data that was unique to mdevctl and didn't exist in udev. It now copies additional data (possibly overwriting some udev). This solves a problem where a device = is defined but not active (i.e. we have not gotten any data from udev), and then changed (e.g. somebody calls 'mdevctl modify' to change the mdev type), but libvirt was not updating to the new definition. - fix a bug where we were mistakenly emitting 'update' events for devices th= at had not changed - Added the ability to specify a uuid for an mdev via device XML. - split some commits into multiple patches - updated new API version info to 7.1.0 - Fixed a bug reported by Yan Fu which hangs the client when attempting to destroy a nodedev that is in use by an active vm. See https://www.redhat.com/archives/libvir-list/2021-February/msg00116.html for solution suggested by Alex. - numerous smaller fixes from review findings changes in v3: - streamlined tests -- removed some unnecessary duplication - split out patch to factor out node device name generation function - split nodeDeviceParseMdevctlChildDevice() into a separate function - added follow-up patch to remove space-padded alignment in header - refactored the mdevctl update handling significantly: - no longer a separate persistent thread that gets signaled by a timer - now piggybacks onto the existing udev thread and signals the thread in t= he same way that the udev event does. - Daniel suggested spawning a throw-away thread to handle mdevctl updates, but that introduces the complexity of possibly serializing multiple throw-away threads (e.g. if we get an 'created' event followed immediate= ly by a 'deleted' event, two threads may be spawned and we'd need to ensure they are properly ordered) - added virNodeDeviceObjListForEach() and virNodeDeviceObjListRemoveLocked() to simplify removing devices that are removed from mdevctl. - coding style fixes - NOTE: per Erik's request, I experimented with changing the way that mdevctl commands were generated and tested (e.g. introducing something like virMdevctlGetCommand(def, MDEVCTL_COMMAND_<SUBCOMMAND>, ...)), but it was too invasive and awkward and didn't seem worthwhile Changes in v2: - rebase to latest git master Jonathon Jongsma (25): tests: remove extra trailing semicolon nodedev: introduce concept of 'active' node devices nodedev: Add ability to filter by active state nodedev: expose internal helper for naming devices nodedev: add ability to parse mdevs from mdevctl nodedev: add ability to list defined mdevs nodedev: add persistence to virNodeDeviceObj nodedev: add DEFINED/UNDEFINED lifecycle events nodedev: add mdevctl devices to node device list nodedev: add helper functions to remove node devices nodedev: handle mdevs that disappear from mdevctl nodedev: Refresh mdev devices when changes are detected nodedev: add function to generate mdevctl define command api: add virNodeDeviceDefineXML() virsh: Add --inactive, --all to nodedev-list virsh: add nodedev-define command nodedev: refactor tests to support mdev undefine api: add virNodeDeviceUndefine() virsh: Factor out function to find node device virsh: add nodedev-undefine command api: add virNodeDeviceCreate() virsh: add "nodedev-start" command nodedev: add <uuid> element to mdev caps nodedev: add ability to specify UUID for new mdevs nodedev: fix hang when destroying an mdev in use docs/schemas/nodedev.rng | 43 +- examples/c/misc/event-test.c | 4 + include/libvirt/libvirt-nodedev.h | 19 +- src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 6 + src/conf/node_device_conf.c | 15 + src/conf/node_device_conf.h | 8 + src/conf/virnodedeviceobj.c | 149 +++- src/conf/virnodedeviceobj.h | 25 + src/driver-nodedev.h | 14 + src/libvirt-nodedev.c | 115 +++ src/libvirt_private.syms | 6 + src/libvirt_public.syms | 7 + src/node_device/node_device_driver.c | 657 +++++++++++++++++- src/node_device/node_device_driver.h | 41 ++ src/node_device/node_device_udev.c | 214 +++++- src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 40 +- src/remote_protocol-structs | 16 + src/rpc/gendispatch.pl | 1 + ...19_36ea_4111_8f0a_8c9a70e21366-define.argv | 2 + ...19_36ea_4111_8f0a_8c9a70e21366-define.json | 1 + ...019_36ea_4111_8f0a_8c9a70e21366-start.argv | 3 +- ...39_495e_4243_ad9f_beb3f14c23d9-define.argv | 1 + ...39_495e_4243_ad9f_beb3f14c23d9-define.json | 1 + ...16_1ca8_49ac_b176_871d16c13076-define.argv | 1 + ...16_1ca8_49ac_b176_871d16c13076-define.json | 1 + tests/nodedevmdevctldata/mdevctl-create.argv | 1 + .../mdevctl-list-defined.argv | 1 + .../mdevctl-list-multiple.json | 59 ++ .../mdevctl-list-multiple.out.xml | 43 ++ .../nodedevmdevctldata/mdevctl-undefine.argv | 1 + tests/nodedevmdevctltest.c | 222 +++++- ...v_d069d019_36ea_4111_8f0a_8c9a70e21366.xml | 1 + tools/virsh-nodedev.c | 268 ++++++- 35 files changed, 1853 insertions(+), 138 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-define.json create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb= 3f14c23d9-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb= 3f14c23d9-define.json create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871= d16c13076-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871= d16c13076-define.json create mode 100644 tests/nodedevmdevctldata/mdevctl-create.argv create mode 100644 tests/nodedevmdevctldata/mdevctl-list-defined.argv create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml create mode 100644 tests/nodedevmdevctldata/mdevctl-undefine.argv --=20 2.26.2

3 55

[PATCH] Use g_steal_pointer where possible
by Kristina Hanicova 01 Mar '21

01 Mar '21

Via coccinelle (not the hanbag!) spatches used: @ rule1 @ identifier a, b; symbol NULL; @@ - b = a; ... when != a - a = NULL; + b = g_steal_pointer(&a); @@ - *b = a; ... when != a - a = NULL; + *b = g_steal_pointer(&a); Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/admin/admin_server.c | 6 ++---- src/conf/capabilities.c | 3 +-- src/conf/netdev_bandwidth_conf.c | 3 +-- src/conf/virdomainobjlist.c | 3 +-- src/conf/virnwfilterobj.c | 3 +-- src/interface/interface_backend_netcf.c | 3 +-- src/interface/interface_backend_udev.c | 3 +-- src/qemu/qemu_driver.c | 12 ++++------- src/qemu/qemu_monitor_json.c | 27 +++++++++---------------- src/remote/remote_driver.c | 12 ++++------- src/rpc/virnetserver.c | 3 +-- src/util/virfile.c | 9 +++------ src/util/virlog.c | 6 ++---- src/util/virmdev.c | 3 +-- src/util/virsysinfo.c | 21 +++++++------------ src/util/virtypedparam.c | 3 +-- src/vbox/vbox_common.c | 3 +-- src/vz/vz_driver.c | 3 +-- tests/commandhelper.c | 3 +-- tools/virsh-checkpoint.c | 3 +-- tools/virsh-domain.c | 3 +-- 21 files changed, 45 insertions(+), 90 deletions(-) diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c index ebc0cfb045..7d1a21a678 100644 --- a/src/admin/admin_server.c +++ b/src/admin/admin_server.c @@ -50,8 +50,7 @@ adminConnectListServers(virNetDaemonPtr dmn, goto cleanup; if (servers) { - *servers = srvs; - srvs = NULL; + *servers = g_steal_pointer(&srvs); } cleanup: if (ret > 0) @@ -179,8 +178,7 @@ adminServerListClients(virNetServerPtr srv, return -1; if (clients) { - *clients = clts; - clts = NULL; + *clients = g_steal_pointer(&clts); } virObjectListFreeCount(clts, ret); diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 69d9bb0e38..f610975ae5 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1501,9 +1501,8 @@ virCapabilitiesGetNUMASiblingInfo(int node, if (VIR_REALLOC_N(tmp, tmp_size) < 0) goto cleanup; - *siblings = tmp; *nsiblings = tmp_size; - tmp = NULL; + *siblings = g_steal_pointer(&tmp); tmp_size = 0; ret = 0; cleanup: diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index 4fb7aa4e3d..ff25641b2c 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -205,8 +205,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth, if (!def->in && !def->out) VIR_FREE(def); - *bandwidth = def; - def = NULL; + *bandwidth = g_steal_pointer(&def); ret = 0; cleanup: diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 2521cd56c2..d37bbc94a6 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -1083,8 +1083,7 @@ virDomainObjListExport(virDomainObjListPtr domlist, goto cleanup; } - *domains = doms; - doms = NULL; + *domains = g_steal_pointer(&doms); } ret = nvms; diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 3157522eb2..f4bf1b083d 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -464,8 +464,7 @@ virNWFilterObjListExport(virConnectPtr conn, virNWFilterObjUnlock(obj); } - *filters = tmp_filters; - tmp_filters = NULL; + *filters = g_steal_pointer(&tmp_filters); ret = nfilters; cleanup: diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index e40a4cb108..f8613fea86 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -715,8 +715,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, if (tmp_iface_objs) { /* trim the array to the final size */ ignore_value(VIR_REALLOC_N(tmp_iface_objs, niface_objs + 1)); - *ifaces = tmp_iface_objs; - tmp_iface_objs = NULL; + *ifaces = g_steal_pointer(&tmp_iface_objs); } ret = niface_objs; diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 6a94a45044..ab95b2e3ff 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -394,8 +394,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, /* Trim the array to its final size */ if (ifaces) { ignore_value(VIR_REALLOC_N(ifaces_list, count + 1)); - *ifaces = ifaces_list; - ifaces_list = NULL; + *ifaces = g_steal_pointer(&ifaces_list); } return count; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b9bbdf8d48..d1a3659774 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5097,8 +5097,7 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef, bitmap = NULL; } - *info = info_ret; - info_ret = NULL; + *info = g_steal_pointer(&info_ret); ret = targetDef->niothreadids; cleanup: @@ -9133,9 +9132,8 @@ qemuDomainGetPerfEvents(virDomainPtr dom, goto endjob; } - *params = par; *nparams = npar; - par = NULL; + *params = g_steal_pointer(&par); npar = 0; ret = 0; @@ -18729,8 +18727,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, virObjectUnlock(vm); } - *retStats = tmpstats; - tmpstats = NULL; + *retStats = g_steal_pointer(&tmpstats); ret = nstats; @@ -19259,9 +19256,8 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr *params, #undef ADD_BITMAP - *params = par; *nparams = npar; - par = NULL; + *params = g_steal_pointer(&par); ret = 0; cleanup: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f8c78d9093..819389f5f9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5820,8 +5820,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, } ret = n; - *machines = infolist; - infolist = NULL; + *machines = g_steal_pointer(&infolist); cleanup: if (infolist) { @@ -6268,8 +6267,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, } ret = n; - *commands = commandlist; - commandlist = NULL; + *commands = g_steal_pointer(&commandlist); cleanup: @@ -6327,8 +6325,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, } ret = n; - *events = eventlist; - eventlist = NULL; + *events = g_steal_pointer(&eventlist); cleanup: g_strfreev(eventlist); @@ -6472,8 +6469,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, } ret = n; - *types = typelist; - typelist = NULL; + *types = g_steal_pointer(&typelist); cleanup: g_strfreev(typelist); @@ -6542,8 +6538,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, } ret = n; - *paths = pathlist; - pathlist = NULL; + *paths = g_steal_pointer(&pathlist); cleanup: if (pathlist) { @@ -6779,8 +6774,7 @@ qemuMonitorJSONParsePropsList(virJSONValuePtr cmd, } ret = count; - *props = proplist; - proplist = NULL; + *props = g_steal_pointer(&proplist); cleanup: g_strfreev(proplist); @@ -6962,8 +6956,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, } ret = n; - *capabilities = list; - list = NULL; + *capabilities = g_steal_pointer(&list); cleanup: g_strfreev(list); @@ -7091,8 +7084,7 @@ qemuMonitorJSONGetGICCapabilities(qemuMonitorPtr mon, } ret = n; - *capabilities = list; - list = NULL; + *capabilities = g_steal_pointer(&list); cleanup: VIR_FREE(list); @@ -8157,8 +8149,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, } *niothreads = n; - *iothreads = infolist; - infolist = NULL; + *iothreads = g_steal_pointer(&infolist); ret = 0; cleanup: diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a83cd866e7..31868269b1 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6299,8 +6299,7 @@ remoteConnectGetCPUModelNames(virConnectPtr conn, retmodels[i] = ret.models.models_val[i]; ret.models.models_val[i] = NULL; } - *models = retmodels; - retmodels = NULL; + *models = g_steal_pointer(&retmodels); } rv = ret.ret; @@ -7464,8 +7463,7 @@ remoteNetworkGetDHCPLeases(virNetworkPtr net, goto cleanup; } - *leases = leases_ret; - leases_ret = NULL; + *leases = g_steal_pointer(&leases_ret); } rv = ret.ret; @@ -7555,8 +7553,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, elem = NULL; } - *retStats = tmpret; - tmpret = NULL; + *retStats = g_steal_pointer(&tmpret); rv = ret.retStats.retStats_len; cleanup: @@ -7774,8 +7771,7 @@ remoteDomainInterfaceAddresses(virDomainPtr dom, } } } - *ifaces = ifaces_ret; - ifaces_ret = NULL; + *ifaces = g_steal_pointer(&ifaces_ret); rv = ret.ifaces.ifaces_len; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index f0b866a962..265400ecfa 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -1146,8 +1146,7 @@ virNetServerGetClients(virNetServerPtr srv, } } - *clts = list; - list = NULL; + *clts = g_steal_pointer(&list); ret = nclients; cleanup: diff --git a/src/util/virfile.c b/src/util/virfile.c index 5710495bbf..7cb60e66d3 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -840,8 +840,7 @@ int virFileLoopDeviceAssociate(const char *file, } VIR_DEBUG("Attached loop device %s %d to %s", file, lofd, loname); - *dev = loname; - loname = NULL; + *dev = g_steal_pointer(&loname); ret = 0; @@ -3200,8 +3199,7 @@ virFileOpenTty(int *ttyprimary, char **ttyName, int rawmode) errno = rc; goto cleanup; } - *ttyName = name; - name = NULL; + *ttyName = g_steal_pointer(&name); } ret = 0; @@ -3637,9 +3635,8 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, tmp->deflt = tmp->size == default_hugepagesz; } - *ret_fs = fs; *ret_nfs = nfs; - fs = NULL; + *ret_fs = g_steal_pointer(&fs); nfs = 0; ret = 0; diff --git a/src/util/virlog.c b/src/util/virlog.c index cdfeba8251..00c0fcc457 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1658,8 +1658,7 @@ virLogParseOutputs(const char *src, virLogOutputPtr **outputs) } ret = noutputs; - *outputs = list; - list = NULL; + *outputs = g_steal_pointer(&list); cleanup: g_strfreev(strings); return ret; @@ -1708,8 +1707,7 @@ virLogParseFilters(const char *src, virLogFilterPtr **filters) } ret = nfilters; - *filters = list; - list = NULL; + *filters = g_steal_pointer(&list); cleanup: g_strfreev(strings); return ret; diff --git a/src/util/virmdev.c b/src/util/virmdev.c index db40fe8cc3..2b7f730bd1 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -95,8 +95,7 @@ virMediatedDeviceGetSysfsDeviceAPI(virMediatedDevicePtr dev, if ((tmp = strchr(buf, '\n'))) *tmp = '\0'; - *device_api = buf; - buf = NULL; + *device_api = g_steal_pointer(&buf); return 0; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 995650334c..0016028254 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -258,8 +258,7 @@ virSysinfoParsePPCSystem(const char *base, virSysinfoSystemDefPtr *sysdef) def = NULL; } - *sysdef = def; - def = NULL; + *sysdef = g_steal_pointer(&def); ret = 0; virSysinfoSystemDefFree(def); return ret; @@ -381,8 +380,7 @@ virSysinfoParseARMSystem(const char *base, virSysinfoSystemDefPtr *sysdef) def = NULL; } - *sysdef = def; - def = NULL; + *sysdef = g_steal_pointer(&def); ret = 0; virSysinfoSystemDefFree(def); return ret; @@ -521,8 +519,7 @@ virSysinfoParseS390System(const char *base, virSysinfoSystemDefPtr *sysdef) def = NULL; } - *sysdef = def; - def = NULL; + *sysdef = g_steal_pointer(&def); ret = 0; cleanup: virSysinfoSystemDefFree(def); @@ -686,8 +683,7 @@ virSysinfoParseBIOS(const char *base, virSysinfoBIOSDefPtr *bios) def = NULL; } - *bios = def; - def = NULL; + *bios = g_steal_pointer(&def); ret = 0; virSysinfoBIOSDefFree(def); return ret; @@ -763,8 +759,7 @@ virSysinfoParseX86System(const char *base, virSysinfoSystemDefPtr *sysdef) def = NULL; } - *sysdef = def; - def = NULL; + *sysdef = g_steal_pointer(&def); ret = 0; virSysinfoSystemDefFree(def); return ret; @@ -845,9 +840,8 @@ virSysinfoParseX86BaseBoard(const char *base, ignore_value(VIR_REALLOC_N(boards, nboards)); } - *baseBoard = boards; *nbaseBoard = nboards; - boards = NULL; + *baseBoard = g_steal_pointer(&boards); nboards = 0; ret = 0; cleanup: @@ -915,8 +909,7 @@ virSysinfoParseX86Chassis(const char *base, def = NULL; } - *chassisdef = def; - def = NULL; + *chassisdef = g_steal_pointer(&def); ret = 0; virSysinfoChassisDefFree(def); return ret; diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index f9ab6f6042..c4c26a1183 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -706,9 +706,8 @@ virTypedParamsSerialize(virTypedParameterPtr params, j++; } - *remote_params_val = params_val; *remote_params_len = params_len; - params_val = NULL; + *remote_params_val = g_steal_pointer(&params_val); rv = 0; cleanup: diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 138403b034..0c4126bd38 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -7583,8 +7583,7 @@ vboxConnectListAllDomains(virConnectPtr conn, /* safe to ignore, new size will be equal or less than * previous allocation */ ignore_value(VIR_REALLOC_N(doms, count + 1)); - *domains = doms; - doms = NULL; + *domains = g_steal_pointer(&doms); } ret = count; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 0ebcb06234..60ed286cee 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -3817,8 +3817,7 @@ vzConnectGetAllDomainStats(virConnectPtr conn, tmpstats[nstats++] = tmp; } - *retStats = tmpstats; - tmpstats = NULL; + *retStats = g_steal_pointer(&tmpstats); ret = nstats; cleanup: diff --git a/tests/commandhelper.c b/tests/commandhelper.c index b3c65ab3cc..ee06339392 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -116,8 +116,7 @@ static struct Arguments *parseArguments(int argc, char** argv) } } - ret = args; - args = NULL; + ret = g_steal_pointer(&args); return ret; } diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index 6e68ba66ff..91f7c963c1 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -633,8 +633,7 @@ virshCheckpointListCollect(vshControl *ctl, qsort(checkpointlist->chks, checkpointlist->nchks, sizeof(*checkpointlist->chks), virshChkSorter); - ret = checkpointlist; - checkpointlist = NULL; + ret = g_steal_pointer(&checkpointlist); cleanup: virshCheckpointListFree(checkpointlist); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d40995f44d..3597190523 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5187,8 +5187,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, goto cleanup; ret = nparams; - *update_params = params; - params = NULL; + *update_params = g_steal_pointer(&params); cleanup: VIR_FREE(set_field); -- 2.29.2

2 2

[PATCH 0/2] backup: Don't try to update stats if VM isn't alive
by Peter Krempa 01 Mar '21

01 Mar '21

Doing so results in a crash. Peter Krempa (2): qemuBackupJobTerminate: Move cleanup of temp files earlier qemuBackupJobTerminate: Don't calculate backup job stats if VM isn't active src/qemu/qemu_backup.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) -- 2.29.2

2 3

[PATCH 0/4] Storage volume (crash) fixes
by Peter Krempa 01 Mar '21

01 Mar '21

Patch 1/4 should go into this release, the rest can wait. Peter Krempa (4): storageBackendProbeTarget: Check return value of virStorageSourceNewFromBacking storageBackendProbeTarget: Don't fail if backing store can't be parsed virStorageVolDefFormat: Extract formatting of source extents virStorageVolDefFormat: Don't format empty <source> src/conf/storage_conf.c | 59 +++++++++++-------- src/storage/storage_util.c | 5 +- .../storagevolxml2xmlout/vol-file-backing.xml | 2 - tests/storagevolxml2xmlout/vol-file-iso.xml | 2 - .../storagevolxml2xmlout/vol-file-naming.xml | 2 - tests/storagevolxml2xmlout/vol-file.xml | 2 - .../vol-gluster-dir-neg-uid.xml | 2 - .../storagevolxml2xmlout/vol-gluster-dir.xml | 2 - .../vol-logical-backing.xml | 2 - tests/storagevolxml2xmlout/vol-logical.xml | 2 - .../storagevolxml2xmlout/vol-luks-cipher.xml | 2 - tests/storagevolxml2xmlout/vol-luks.xml | 2 - tests/storagevolxml2xmlout/vol-partition.xml | 2 - .../vol-qcow2-0.10-lazy.xml | 2 - tests/storagevolxml2xmlout/vol-qcow2-1.1.xml | 2 - .../vol-qcow2-encryption.xml | 2 - tests/storagevolxml2xmlout/vol-qcow2-lazy.xml | 2 - tests/storagevolxml2xmlout/vol-qcow2-luks.xml | 2 - .../vol-qcow2-nobacking.xml | 2 - .../vol-qcow2-nocapacity.xml | 2 - tests/storagevolxml2xmlout/vol-qcow2.xml | 2 - tests/storagevolxml2xmlout/vol-sheepdog.xml | 2 - 22 files changed, 35 insertions(+), 69 deletions(-) -- 2.29.2

2 6

[PATCH] build-aux: increase tests timeout
by Roman Bogorodskiy 01 Mar '21

01 Mar '21

Meson default timeout for test() is 30 seconds. This may be not enough for some tests like sc_prohibit_nonreentrant or sc_libvirt_unmarked_diagnostics, so set it to 60 seconds. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- On my system these two tests always timeout with the default value. That's what I have after increasing timeout: 157/288 libvirt:syntax-check / sc_prohibit_nonreentrant OK 52.18s 183/288 libvirt:syntax-check / sc_libvirt_unmarked_diagnostics OK 31.48s build-aux/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/build-aux/meson.build b/build-aux/meson.build index c506feefd2..4acd5e16c1 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -44,6 +44,7 @@ if git potfiles_dep, ], suite: 'syntax-check', + timeout: 60, ) endforeach endif -- 2.30.0

3 5

Release of libvirt-7.1.0
by Jiri Denemark 01 Mar '21

01 Mar '21

The 7.1.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing any other feedback. Your work is greatly appreciated. * Portability * Implement Apple Silicon support libvirt now runs on the ARM-based Apple Silicon Macs. * New features * Introduce virtio-pmem ``<memory/>`` model The virtio-pmem is a virtio variant of NVDIMM and just like NVDIMM virtio-pmem also allows accessing host pages bypassing guest page cache. * Introduce ``<boot order/>`` for ``<filesystem>`` Booting is possible from virtiofs filesystems. Introduce an option to control the boot order, like we do for other bootable devices. * hyperv: implement new APIs The ``virDomainUndefine()``, ``virDomainUndefineFlags()``, ``virDomainDefineXML()``, ``virDomainAttachDevice()``, and ``virDomainAttachDeviceFlags()``, ``virConnectListAllNetworks()``, ``virConnectNumOfNetworks()``, ``virNetworkLookupByName()``, ``virNetworkLookupByUUID()``, ``virConnectNumOfDefinedNetworks()``, ``virConnectListDefinedNetworks()``, ``virNetworkGetAutostart()``, ``virNetworkIsActive()``, ``virNetworkIsPersistent()``, ``virNetworkGetXMLDesc()``, and ``virDomainScreenshot()``, APIs have been implemented in the Hyper-V driver. * Support <teaming> element in plain <hostdev> devices This is useful when libvirt doesn't have the privileges necessary to set the hostdev device's MAC address (which is a necessary part of the alternate <interface type='hostdev'>). * Introduce ``<disk type='vhostuser'>`` support Introduces support for QEMU vhost-user-blk device that can be used to access storage exported via the vhost-user protocol by daemons such as the ``qemu-storage-daemon``. * Bug fixes * qemu: Fix disk quiescing rollback when creating external snapshots If the qemu guest agent call to freeze filesystems failed when creating an external snapshot with ``VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE`` flag the filesystems would be unconditionally thawed. This could cause problems when the filesystems were frozen by an explicit call to ``virDomainFSFreeze`` since the guest agent then rejects any further freeze attempts once are filesystems frozen, an explicit freeze followed by a quiesced snapshot would fail and thaw filesystems. Users are also encouraged to use ``virDomainFSFreeze/Thaw`` manually instead of relying on ``VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE`` if they need finer grained control. * cgroups: Fix how we setup and configure cgroups on hosts with systemd When libvirt is running on host with systemd we register every VM with machined which creates the VM root cgroup for us as well. Before this fix we were directly modifying files in the VM root cgroup which was incorrect because all the files are managed by systemd. The implication was that any change done by libvirt to cgroup attributes supported by systemd could be removed which happens for example by running ``systemctl daemon-reload``. To fix the issue libvirt now uses DBus calls for some of the cgroup attributes that distribute the resources proportionally to the cgroup siblings and for the rest we have a new sub-cgroup that libvirt can managed directly. For more details why this is necessary see `systemd cgroup <https://systemd.io/CGROUP_DELEGATION/>`_ documentation. * qemu: Fix swtpm device with aarch64 The TPM TIS device name for x86 is ``tpm-tis``, whereas for aarch64 it is ``tpm-tis-device``. Fix the use of TPM TIS device with aarch64 by using the proper device name when building the QEMU command line. * libxl: Fix domain shutdown Commit fa30ee04a2 introduced the possibility of a race between the shutdown and death threads used to process domain shutdown and death events from libxl. On normal domain shutdown the shutdown thread handles all aspects of shutting down and cleaning up the domain. The death thread is only used to handle out-of-band domain destruction and is inhibited when domain shutdown is under libvirt's control. The race is avoided by also inhibiting the death thread when libvirt starts the shutdown thread. Enjoy. Jirka

1 0

Entering freeze for libvirt-7.1.0
by Jiri Denemark 25 Feb '21

25 Feb '21

I have just tagged v7.1.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

[libvirt PATCH] qemu_domainjob: Make copy of owner API
by Jiri Denemark 25 Feb '21

25 Feb '21

Using the job owner API name directly works fine as long as it is a static string or the owner's thread is still running. However, this is not always the case. For example, when the owner API name is filled in a job when we're reconnecting to existing domains after daemon restart, the dynamically allocated owner name will disappear with the reconnecting thread. Any follow up usage of the pointer will read random memory. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domainjob.c | 12 ++++++------ src/qemu/qemu_process.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 3c2c6b9179..b58d6837ad 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -190,7 +190,7 @@ qemuDomainObjResetJob(qemuDomainJobObjPtr job) { job->active = QEMU_JOB_NONE; job->owner = 0; - job->ownerAPI = NULL; + g_clear_pointer(&job->ownerAPI, g_free); job->started = 0; } @@ -200,7 +200,7 @@ qemuDomainObjResetAgentJob(qemuDomainJobObjPtr job) { job->agentActive = QEMU_AGENT_JOB_NONE; job->agentOwner = 0; - job->agentOwnerAPI = NULL; + g_clear_pointer(&job->agentOwnerAPI, g_free); job->agentStarted = 0; } @@ -210,7 +210,7 @@ qemuDomainObjResetAsyncJob(qemuDomainJobObjPtr job) { job->asyncJob = QEMU_ASYNC_JOB_NONE; job->asyncOwner = 0; - job->asyncOwnerAPI = NULL; + g_clear_pointer(&job->asyncOwnerAPI, g_free); job->asyncStarted = 0; job->phase = 0; job->mask = QEMU_JOB_DEFAULT_MASK; @@ -890,7 +890,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, obj, obj->def->name); priv->job.active = job; priv->job.owner = virThreadSelfID(); - priv->job.ownerAPI = virThreadJobGet(); + priv->job.ownerAPI = g_strdup(virThreadJobGet()); priv->job.started = now; } else { VIR_DEBUG("Started async job: %s (vm=%p name=%s)", @@ -901,7 +901,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_ACTIVE; priv->job.asyncJob = asyncJob; priv->job.asyncOwner = virThreadSelfID(); - priv->job.asyncOwnerAPI = virThreadJobGet(); + priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); priv->job.asyncStarted = now; priv->job.current->started = now; } @@ -917,7 +917,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); priv->job.agentActive = agentJob; priv->job.agentOwner = virThreadSelfID(); - priv->job.agentOwnerAPI = virThreadJobGet(); + priv->job.agentOwnerAPI = g_strdup(virThreadJobGet()); priv->job.agentStarted = now; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bfa742577f..398f63282e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3732,7 +3732,7 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver, /* Restore the config of the async job which is not persisted */ priv->jobs_queued++; priv->job.asyncJob = QEMU_ASYNC_JOB_BACKUP; - priv->job.asyncOwnerAPI = virThreadJobGet(); + priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); priv->job.asyncStarted = now; qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK | -- 2.30.0

2 1

[libvirt PATCH] qemuProcessUpdateGuestCPU: Check cpu if check=full is set
by Tim Wiederhake 25 Feb '21

25 Feb '21

libvirt performs cpu checking if "check" is set to "partial", but skips checking the cpu if "check" is set to "full". See https://bugzilla.redhat.com/show_bug.cgi?id=1840770 Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/qemu/qemu_process.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bfa742577f..5b8c1397ef 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6149,6 +6149,14 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def, if (virCPUConvertLegacy(hostarch, def->cpu) < 0) return -1; + if (def->cpu->check == VIR_CPU_CHECK_FULL) { + virCPUDefPtr host = virQEMUCapsGetHostModel(qemuCaps, def->virtType, + VIR_QEMU_CAPS_HOST_CPU_FULL); + + if (virCPUCompare(hostarch, host, def->cpu, true) < 0) + return -1; + } + /* nothing to update for host-passthrough / maximum */ if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH && def->cpu->mode != VIR_CPU_MODE_MAXIMUM) { -- 2.26.2

2 1

[PATCH v2] qemu: Add missing lock in qemuProcessHandleMonitorEOF
by Peng Liang 25 Feb '21

25 Feb '21

qemuMonitorUnregister will be called in multiple threads (e.g. threads in rpc worker pool and the vm event thread). In some cases, it isn't protected by the monitor lock, which may lead to call g_source_unref more than one time and a use-after-free problem eventually. Add the missing lock in qemuProcessHandleMonitorEOF (which is the only position missing lock of monitor I found). Suggested-by: Michal Privoznik <mprivozn(a)redhat.com> Signed-off-by: Peng Liang <liangpeng10(a)huawei.com> --- This patch is v2 of https://listman.redhat.com/archives/libvir-list/2021-February/msg00945.html. v1 -> v2: Locking monitor in qemuProcessHandleMonitorEOF instead of using aotmic function in qemuMonitorUnregister. src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_process.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index d25c26343a7f..14e6b1fe9626 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -427,6 +427,7 @@ bool qemuMonitorWasDisposed(void); void qemuMonitorRegister(qemuMonitorPtr mon) ATTRIBUTE_NONNULL(1); +/* Must be called with monitor locked. */ void qemuMonitorUnregister(qemuMonitorPtr mon) ATTRIBUTE_NONNULL(1); void qemuMonitorClose(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d930ff9a74f6..bfa742577f32 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -318,7 +318,9 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon, /* We don't want this EOF handler to be called over and over while the * thread is waiting for a job. */ + virObjectLock(mon); qemuMonitorUnregister(mon); + virObjectUnlock(mon); /* We don't want any cleanup from EOF handler (or any other * thread) to enter qemu namespace. */ -- 2.29.2

2 3

[PATCH 0/3] Use g_autoptr and g_autofree
by Kristina Hanicova 25 Feb '21

25 Feb '21

This uses g_autofree (if possible) in file networkcommon_conf and g_autoptr instead of virNetDevIPRouteFree where possible. Kristina Hanicova (3): networkcommon_conf: Use g_autofree where possible Use g_autoptr instead of virNetDevIPRouteFree if possible Remove redundant variables/labels src/conf/domain_conf.c | 3 +- src/conf/networkcommon_conf.c | 74 +++++++++++++++-------------------- src/lxc/lxc_native.c | 10 ++--- src/vz/vz_sdk.c | 3 +- 4 files changed, 36 insertions(+), 54 deletions(-) -- 2.29.2

3 6

[PATCH] qemu_monitor: Document qemuMonitorUnregister()
by Michal Privoznik 24 Feb '21

24 Feb '21

The most important bit is that the caller is expected to pass locked monitor. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ed35da17e1..73f337a6be 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -850,6 +850,13 @@ qemuMonitorRegister(qemuMonitorPtr mon) } +/** + * qemuMonitorUnregister: + * @mon: monitor object + * + * Unregister monitor from the event loop. The monitor object + * must be locked before calling this function. + */ void qemuMonitorUnregister(qemuMonitorPtr mon) { -- 2.26.2

2 1

[PATCH v2 4/4] utils: Deprecate inexact fractional suffix sizes
by Eric Blake 24 Feb '21

24 Feb '21

The value '1.1k' is inexact; 1126.4 bytes is not possible, so we happen to truncate it to 1126. Our use of fractional sizes is intended for convenience, but when a user specifies a fraction that is not a clean translation to binary, truncating/rounding behind their backs can cause confusion. Better is to deprecate inexact values, which still leaves '1.5k' as valid, but alerts the user to spell out their values as a precise byte number in cases where they are currently being rounded. Note that values like '0.1G' in the testsuite need adjustment as a result. Since qemu_strtosz() does not have an Err** parameter, and plumbing that in would be a much larger task, we instead go with just directly emitting the deprecation warning to stderr. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm not a fan of this patch, but am proposing it for discussion purposes. --- docs/system/deprecated.rst | 9 +++++++++ tests/test-cutils.c | 6 +++--- tests/test-keyval.c | 4 ++-- tests/test-qemu-opts.c | 4 ++-- util/cutils.c | 9 +++++++-- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 113c2e933f1b..2c9cb849eec5 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -154,6 +154,15 @@ Input parameters that take a size value should only use a size suffix the value is hexadecimal. That is, '0x20M' is deprecated, and should be written either as '32M' or as '0x2000000'. +inexact sizes via scaled fractions (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''' + +Input parameters that take a size value should only use a fractional +size (such as '1.5M') that will result in an exact byte value. The +use of inexact values (such as '1.1M') that require truncation or +rounding is deprecated, and you should instead consider writing your +unusual size in bytes (here, '1153433' or '1153434' as desired). + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/tests/test-cutils.c b/tests/test-cutils.c index bad3a6099389..c6c33866277b 100644 --- a/tests/test-cutils.c +++ b/tests/test-cutils.c @@ -2124,11 +2124,11 @@ static void test_qemu_strtosz_float(void) g_assert_cmpint(res, ==, 1024); g_assert(endptr == str + 3); - /* For convenience, we permit values that are not byte-exact */ - str = "12.345M"; + /* Fractional values should still be byte-exact */ + str = "12.125M"; err = qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, (uint64_t) (12.345 * MiB)); + g_assert_cmpint(res, ==, (uint64_t) (12.125 * MiB)); g_assert(endptr == str + 7); } diff --git a/tests/test-keyval.c b/tests/test-keyval.c index e20c07cf3ea5..7a45c22942e6 100644 --- a/tests/test-keyval.c +++ b/tests/test-keyval.c @@ -525,7 +525,7 @@ static void test_keyval_visit_size(void) visit_free(v); /* Suffixes */ - qdict = keyval_parse("sz1=8b,sz2=1.5k,sz3=2M,sz4=0.1G,sz5=16777215T", + qdict = keyval_parse("sz1=8b,sz2=1.5k,sz3=2M,sz4=0.125G,sz5=16777215T", NULL, NULL, &error_abort); v = qobject_input_visitor_new_keyval(QOBJECT(qdict)); qobject_unref(qdict); @@ -537,7 +537,7 @@ static void test_keyval_visit_size(void) visit_type_size(v, "sz3", &sz, &error_abort); g_assert_cmphex(sz, ==, 2 * MiB); visit_type_size(v, "sz4", &sz, &error_abort); - g_assert_cmphex(sz, ==, GiB / 10); + g_assert_cmphex(sz, ==, GiB / 8); visit_type_size(v, "sz5", &sz, &error_abort); g_assert_cmphex(sz, ==, 16777215ULL * TiB); visit_check_struct(v, &error_abort); diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index 6568e31a7229..549e994938fe 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -720,10 +720,10 @@ static void test_opts_parse_size(void) g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, 8); g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), ==, 1536); g_assert_cmphex(qemu_opt_get_size(opts, "size3", 0), ==, 2 * MiB); - opts = qemu_opts_parse(&opts_list_02, "size1=0.1G,size2=16777215T", + opts = qemu_opts_parse(&opts_list_02, "size1=0.125G,size2=16777215T", false, &error_abort); g_assert_cmpuint(opts_count(opts), ==, 2); - g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, GiB / 10); + g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, GiB / 8); g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), ==, 16777215ULL * TiB); /* Beyond limit with suffix */ diff --git a/util/cutils.c b/util/cutils.c index 6a8a175e0d71..1154b9de131a 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -246,12 +246,13 @@ static int64_t suffix_mul(char suffix, int64_t unit) * The size parsing supports the following syntaxes * - 12345 - decimal, scale determined by @default_suffix and @unit * - 12345{bBkKmMgGtTpPeE} - decimal, scale determined by suffix and @unit - * - 12345.678{kKmMgGtTpPeE} - decimal, scale determined by suffix, and - * fractional portion is truncated to byte + * - 12345.678{kKmMgGtTpPeE} - decimal, scale determined by suffix, if + * fractional portion is exact * - 0x7fEE - hexadecimal, unit determined by @default_suffix * * The following cause a deprecation warning, and may be removed in the future * - 0xabc{kKmMgGtTpP} - hex with scaling suffix + * - 12345.678{kKmMgGtTpPeE} - decimal with inexact fraction that caused truncation * * The following are intentionally not supported * - octal, such as 08 @@ -342,6 +343,10 @@ static int do_strtosz(const char *nptr, const char **end, retval = -ERANGE; goto out; } + if (mul_required && fraction * mul != (uint64_t) (fraction * mul)) { + warn_report("Using a fractional size that is not an exact byte " + "multiple is deprecated: %s", nptr); + } *result = val * mul + (uint64_t) (fraction * mul); retval = 0; -- 2.30.1

2 2

[PATCH] NEW: Mention some bug fixes for the 7.1.0 dev cycle
by Jim Fehlig 24 Feb '21

24 Feb '21

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- NEWS.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 6ca539b1cd..8cb26d4d4c 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -88,6 +88,23 @@ v7.1.0 (unreleased) For more details why this is necessary see `systemd cgroup <https://systemd.io/CGROUP_DELEGATION/>`_ documentation. + * qemu: Fix swtpm device with aarch64 + + The TPM TIS device name for x86 is ``tpm-tis``, whereas for aarch64 it is + ``tpm-tis-device``. Fix the use of TPM TIS device with aarch64 by using + the proper device name when building the QEMU command line. + + * libxl: Fix domain shutdown + + Commit fa30ee04a2 introduced the possibility of a race between the + shutdown and death threads used to process domain shutdown and death + events from libxl. On normal domain shutdown the shutdown thread handles + all aspects of shutting down and cleaning up the domain. The death + thread is only used to handle out-of-band domain destruction and is + inhibited when domain shutdown is under libvirt's control. The race is + avoided by also inhibiting the death thread when libvirt starts the + shutdown thread. + v7.0.0 (2021-01-15) =================== -- 2.29.2

3 2

[libvirt PATCH 0/2] Fix bonehead errors in <hostdev> <teaming> support
by Laine Stump 24 Feb '21

24 Feb '21

I hadn't caught the code omission because my migration tester system was out of commission, and I stupidly assumed migration would work. The docs typo was pure lack of attention. This (sub) feature will be new for this release, and there is an open BZ for it downstream, so it would be nice to get the fix ACKed and pushed in time for the release. Laine Stump (2): qemu: allow migration of generic <hostdev> with <teaming> docs: fix bad cut/paste in <teaming> example docs/formatdomain.rst | 3 +-- src/qemu/qemu_migration.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) -- 2.29.2

2 3

[PATCH] qemuMonitorUnregister: Fix use-after-free of mon->watch
by Peng Liang 23 Feb '21

23 Feb '21

qemuMonitorUnregister will be called in multiple threads (e.g. threads in rpc worker pool and the vm event thread). In some cases, it isn't protected by the monitor lock, which may lead to call g_source_unref more than one time and a use-after-free problem eventually. To avoid similar problem in the future, use g_atomic_pointer_compare_and_exchange instead of adding a lock in the missing cases. Signed-off-by: Peng Liang <liangpeng10(a)huawei.com> --- src/qemu/qemu_monitor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0476d606f553..f4d05cd951c2 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -853,10 +853,11 @@ qemuMonitorRegister(qemuMonitorPtr mon) void qemuMonitorUnregister(qemuMonitorPtr mon) { - if (mon->watch) { - g_source_destroy(mon->watch); - g_source_unref(mon->watch); - mon->watch = NULL; + GSource *watch = mon->watch; + + if (watch && g_atomic_pointer_compare_and_exchange(&mon->watch, watch, NULL)) { + g_source_destroy(watch); + g_source_unref(watch); } } -- 2.29.2

2 1

[PATCH v2 3/4] utils: Deprecate hex-with-suffix sizes
by Eric Blake 23 Feb '21

23 Feb '21

Supporting '0x20M' looks odd, particularly since we have a 'B' suffix that is ambiguous for bytes, as well as a less-frequently-used 'E' suffix for extremely large exibytes. In practice, people using hex inputs are specifying values in bytes (and would have written 0x2000000, or possibly relied on default_suffix in the case of qemu_strtosz_MiB), and the use of scaling suffixes makes the most sense for inputs in decimal (where the user would write 32M). But rather than outright dropping support for hex-with-suffix, let's follow our deprecation policy. Sadly, since qemu_strtosz() does not have an Err** parameter, and plumbing that in would be a much larger task, we instead go with just directly emitting the deprecation warning to stderr. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/system/deprecated.rst | 8 ++++++++ util/cutils.c | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 2fcac7861e07..113c2e933f1b 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -146,6 +146,14 @@ library enabled as a cryptography provider. Neither the ``nettle`` library, or the built-in cryptography provider are supported on FIPS enabled hosts. +hexadecimal sizes with scaling multipliers (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Input parameters that take a size value should only use a size suffix +(such as 'k' or 'M') when the base is written in decimal, and not when +the value is hexadecimal. That is, '0x20M' is deprecated, and should +be written either as '32M' or as '0x2000000'. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/util/cutils.c b/util/cutils.c index 22d27b0fd21b..6a8a175e0d71 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -250,6 +250,9 @@ static int64_t suffix_mul(char suffix, int64_t unit) * fractional portion is truncated to byte * - 0x7fEE - hexadecimal, unit determined by @default_suffix * + * The following cause a deprecation warning, and may be removed in the future + * - 0xabc{kKmMgGtTpP} - hex with scaling suffix + * * The following are intentionally not supported * - octal, such as 08 * - fractional hex, such as 0x1.8 @@ -272,7 +275,7 @@ static int do_strtosz(const char *nptr, const char **end, int retval; const char *endptr, *f; unsigned char c; - bool mul_required = false; + bool mul_required = false, hex = false; uint64_t val; int64_t mul; double fraction = 0.0; @@ -298,6 +301,7 @@ static int do_strtosz(const char *nptr, const char **end, retval = -EINVAL; goto out; } + hex = true; } else if (*endptr == '.') { /* * Input looks like a fraction. Make sure even 1.k works @@ -320,6 +324,10 @@ static int do_strtosz(const char *nptr, const char **end, c = *endptr; mul = suffix_mul(c, unit); if (mul > 0) { + if (hex) { + warn_report("Using a multiplier suffix on hex numbers " + "is deprecated: %s", nptr); + } endptr++; } else { mul = suffix_mul(default_suffix, unit); -- 2.30.1

3 2

[PATCH] libxl: Add lock process indicator to libxlDomainObjPrivate object
by Jim Fehlig 23 Feb '21

23 Feb '21

The libvirt libxl driver has no access to FDs associated with VM disks. The disks are opened by libxl.so and any related FDs are not exposed to applications. The prevents using virtlockd's auto-release feature to release locks when the FD is closed. Acquiring and releasing locks is explicitly handled by the libxl driver. The current logic is structured such that locks are acquired in libxlDomainStart and released in libxlDomainCleanup. This works well except for migration, where the locks must be released on the source host before the domain can be started on the destination host, but the domain cannot be cleaned up until the migration confirmation stage. When libxlDomainCleanup if finally called in the confirm stage, locks are again released resulting in confusing errors from virtlockd and libvirtd virtlockd[8095]: resource busy: Lockspace resource 'xxxxxx' is not locked libvirtd[8050]: resource busy: Lockspace resource 'xxxxxx' is not locked libvirtd[8050]: Unable to release lease on testvm The error is also encountered in some error cases, e.g. when libxlDomainStart fails before acquiring locks and libxlDomainCleanup is still used for cleanup. In lieu of a mechanism to check if a lock has been acquired, this patch takes an easy approach to fixing the unnecessary lock releases by adding an indicator to the libxlDomainPrivate object that can be set when the lock is acquired and cleared when the lock is released. libxlDomainCleanup can then skip releasing the lock in cases where it was previously released or never acquired in the first place. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- danpb and I discussed this issue on IRC and after pursuing several options I've decided to send this simple approach to the list for comment. I reworked the code in several ways but in the end cant escape the fact that there are occasions where domain cleanup needs to be performed but stopping the lock process is not needed. Another simple approach I pursued was creating a cleanup function that skipped virDomainLockProcessPause, but this approach was a bit cleaner IMO. Other suggestions welcomed. All is not lost in the effort as it resulted in several cleanup and improvement patches that I'll post after release. It includes decomposing libxlDomainStart and making it idempotent on error so libxlDomainCleanup only needs to be called after a successful call to libxlDomainStart. src/libxl/libxl_domain.c | 13 +++++++++---- src/libxl/libxl_domain.h | 1 + src/libxl/libxl_migration.c | 8 ++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 604b94a006..014f6aceca 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -861,10 +861,14 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, virHostdevReAttachDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def, hostdev_flags); - VIR_FREE(priv->lockState); - if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) - VIR_WARN("Unable to release lease on %s", vm->def->name); - VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + if (priv->lockProcessRunning) { + VIR_FREE(priv->lockState); + if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + VIR_WARN("Unable to release lease on %s", vm->def->name); + else + priv->lockProcessRunning = false; + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + } libxlLoggerCloseFile(cfg->logger, vm->def->id); vm->def->id = -1; @@ -1426,6 +1430,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, priv->lockState) < 0) goto destroy_dom; VIR_FREE(priv->lockState); + priv->lockProcessRunning = true; /* Always enable domain death events */ if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 00682546e0..5fb76bd303 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -68,6 +68,7 @@ struct _libxlDomainObjPrivate { virThreadPtr migrationDstReceiveThr; unsigned short migrationPort; char *lockState; + bool lockProcessRunning; struct libxlDomainJobObj job; diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 631f67930d..a5a9df98ad 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1242,9 +1242,12 @@ libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, virObjectLock(vm); if (ret == 0) { - if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) == 0) { + priv->lockProcessRunning = false; + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + } else { VIR_WARN("Unable to release lease on %s", vm->def->name); - VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + } } else { /* * Confirm phase will not be executed if perform fails. End the @@ -1377,6 +1380,7 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver, "xen:///system", vm, priv->lockState); + priv->lockProcessRunning = true; if (libxl_domain_resume(cfg->ctx, vm->def->id, 1, 0) == 0) { ret = 0; } else { -- 2.29.2

2 1

A brief look at deprecating our JSON extensions over RFC 8259
by Markus Armbruster 23 Feb '21

23 Feb '21

We use JSON in several external interfaces: * QMP * The guest agent's QMP * QAPIfied command line options when the option argument starts with '{' * The block layer's pseudo-protocol "json:" (which can get embedded in image headers) I *think* that's all. The JSON parser we use for these interfaces supports extensions over RFC 8259. Quoting json-lexer.c: - Extra escape sequence in strings: 0x27 (apostrophe) is recognized after escape, too - Single-quoted strings: Like double-quoted strings, except they're delimited by %x27 (apostrophe) instead of %x22 (quotation mark), and can't contain unescaped apostrophe, but can contain unescaped quotation mark. - Interpolation, if enabled: The lexer accepts %[A-Za-z0-9]*, and leaves rejecting invalid ones to the parser. Ignore interpolation; it's never enabled at external interfaces. This leaves single-quotes strings and the escape sequence to go with them. I disabled them as an experiment. Some 20 iotests, a qtest and two unit tests explode. The unit test testing the JSON parser is of course excused. The remaining qtest and the unit test could perhaps be dismissed as atypical use of QEMU from C. The iotests less so, I think. I looked at some iotest failures, and quickly found single-quoted strings used with all external interfaces except for qemu-ga's QMP. We could certainly tidy up the tests to stick to standard JSON. However, the prevalence of single-quoted strings in iotests makes me suspect that they are being used in the field as well. Deprecating the extension is likely more trouble than it's worth. Opinions?

6 17