9:56 a.m.
May 7, 2021 is the 2nd anniversary of release of rhel-8, which means we
no longer have to support qemu-1.5.
Remove the capabilities and test data for the versions we no longer care
about and clean up some capabilities related stuff:
- remove code for QEMU_CAPS_DEVICE_VIDEO_PRIMARY
- remove checking for QEMU_CAPS_QUERY_QMP_SCHEMA since all versions now
support it
This is also a good opportunity to clean up few things regarding the
capabilties test data, namely call 'query-qmp-schema' before
'query-commands' to prepare to retire query-commands.
This series is heavily truncated since there were massive (27MiB)
patches resulting from some of the mechanical (and generated) changes
and also depends on my previous command line wrapping cleanup.
Fetch the full version at:
git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-deprec-2
The cleanups in patches 41, 42, and the massive move of commands in
patch 43 was done using a tool based on pieces of our code which I've
uploaded to:
https://gitlab.com/pipo.sk/libvirt/-/commits/qemu-capabilities-tool
The tool may come in handy for other things too in the future as it
allows programatic modification of the capability replies files.
Peter Krempa (43):
docs/platforms: Drop separate link to qemu-kvm on repology.org
qemuxml2xmltest: testInfoSetPaths: Remove return value
qemuxml2(argv|xml)test: Don't exit early when testQemuInfoSetArgs
fails
qemu: Formally deprecate support for qemu < 2.11
NEWS: Mention that minimum supported qemu version was bumped to 2.11
qemuxml2argvtest: Remove versioned tests for qemu < 2.11
[fixup] qemuxml2argvdata: Remove unused output files
qemuxml2xmltest: Remove versioned tests for qemu < 2.11
[fixup] qemuxml2xmldata: Remove unused output files
qemucapabilitiesdata: Drop capability test data for qemu < 2.11
virQEMUCapsHasPCIMultiBus: Remove logic for PPC multibus support check
qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument
qemuBuildDeviceAddressStr: Remove unused 'qemuCaps'
virQEMUCapsInitProcessCaps: Remove obsolete version checks
virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks
virQEMUCapsInitQMPBasicArch: Use switch for arch-based decisions
qemuxml2argvtest: Rewrite parsing of XMLs to provide earlier parsing
qemuxml2argvtest: Parse 'arch' from XML early
qemuxml2xmltest: Always include basic set of capabilities
qemu: capabilities: Move setting of QEMU_CAPS_CPU_AARCH64_OFF to
virQEMUCapsInitQMPBasicArch
qemuxml2argvtest: Remove negative test case
'pseries-features-htp-resize'
qemu: capabilities: Move setting of PPC specific flags to
virQEMUCapsInitQMPBasicArch
qemuxml2argvtest: Remove negative test for gic v3/host
qemu: capabilities: Move setting of QEMU_CAPS_MACH_VIRT_GIC_VERSION to
virQEMUCapsInitQMPBasicArch
qemuxml2argvtest: Remove negative test case for 'net-vhostuser-multiq'
qemuxml2argvtest: Remove tests for absence of
QEMU_CAPS_DEVICE_VIDEO_PRIMARY
qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to
virQEMUCapsInitQMPBasicArch
[fixup] Fix test fallout in tests/qemuxml2argvdata
[fixup] Fix test fallout in tests/qemuxml2xmloutdata
qemuxml2(argv|xml)test: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY from
tests
qemu: capabilities: Move rest of always present caps to
virQEMUCapsInitQMPArch
qemuhotplugtest: Add also always-present capabilities
qemu: command: Remove legacy '-vga' commandline formatter
qemu_domain_address: Drop compatibility with pre-device vga
specification for i440fx
qemu_domain_address: Drop compatibility with pre-device vga
specification for q35
qemuDomainValidateDevicePCISlotsChipsets: Remove unused @qemuCaps
qemu: capabilities: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY
qemu: capabilities: Always assume QEMU_CAPS_QUERY_QMP_SCHEMA
qemu: monitor: Remove qemuMonitorGetEvents
qemu: monitor: Remove qemuMonitorSupportsActiveCommit
tests: qemucapabilitiesdata: Fix formatting of manually added hunk
tests: qemucapabilitiesdata: Fix wrong command identifier in
caps_4.0.0.riscv64.replies
qemu: capabilities: Probe QMP schema before probing commands
NEWS.rst | 7 +
docs/drvqemu.rst | 2 +-
docs/platforms.rst | 2 -
src/qemu/qemu_alias.c | 5 +-
src/qemu/qemu_alias.h | 1 -
src/qemu/qemu_capabilities.c | 237 +-
src/qemu/qemu_capabilities.h | 7 +-
src/qemu/qemu_command.c | 190 +-
src/qemu/qemu_domain_address.c | 82 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_monitor.c | 23 -
src/qemu/qemu_monitor.h | 3 -
src/qemu/qemu_monitor_json.c | 90 -
src/qemu/qemu_monitor_json.h | 6 -
.../caps_1.5.3.x86_64.replies | 3327 --
.../caps_1.5.3.x86_64.xml | 176 -
.../caps_1.6.0.x86_64.replies | 3298 --
.../caps_1.6.0.x86_64.xml | 185 -
.../caps_1.7.0.x86_64.replies | 3521 --
.../caps_1.7.0.x86_64.xml | 191 -
.../caps_2.1.1.x86_64.replies | 4041 --
.../caps_2.1.1.x86_64.xml | 217 -
.../caps_2.10.0.aarch64.replies | 16975 ------
.../caps_2.10.0.aarch64.xml | 325 -
.../caps_2.10.0.ppc64.replies | 20756 -------
.../caps_2.10.0.ppc64.xml | 1067 -
.../caps_2.10.0.s390x.replies | 16608 ------
.../caps_2.10.0.s390x.xml | 1277 -
.../caps_2.10.0.x86_64.replies | 19329 -------
.../caps_2.10.0.x86_64.xml | 997 -
.../caps_2.11.0.s390x.replies | 24392 ++++----
.../caps_2.11.0.s390x.xml | 3 -
.../caps_2.11.0.x86_64.replies | 25712 ++++-----
.../caps_2.11.0.x86_64.xml | 3 -
.../caps_2.12.0.aarch64.replies | 29188 +++++-----
.../caps_2.12.0.aarch64.xml | 2 -
.../caps_2.12.0.ppc64.replies | 31502 +++++------
.../caps_2.12.0.ppc64.xml | 3 -
.../caps_2.12.0.s390x.replies | 27224 ++++-----
.../caps_2.12.0.s390x.xml | 3 -
.../caps_2.12.0.x86_64.replies | 30352 +++++-----
.../caps_2.12.0.x86_64.xml | 3 -
.../caps_2.4.0.x86_64.replies | 4868 --
.../caps_2.4.0.x86_64.xml | 263 -
.../caps_2.5.0.x86_64.replies | 12506 -----
.../caps_2.5.0.x86_64.xml | 273 -
.../caps_2.6.0.aarch64.replies | 13317 -----
.../caps_2.6.0.aarch64.xml | 283 -
.../caps_2.6.0.ppc64.replies | 15692 ------
.../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1026 -
.../caps_2.6.0.x86_64.replies | 13061 -----
.../caps_2.6.0.x86_64.xml | 273 -
.../caps_2.7.0.s390x.replies | 12137 ----
.../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 113 -
.../caps_2.7.0.x86_64.replies | 13680 -----
.../caps_2.7.0.x86_64.xml | 284 -
.../caps_2.8.0.s390x.replies | 13553 -----
.../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 265 -
.../caps_2.8.0.x86_64.replies | 14594 -----
.../caps_2.8.0.x86_64.xml | 419 -
.../caps_2.9.0.ppc64.replies | 19514 -------
.../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1056 -
.../caps_2.9.0.s390x.replies | 14607 -----
.../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 273 -
.../caps_2.9.0.x86_64.replies | 18290 ------
.../caps_2.9.0.x86_64.xml | 910 -
.../caps_3.0.0.ppc64.replies | 32872 +++++------
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 -
.../caps_3.0.0.riscv32.replies | 21760 ++++----
.../caps_3.0.0.riscv32.xml | 3 -
.../caps_3.0.0.riscv64.replies | 21760 ++++----
.../caps_3.0.0.riscv64.xml | 3 -
.../caps_3.0.0.s390x.replies | 28066 +++++-----
.../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 3 -
.../caps_3.0.0.x86_64.replies | 31463 ++++++-----
.../caps_3.0.0.x86_64.xml | 3 -
.../caps_3.1.0.ppc64.replies | 32440 +++++------
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 3 -
.../caps_3.1.0.x86_64.replies | 32304 +++++------
.../caps_3.1.0.x86_64.xml | 3 -
.../caps_4.0.0.aarch64.replies | 31294 +++++------
.../caps_4.0.0.aarch64.xml | 2 -
.../caps_4.0.0.ppc64.replies | 33422 +++++------
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 3 -
.../caps_4.0.0.riscv32.replies | 29062 +++++-----
.../caps_4.0.0.riscv32.xml | 3 -
.../caps_4.0.0.riscv64.replies | 29062 +++++-----
.../caps_4.0.0.riscv64.xml | 3 -
.../caps_4.0.0.s390x.replies | 29542 +++++-----
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 3 -
.../caps_4.0.0.x86_64.replies | 32932 +++++------
.../caps_4.0.0.x86_64.xml | 3 -
.../caps_4.1.0.x86_64.replies | 34454 ++++++------
.../caps_4.1.0.x86_64.xml | 3 -
.../caps_4.2.0.aarch64.replies | 33732 ++++++------
.../caps_4.2.0.aarch64.xml | 2 -
.../caps_4.2.0.ppc64.replies | 34230 ++++++------
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 3 -
.../caps_4.2.0.s390x.replies | 31044 +++++------
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 3 -
.../caps_4.2.0.x86_64.replies | 36818 ++++++-------
.../caps_4.2.0.x86_64.xml | 3 -
.../caps_5.0.0.aarch64.replies | 36336 ++++++------
.../caps_5.0.0.aarch64.xml | 2 -
.../caps_5.0.0.ppc64.replies | 37738 ++++++-------
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 3 -
.../caps_5.0.0.riscv64.replies | 32784 +++++------
.../caps_5.0.0.riscv64.xml | 3 -
.../caps_5.0.0.x86_64.replies | 39726 ++++++-------
.../caps_5.0.0.x86_64.xml | 3 -
.../caps_5.1.0.sparc.replies | 25244 ++++-----
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 3 -
.../caps_5.1.0.x86_64.replies | 41066 +++++++-------
.../caps_5.1.0.x86_64.xml | 3 -
.../caps_5.2.0.aarch64.replies | 38490 ++++++-------
.../caps_5.2.0.aarch64.xml | 2 -
.../caps_5.2.0.ppc64.replies | 40514 +++++++-------
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 3 -
.../caps_5.2.0.riscv64.replies | 34452 ++++++------
.../caps_5.2.0.riscv64.xml | 3 -
.../caps_5.2.0.s390x.replies | 35480 ++++++------
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 3 -
.../caps_5.2.0.x86_64.replies | 42432 +++++++-------
.../caps_5.2.0.x86_64.xml | 3 -
.../caps_6.0.0.x86_64.replies | 45838 ++++++++--------
.../caps_6.0.0.x86_64.xml | 3 -
tests/qemuhotplugtest.c | 5 +
.../ppc64-modern-bulk-result-conf.xml | 2 +-
.../ppc64-modern-bulk-result-live.xml | 2 +-
.../ppc64-modern-individual-result-conf.xml | 2 +-
.../ppc64-modern-individual-result-live.xml | 2 +-
.../x86-modern-bulk-result-conf.xml | 2 +-
.../x86-modern-bulk-result-live.xml | 2 +-
.../x86-modern-individual-add-result-conf.xml | 2 +-
.../x86-modern-individual-add-result-live.xml | 2 +-
.../x86-old-bulk-result-conf.xml | 2 +-
.../x86-old-bulk-result-live.xml | 2 +-
.../qemuhotplug-ivshmem-doorbell-detach.xml | 2 +-
.../qemuhotplug-ivshmem-plain-detach.xml | 2 +-
.../qemuhotplug-watchdog-full.xml | 2 +-
.../qemuhotplug-watchdog-user-alias-full.xml | 2 +-
.../qemuhotplug-base-live+disk-virtio.xml | 2 +-
.../qemuhotplug-base-live+hostdev-pci.xml | 2 +-
.../qemuhotplug-base-live+interface-vdpa.xml | 2 +-
...qemuhotplug-base-live+ivshmem-doorbell.xml | 4 +-
.../qemuhotplug-base-live+ivshmem-plain.xml | 2 +-
...uhotplug-base-live+watchdog-user-alias.xml | 2 +-
.../qemuhotplug-base-live+watchdog.xml | 2 +-
...hotplug-base-with-scsi-controller-live.xml | 8 +-
...thout-scsi-controller-live+disk-scsi-2.xml | 8 +-
tests/qemumonitorjsontest.c | 44 -
.../aarch64-aavmf-virtio-mmio.args | 2 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +-
.../aarch64-cpu-passthrough.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-host.err | 1 -
tests/qemuxml2argvdata/aarch64-gic-v3.err | 1 -
.../aarch64-noacpi-nouefi.args | 2 +-
.../qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +-
.../qemuxml2argvdata/aarch64-pci-serial.args | 2 +-
.../aarch64-traditional-pci.args | 2 +-
.../aarch64-usb-controller-nec-xhci.args | 2 +-
.../aarch64-usb-controller-qemu-xhci.args | 2 +-
.../aarch64-video-default.args | 2 +-
.../aarch64-video-virtio-gpu-pci.args | 2 +-
.../aarch64-virt-2.6-virtio-pci-default.args | 2 +-
.../aarch64-virt-default-nic.args | 2 +-
.../qemuxml2argvdata/aarch64-virt-virtio.args | 2 +-
.../aarch64-virtio-pci-default.args | 2 +-
.../aarch64-virtio-pci-manual-addresses.args | 2 +-
tests/qemuxml2argvdata/audio-default-sdl.args | 2 +-
.../qemuxml2argvdata/audio-default-spice.args | 2 +-
tests/qemuxml2argvdata/audio-default-vnc.args | 2 +-
tests/qemuxml2argvdata/autoindex.args | 2 +-
.../qemuxml2argvdata/balloon-device-auto.args | 2 +-
.../balloon-mmio-deflate.args | 2 +-
tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +-
tests/qemuxml2argvdata/bios-nvram.args | 2 +-
tests/qemuxml2argvdata/bios.args | 2 +-
tests/qemuxml2argvdata/blkiotune-device.args | 2 +-
tests/qemuxml2argvdata/blkiotune.args | 2 +-
tests/qemuxml2argvdata/boot-complex.args | 8 +-
.../boot-menu-disable-drive.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable.args | 2 +-
.../boot-menu-enable-with-timeout.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable.args | 2 +-
tests/qemuxml2argvdata/boot-multi.args | 2 +-
tests/qemuxml2argvdata/boot-order.args | 6 +-
tests/qemuxml2argvdata/boot-strict.args | 8 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 2 +-
.../channel-unix-guestfwd.x86_64-2.5.0.args | 33 -
.../qemuxml2argvdata/channel-virtio-auto.args | 6 +-
.../channel-virtio-autoadd.args | 6 +-
.../channel-virtio-autoassign.args | 4 +-
.../channel-virtio-default.args | 4 +-
.../channel-virtio-state.args | 2 +-
.../qemuxml2argvdata/channel-virtio-unix.args | 2 +-
tests/qemuxml2argvdata/channel-virtio.args | 2 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 4 +-
tests/qemuxml2argvdata/clock-catchup.args | 2 +-
tests/qemuxml2argvdata/clock-france.args | 2 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 2 +-
.../clock-localtime-basis-localtime.args | 2 +-
.../clock-timer-hyperv-rtc.args | 2 +-
tests/qemuxml2argvdata/clock-variable.args | 2 +-
.../qemuxml2argvdata/console-compat-auto.args | 2 +-
.../console-compat-chardev.args | 2 +-
.../qemuxml2argvdata/console-virtio-many.args | 4 +-
.../console-virtio-unix.x86_64-2.5.0.args | 34 -
tests/qemuxml2argvdata/console-virtio.args | 4 +-
tests/qemuxml2argvdata/controller-order.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable2.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable3.args | 2 +-
.../cpu-cache-emulate-l3.args | 2 +-
.../cpu-cache-passthrough.args | 2 +-
.../cpu-cache-passthrough2.args | 2 +-
.../cpu-check-default-none.args | 2 +-
.../cpu-check-default-none2.args | 2 +-
.../cpu-check-default-partial.args | 2 +-
.../cpu-check-default-partial2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-none.args | 2 +-
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +-
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +-
tests/qemuxml2argvdata/cpu-exact1.args | 2 +-
.../cpu-exact2-nofallback.args | 2 +-
tests/qemuxml2argvdata/cpu-exact2.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.args | 2 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +-
.../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +-
.../cpu-host-model-fallback.args | 2 +-
.../cpu-host-model-vendor.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.args | 2 +-
.../cpu-host-passthrough-features.args | 2 +-
.../cpu-host-passthrough.args | 2 +-
.../qemuxml2argvdata/cpu-hotplug-startup.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum2.args | 2 +-
.../cpu-no-removed-features.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +-
.../qemuxml2argvdata/cpu-numa-memshared.args | 2 +-
.../cpu-numa-no-memory-element.args | 2 +-
tests/qemuxml2argvdata/cpu-numa1.args | 2 +-
tests/qemuxml2argvdata/cpu-numa2.args | 2 +-
tests/qemuxml2argvdata/cpu-strict1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology2.args | 2 +-
tests/qemuxml2argvdata/cpu-topology3.args | 2 +-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +-
.../qemuxml2argvdata/cputune-zero-shares.args | 2 +-
tests/qemuxml2argvdata/cputune.args | 2 +-
tests/qemuxml2argvdata/debug-threads.args | 2 +-
.../default-kvm-host-arch.args | 2 +-
.../default-qemu-host-arch.args | 2 +-
tests/qemuxml2argvdata/disk-aio.args | 2 +-
tests/qemuxml2argvdata/disk-blockio.args | 2 +-
.../disk-cache.x86_64-1.5.3.args | 38 -
.../disk-cache.x86_64-2.6.0.args | 40 -
.../disk-cache.x86_64-2.7.0.args | 40 -
.../qemuxml2argvdata/disk-cdrom-network.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +-
tests/qemuxml2argvdata/disk-copy_on_read.args | 4 +-
tests/qemuxml2argvdata/disk-floppy-tray.args | 2 +-
tests/qemuxml2argvdata/disk-geometry.args | 2 +-
tests/qemuxml2argvdata/disk-ide-split.args | 2 +-
tests/qemuxml2argvdata/disk-ide-wwn.args | 2 +-
tests/qemuxml2argvdata/disk-ioeventfd.args | 4 +-
.../disk-network-gluster.args | 6 +-
.../disk-network-iscsi-modern.args | 10 +-
.../qemuxml2argvdata/disk-network-iscsi.args | 10 +-
tests/qemuxml2argvdata/disk-network-nbd.args | 10 +-
.../disk-network-rbd.x86_64-2.5.0.args | 40 -
.../disk-network-sheepdog.args | 2 +-
.../disk-network-source-auth.args | 6 +-
tests/qemuxml2argvdata/disk-order.args | 6 +-
.../qemuxml2argvdata/disk-readonly-disk.args | 2 +-
tests/qemuxml2argvdata/disk-sata-device.args | 4 +-
.../disk-scsi-device-auto.x86_64-1.5.3.args | 33 -
.../disk-scsi-disk-split.args | 10 +-
.../qemuxml2argvdata/disk-scsi-disk-vpd.args | 6 +-
.../qemuxml2argvdata/disk-scsi-disk-wwn.args | 6 +-
.../disk-scsi-lun-passthrough.args | 6 +-
tests/qemuxml2argvdata/disk-serial.args | 2 +-
tests/qemuxml2argvdata/disk-snapshot.args | 2 +-
.../disk-source-pool-mode.args | 2 +-
tests/qemuxml2argvdata/disk-source-pool.args | 4 +-
.../disk-usb-device-removable.args | 2 +-
tests/qemuxml2argvdata/disk-usb-device.args | 2 +-
tests/qemuxml2argvdata/disk-virtio.args | 4 +-
tests/qemuxml2argvdata/encrypted-disk.args | 2 +-
.../eoi-disabled.x86_64-2.7.0.args | 30 -
.../eoi-enabled.x86_64-2.7.0.args | 30 -
tests/qemuxml2argvdata/event_idx.args | 4 +-
tests/qemuxml2argvdata/floppy-drive-fat.args | 2 +-
tests/qemuxml2argvdata/fs9p.args | 6 +-
.../graphics-egl-headless.args | 2 +-
.../graphics-sdl-fullscreen.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl.args | 2 +-
.../graphics-spice-agent-file-xfer.args | 4 +-
.../graphics-spice-agentmouse.args | 2 +-
.../graphics-spice-auto-socket-cfg.args | 2 +-
.../graphics-spice-auto-socket.args | 2 +-
.../graphics-spice-compression.args | 4 +-
.../graphics-spice-egl-headless.args | 4 +-
.../graphics-spice-no-args.args | 2 +-
.../graphics-spice-qxl-vga.args | 4 +-
.../qemuxml2argvdata/graphics-spice-sasl.args | 4 +-
.../graphics-spice-socket.args | 2 +-
.../graphics-spice-timeout.args | 2 +-
.../graphics-spice-usb-redir.args | 2 +-
tests/qemuxml2argvdata/graphics-spice.args | 4 +-
.../graphics-vnc-auto-socket-cfg.args | 2 +-
.../graphics-vnc-auto-socket.args | 2 +-
.../graphics-vnc-egl-headless.args | 2 +-
.../graphics-vnc-no-listen-attr.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-none.args | 2 +-
.../qemuxml2argvdata/graphics-vnc-policy.args | 2 +-
.../graphics-vnc-remove-generated-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 2 +-
.../graphics-vnc-socket-new-cmdline.args | 2 +-
.../qemuxml2argvdata/graphics-vnc-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 +-
.../graphics-vnc-tls.x86_64-2.4.0.args | 30 -
.../graphics-vnc-websocket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc.args | 2 +-
.../hostdev-mdev-precreated.args | 2 +-
.../hostdev-pci-address-device.args | 4 +-
.../hostdev-pci-address-unassigned.args | 8 +-
.../qemuxml2argvdata/hostdev-pci-address.args | 2 +-
.../hostdev-pci-multifunction.args | 16 +-
.../hostdev-scsi-lsi.x86_64-2.8.0.args | 45 -
.../hostdev-scsi-vhost-scsi-pci.args | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.args | 4 +-
...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 47 -
.../hostdev-usb-address-device-boot.args | 2 +-
.../hostdev-usb-address-device.args | 2 +-
.../hostdev-vfio-multidomain.args | 4 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 4 +-
tests/qemuxml2argvdata/hugepages-default.args | 2 +-
tests/qemuxml2argvdata/hugepages-shared.args | 2 +-
.../qemuxml2argvdata/input-usbmouse-addr.args | 2 +-
.../intel-iommu.x86_64-2.6.0.args | 29 -
tests/qemuxml2argvdata/iothreads-disk.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +-
.../kvmclock+eoi-disabled.x86_64-2.7.0.args | 30 -
.../luks-disks-source-qcow2.args | 8 +-
tests/qemuxml2argvdata/luks-disks-source.args | 6 +-
.../mach-virt-console-virtio.args | 2 +-
.../mach-virt-serial-native.args | 2 +-
.../mach-virt-serial-pci.args | 2 +-
.../mach-virt-serial-usb.args | 2 +-
tests/qemuxml2argvdata/machine-aliases1.args | 2 +-
tests/qemuxml2argvdata/machine-aliases2.args | 2 +-
tests/qemuxml2argvdata/machine-smm-opt.args | 2 +-
.../qemuxml2argvdata/machine-vmport-opt.args | 2 +-
.../memory-hotplug-dimm-addr.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug.args | 2 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 2 +-
tests/qemuxml2argvdata/memtune.args | 2 +-
.../migrate-numa-unaligned.args | 2 +-
.../minimal-msg-timestamp.args | 2 +-
tests/qemuxml2argvdata/minimal-sandbox.args | 2 +-
tests/qemuxml2argvdata/minimal.args | 2 +-
tests/qemuxml2argvdata/monitor-json.args | 2 +-
.../multifunction-pci-device.args | 2 +-
tests/qemuxml2argvdata/net-client.args | 4 +-
tests/qemuxml2argvdata/net-eth-hostip.args | 2 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 2 +-
tests/qemuxml2argvdata/net-eth-names.args | 6 +-
.../net-eth-unmanaged-tap.args | 2 +-
tests/qemuxml2argvdata/net-eth.args | 2 +-
.../net-hostdev-bootorder.args | 2 +-
.../net-hostdev-multidomain.args | 4 +-
.../net-hostdev-vfio-multidomain.args | 4 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 4 +-
tests/qemuxml2argvdata/net-hostdev.args | 4 +-
tests/qemuxml2argvdata/net-many-models.args | 12 +-
tests/qemuxml2argvdata/net-mcast.args | 4 +-
tests/qemuxml2argvdata/net-server.args | 4 +-
tests/qemuxml2argvdata/net-udp.args | 4 +-
tests/qemuxml2argvdata/net-user.args | 2 +-
.../net-vhostuser-multiq.args | 10 +-
.../qemuxml2argvdata/net-vhostuser-multiq.err | 1 -
tests/qemuxml2argvdata/net-vhostuser.args | 6 +-
.../net-vhostuser.x86_64-2.5.0.args | 36 -
tests/qemuxml2argvdata/net-virtio-device.args | 4 +-
.../net-virtio-disable-offloads.args | 4 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 4 +-
.../net-virtio-rxtxqueuesize.args | 4 +-
.../qemuxml2argvdata/net-virtio-teaming.args | 10 +-
tests/qemuxml2argvdata/net-virtio.args | 2 +-
.../numad-auto-memory-vcpu-cpuset.args | 2 +-
...o-memory-vcpu-no-cpuset-and-placement.args | 2 +-
.../numad-auto-vcpu-static-numatune.args | 2 +-
.../numad-static-memory-auto-vcpu.args | 2 +-
tests/qemuxml2argvdata/numad.args | 2 +-
.../numatune-auto-nodeset-invalid.args | 2 +-
.../numatune-auto-prefer.args | 2 +-
.../qemuxml2argvdata/numatune-distances.args | 2 +-
.../numatune-memnode-no-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-memnode.args | 2 +-
tests/qemuxml2argvdata/numatune-memory.args | 2 +-
tests/qemuxml2argvdata/panic-no-address.args | 2 +-
tests/qemuxml2argvdata/panic.args | 2 +-
.../parallel-parport-chardev.args | 2 +-
.../parallel-tcp-chardev.args | 2 +-
.../parallel-unix-chardev.x86_64-2.5.0.args | 33 -
tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +-
.../pci-bridge-many-disks.args | 216 +-
tests/qemuxml2argvdata/pci-bridge.args | 2 +-
tests/qemuxml2argvdata/pci-expander-bus.args | 68 +-
tests/qemuxml2argvdata/pci-many.args | 2 +-
tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +-
tests/qemuxml2argvdata/pci-rom.args | 10 +-
.../pci-serial-dev-chardev.args | 2 +-
.../pcie-root-port-model-generic.args | 6 +-
.../pcie-root-port-model-ioh3420.args | 4 +-
tests/qemuxml2argvdata/pcihole64.args | 2 +-
.../pseries-cpu-compat-power9.args | 4 +-
.../qemuxml2argvdata/pseries-cpu-compat.args | 4 +-
.../pseries-features-htp-resize.err | 1 -
.../pseries-features-htp-resize.xml | 1 -
.../pv-spinlock-disabled.x86_64-2.7.0.args | 30 -
.../pv-spinlock-enabled.x86_64-2.7.0.args | 30 -
.../q35-pci-force-address.args | 2 +-
.../q35-pm-disable-fallback.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +-
.../qemu-ns-commandline-ns0.args | 2 +-
.../qemu-ns-commandline-ns1.args | 2 +-
.../qemuxml2argvdata/qemu-ns-commandline.args | 2 +-
.../qemu-ns-domain-commandline-ns0.args | 2 +-
.../qemu-ns-domain-commandline.args | 2 +-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +-
.../seclabel-dynamic-baselabel.args | 2 +-
.../seclabel-dynamic-labelskip.args | 2 +-
.../seclabel-dynamic-override.args | 2 +-
.../seclabel-dynamic-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +-
tests/qemuxml2argvdata/seclabel-none.args | 2 +-
.../seclabel-static-labelskip.args | 2 +-
.../seclabel-static-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-static.args | 2 +-
.../serial-dev-chardev-iobase.args | 2 +-
.../qemuxml2argvdata/serial-dev-chardev.args | 2 +-
.../qemuxml2argvdata/serial-file-chardev.args | 2 +-
.../qemuxml2argvdata/serial-many-chardev.args | 2 +-
.../qemuxml2argvdata/serial-pty-chardev.args | 2 +-
.../serial-spiceport-nospice.args | 2 +-
.../qemuxml2argvdata/serial-tcp-chardev.args | 2 +-
.../serial-tcp-telnet-chardev.args | 2 +-
.../serial-tcp-tlsx509-chardev-verify.args | 2 +-
.../serial-tcp-tlsx509-chardev.args | 2 +-
.../qemuxml2argvdata/serial-udp-chardev.args | 2 +-
.../qemuxml2argvdata/serial-unix-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +-
.../shmem-plain-doorbell.args | 14 +-
tests/qemuxml2argvdata/shmem.args | 14 +-
.../smartcard-controller.args | 2 +-
.../smartcard-host-certificates-database.args | 2 +-
.../smartcard-host-certificates.args | 2 +-
tests/qemuxml2argvdata/smartcard-host.args | 2 +-
.../smartcard-passthrough-spicevmc.args | 2 +-
.../smartcard-passthrough-tcp.args | 2 +-
...artcard-passthrough-unix.x86_64-2.5.0.args | 32 -
tests/qemuxml2argvdata/smbios.args | 2 +-
tests/qemuxml2argvdata/sound-device.args | 14 +-
tests/qemuxml2argvdata/sound.args | 4 +-
.../usb-controller-qemu-xhci.args | 2 +-
.../qemuxml2argvdata/usb-controller-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller.args | 2 +-
.../usb-hub-autoadd-deluxe.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +-
tests/qemuxml2argvdata/usb-hub.args | 2 +-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +-
.../qemuxml2argvdata/usb-ich9-companion.args | 2 +-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 26 +-
.../qemuxml2argvdata/usb-long-port-path.args | 2 +-
tests/qemuxml2argvdata/usb-none.args | 2 +-
.../usb-piix3-controller.args | 2 +-
.../qemuxml2argvdata/usb-port-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-port-missing.args | 2 +-
tests/qemuxml2argvdata/usb-ports.args | 2 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 2 +-
.../usb-redir-filter-version.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 2 +-
.../usb-redir-unix.x86_64-2.5.0.args | 36 -
tests/qemuxml2argvdata/usb-redir.args | 2 +-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb1-usb2.args | 2 +-
tests/qemuxml2argvdata/user-aliases-usb.args | 2 +-
tests/qemuxml2argvdata/user-aliases.args | 2 +-
.../qemuxml2argvdata/video-qxl-nodevice.args | 32 -
tests/qemuxml2argvdata/video-qxl-nodevice.xml | 29 -
.../qemuxml2argvdata/video-vga-nodevice.args | 30 -
tests/qemuxml2argvdata/video-vga-nodevice.xml | 29 -
.../qemuxml2argvdata/video-vga-qxl-heads.args | 5 +-
.../virtio-input-passthrough.args | 4 +-
tests/qemuxml2argvdata/virtio-input.args | 6 +-
tests/qemuxml2argvdata/virtio-lun.args | 4 +-
.../qemuxml2argvdata/virtio-rng-default.args | 2 +-
.../virtio-rng-egd-unix.x86_64-2.5.0.args | 32 -
tests/qemuxml2argvdata/virtio-rng-egd.args | 4 +-
.../qemuxml2argvdata/virtio-rng-multiple.args | 4 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 4 +-
tests/qemuxml2argvdata/vmcoreinfo.args | 2 +-
tests/qemuxml2argvdata/watchdog-device.args | 2 +-
tests/qemuxml2argvdata/watchdog-dump.args | 2 +-
.../qemuxml2argvdata/watchdog-injectnmi.args | 2 +-
tests/qemuxml2argvtest.c | 155 +-
tests/qemuxml2xmloutdata/autoindex.xml | 4 +-
.../balloon-device-auto.xml | 2 +-
.../bios-nvram-os-interleave.xml | 2 +-
tests/qemuxml2xmloutdata/bios-nvram.xml | 2 +-
tests/qemuxml2xmloutdata/blkiotune-device.xml | 2 +-
tests/qemuxml2xmloutdata/blkiotune.xml | 2 +-
.../boot-menu-disable-with-timeout.xml | 2 +-
.../qemuxml2xmloutdata/boot-menu-disable.xml | 2 +-
.../boot-menu-enable-with-timeout.xml | 2 +-
tests/qemuxml2xmloutdata/boot-multi.xml | 2 +-
tests/qemuxml2xmloutdata/boot-order.xml | 6 +-
tests/qemuxml2xmloutdata/channel-guestfwd.xml | 2 +-
.../channel-unix-source-path-active.xml | 2 +-
.../channel-unix-source-path-inactive.xml | 2 +-
.../channel-virtio-auto.xml | 6 +-
.../channel-virtio-state-active.xml | 2 +-
.../channel-virtio-state-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/channel-virtio.xml | 2 +-
tests/qemuxml2xmloutdata/chardev-label.xml | 4 +-
tests/qemuxml2xmloutdata/clock-catchup.xml | 2 +-
.../clock-timer-hyperv-rtc.xml | 2 +-
.../console-compat-auto.xml | 2 +-
tests/qemuxml2xmloutdata/console-compat2.xml | 2 +-
.../console-virtio-many.xml | 4 +-
tests/qemuxml2xmloutdata/console-virtio.xml | 4 +-
.../controller-usb-order.xml | 2 +-
.../controller-virtio-scsi.xml | 12 +-
.../cpu-check-default-none.xml | 2 +-
.../cpu-check-default-none2.xml | 2 +-
.../cpu-check-default-partial.xml | 2 +-
.../cpu-check-default-partial2.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-check-full.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-check-none.xml | 2 +-
.../qemuxml2xmloutdata/cpu-check-partial.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-empty.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 2 +-
.../qemuxml2xmloutdata/cpu-host-kvmclock.xml | 2 +-
.../cpu-host-model-features.xml | 2 +-
.../cpu-host-model-vendor.xml | 2 +-
.../cpu-host-passthrough-features.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-kvmclock.xml | 2 +-
.../qemuxml2xmloutdata/cpu-numa-disjoint.xml | 2 +-
.../cpu-numa-disordered.xml | 2 +-
.../qemuxml2xmloutdata/cpu-numa-memshared.xml | 2 +-
.../cpu-numa-no-memory-element.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-numa1.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-numa2.xml | 2 +-
.../qemuxml2xmloutdata/cputune-iothreads.xml | 2 +-
.../cputune-iothreadsched-zeropriority.xml | 2 +-
.../cputune-iothreadsched.xml | 2 +-
.../cputune-zero-shares.xml | 2 +-
tests/qemuxml2xmloutdata/cputune.xml | 2 +-
.../default-kvm-host-arch.xml | 2 +-
.../default-qemu-host-arch.xml | 2 +-
.../disk-active-commit-active.xml | 2 +-
.../disk-active-commit-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/disk-aio.xml | 2 +-
.../disk-backing-chains-active.xml | 12 +-
.../disk-backing-chains-inactive.xml | 12 +-
.../disk-backing-chains-index-active.xml | 14 +-
.../disk-backing-chains-index-inactive.xml | 14 +-
.../disk-backing-chains-noindex.xml | 14 +-
.../disk-cache.x86_64-1.5.3.xml | 61 -
.../disk-cache.x86_64-2.6.0.xml | 61 -
.../disk-cache.x86_64-2.7.0.xml | 61 -
.../qemuxml2xmloutdata/disk-copy_on_read.xml | 4 +-
.../qemuxml2xmloutdata/disk-mirror-active.xml | 8 +-
.../disk-mirror-inactive.xml | 8 +-
.../disk-mirror-old-active.xml | 6 +-
.../disk-mirror-old-inactive.xml | 6 +-
.../disk-network-gluster.xml | 6 +-
.../qemuxml2xmloutdata/disk-network-iscsi.xml | 10 +-
tests/qemuxml2xmloutdata/disk-network-nbd.xml | 10 +-
tests/qemuxml2xmloutdata/disk-network-rbd.xml | 12 +-
.../disk-network-sheepdog.xml | 2 +-
.../disk-network-source-auth.xml | 6 +-
.../disk-scsi-device-auto.xml | 4 +-
.../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 6 +-
.../disk-scsi-lun-passthrough-sgio.xml | 6 +-
tests/qemuxml2xmloutdata/disk-serial.xml | 2 +-
.../disk-source-pool-mode.xml | 2 +-
tests/qemuxml2xmloutdata/disk-source-pool.xml | 4 +-
tests/qemuxml2xmloutdata/disk-usb-device.xml | 2 +-
tests/qemuxml2xmloutdata/disk-virtio.xml | 4 +-
tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +-
tests/qemuxml2xmloutdata/eoi-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/eoi-enabled.xml | 2 +-
tests/qemuxml2xmloutdata/event_idx.xml | 4 +-
tests/qemuxml2xmloutdata/floppy-drive-fat.xml | 2 +-
.../hostdev-mdev-precreated.xml | 2 +-
.../hostdev-pci-address-unassigned.xml | 8 +-
.../hostdev-pci-address.xml | 2 +-
.../hostdev-pci-multifunction.xml | 16 +-
.../hostdev-scsi-autogen-address.xml | 6 +-
.../hostdev-scsi-large-unit.xml | 4 +-
tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 4 +-
.../qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 4 +-
.../qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 4 +-
.../hostdev-scsi-shareable.xml | 4 +-
.../hostdev-scsi-vhost-scsi-pci.xml | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.xml | 8 +-
.../hostdev-scsi-virtio-scsi.xml | 4 +-
tests/qemuxml2xmloutdata/hostdev-vfio.xml | 4 +-
.../qemuxml2xmloutdata/hugepages-default.xml | 2 +-
tests/qemuxml2xmloutdata/hugepages-shared.xml | 2 +-
tests/qemuxml2xmloutdata/hyperv-off.xml | 2 +-
.../intel-iommu.x86_64-2.6.0.xml | 31 -
tests/qemuxml2xmloutdata/interface-driver.xml | 4 +-
tests/qemuxml2xmloutdata/iothreads-disk.xml | 2 +-
tests/qemuxml2xmloutdata/kvm-features-off.xml | 2 +-
tests/qemuxml2xmloutdata/lease.xml | 2 +-
.../qemuxml2xmloutdata/luks-disks-source.xml | 6 +-
.../memory-hotplug-dimm.xml | 2 +-
tests/qemuxml2xmloutdata/memory-hotplug.xml | 2 +-
.../qemuxml2xmloutdata/memorybacking-set.xml | 2 +-
.../memorybacking-unset.xml | 2 +-
.../qemuxml2xmloutdata/memtune-unlimited.xml | 2 +-
tests/qemuxml2xmloutdata/memtune.xml | 2 +-
.../qemuxml2xmloutdata/metadata-duplicate.xml | 2 +-
tests/qemuxml2xmloutdata/metadata.xml | 2 +-
tests/qemuxml2xmloutdata/minimal.xml | 2 +-
tests/qemuxml2xmloutdata/net-coalesce.xml | 8 +-
tests/qemuxml2xmloutdata/net-eth-hostip.xml | 2 +-
tests/qemuxml2xmloutdata/net-eth-ifname.xml | 2 +-
.../net-eth-unmanaged-tap.xml | 2 +-
tests/qemuxml2xmloutdata/net-eth.xml | 2 +-
.../net-hostdev-bootorder.xml | 2 +-
tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 4 +-
tests/qemuxml2xmloutdata/net-hostdev.xml | 4 +-
tests/qemuxml2xmloutdata/net-many-models.xml | 12 +-
tests/qemuxml2xmloutdata/net-midonet.xml | 4 +-
tests/qemuxml2xmloutdata/net-mtu.xml | 6 +-
tests/qemuxml2xmloutdata/net-openvswitch.xml | 4 +-
tests/qemuxml2xmloutdata/net-udp.xml | 4 +-
tests/qemuxml2xmloutdata/net-user.xml | 2 +-
tests/qemuxml2xmloutdata/net-vdpa.xml | 2 +-
tests/qemuxml2xmloutdata/net-vhostuser.xml | 6 +-
.../qemuxml2xmloutdata/net-virtio-device.xml | 4 +-
.../net-virtio-disable-offloads.xml | 4 +-
.../net-virtio-network-portgroup.xml | 8 +-
.../net-virtio-rxtxqueuesize.xml | 4 +-
.../net-virtio-teaming-network.xml | 6 +-
.../qemuxml2xmloutdata/net-virtio-teaming.xml | 10 +-
tests/qemuxml2xmloutdata/net-virtio.xml | 2 +-
.../numad-auto-memory-vcpu-cpuset.xml | 2 +-
...to-memory-vcpu-no-cpuset-and-placement.xml | 2 +-
.../numad-auto-vcpu-no-numatune.xml | 2 +-
.../numad-static-vcpu-no-numatune.xml | 2 +-
.../numatune-auto-prefer.xml | 2 +-
.../qemuxml2xmloutdata/numatune-distances.xml | 2 +-
.../numatune-memnode-no-memory.xml | 2 +-
tests/qemuxml2xmloutdata/numatune-memnode.xml | 2 +-
tests/qemuxml2xmloutdata/panic-isa.xml | 2 +-
tests/qemuxml2xmloutdata/panic-no-address.xml | 2 +-
tests/qemuxml2xmloutdata/panic.xml | 2 +-
.../pci-bridge-many-disks.xml | 216 +-
tests/qemuxml2xmloutdata/pci-expander-bus.xml | 68 +-
.../pci-rom-disabled-invalid.xml | 2 +-
tests/qemuxml2xmloutdata/pci-rom-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/pci-rom.xml | 10 +-
.../pci-serial-dev-chardev.xml | 2 +-
.../pcie-root-port-model-generic.xml | 12 +-
.../pcie-root-port-model-ioh3420.xml | 8 +-
tests/qemuxml2xmloutdata/pcihole64-gib.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64-none.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64.xml | 2 +-
.../pv-spinlock-disabled.xml | 2 +-
.../pv-spinlock-enabled.xml | 2 +-
.../q35-pci-force-address.xml | 4 +-
.../qemuxml2xmloutdata/seclabel-dac-none.xml | 2 +-
.../seclabel-device-multiple.xml | 2 +-
.../seclabel-dynamic-baselabel-inactive.xml | 2 +-
.../seclabel-dynamic-labelskip-inactive.xml | 2 +-
.../seclabel-dynamic-none.xml | 2 +-
.../seclabel-dynamic-override-inactive.xml | 2 +-
.../seclabel-dynamic-relabel-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/seclabel-none.xml | 2 +-
.../seclabel-static-labelskip-active.xml | 2 +-
.../seclabel-static-labelskip-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/seclabel-static.xml | 2 +-
.../serial-spiceport-nospice.xml | 2 +-
.../serial-target-port-auto.xml | 2 +-
.../serial-tcp-tlsx509-chardev.xml | 2 +-
.../shmem-plain-doorbell.xml | 14 +-
tests/qemuxml2xmloutdata/shmem.xml | 14 +-
.../smartcard-controller.xml | 2 +-
.../smartcard-host-certificates-database.xml | 2 +-
.../smartcard-host-certificates.xml | 2 +-
tests/qemuxml2xmloutdata/smartcard-host.xml | 2 +-
.../smartcard-passthrough-spicevmc.xml | 2 +-
.../smartcard-passthrough-tcp.xml | 2 +-
.../smbios-multiple-type2.xml | 2 +-
tests/qemuxml2xmloutdata/smbios.xml | 2 +-
tests/qemuxml2xmloutdata/sound-device.xml | 14 +-
tests/qemuxml2xmloutdata/sound.xml | 4 +-
.../tap-vhost-incorrect.xml | 6 +-
tests/qemuxml2xmloutdata/tap-vhost.xml | 4 +-
.../qemuxml2xmloutdata/tseg-explicit-size.xml | 4 +-
tests/qemuxml2xmloutdata/usb-controller.xml | 2 +-
.../qemuxml2xmloutdata/usb-ich9-ehci-addr.xml | 26 +-
tests/qemuxml2xmloutdata/usb-none.xml | 2 +-
.../usb-piix3-controller.xml | 2 +-
tests/qemuxml2xmloutdata/usb-port-missing.xml | 2 +-
.../usb-redir-filter-version.xml | 2 +-
tests/qemuxml2xmloutdata/usb-redir-filter.xml | 2 +-
tests/qemuxml2xmloutdata/usb-redir.xml | 2 +-
tests/qemuxml2xmloutdata/vhost-vsock-auto.xml | 2 +-
tests/qemuxml2xmloutdata/vhost_queues.xml | 4 +-
.../virtio-input-passthrough.xml | 4 +-
tests/qemuxml2xmloutdata/virtio-input.xml | 6 +-
tests/qemuxml2xmloutdata/virtio-lun.xml | 4 +-
tests/qemuxml2xmloutdata/virtio-rng-egd.xml | 4 +-
.../qemuxml2xmloutdata/virtio-rng-random.xml | 4 +-
tests/qemuxml2xmloutdata/vmcoreinfo.xml | 2 +-
tests/qemuxml2xmltest.c | 72 +-
tests/testutilsqemu.c | 2 +-
739 files changed, 588789 insertions(+), 853995 deletions(-)
delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-host.err
delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-v3.err
delete mode 100644 tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
delete mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
delete mode 100644 tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.err
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/pseries-features-htp-resize.err
delete mode 120000 tests/qemuxml2argvdata/pseries-features-htp-resize.xml
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.xml
delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.args
delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.xml
delete mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
--
2.30.2
9:56 a.m.
New subject: [RFC PATCH 01/43] docs/platforms: Drop separate link to qemu-kvm on repology.org
The qemu-kvm page redirects to qemu on repology.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
docs/platforms.rst | 2 --
1 file changed, 2 deletions(-)
diff --git a/docs/platforms.rst b/docs/platforms.rst
index 6d55728625..8c281afebd 100644
--- a/docs/platforms.rst
+++ b/docs/platforms.rst
@@ -34,7 +34,6 @@ distros listed below.
* `libvirt on Repology`_
* `qemu on Repology`_
-* `qemu-kvm on Repology`_
Linux, FreeBSD and macOS
------------------------
@@ -83,4 +82,3 @@ or until the vendor discontinues support, whichever comes first.
.. _hypervisor drivers: drivers.html
.. _libvirt on Repology: https://repology.org/metapackage/libvirt/versions
.. _qemu on Repology: https://repology.org/metapackage/qemu/versions
-.. _qemu-kvm on Repology: https://repology.org/metapackage/qemu-kvm/versions
--
2.30.2
10:38 a.m.
New subject: [RFC PATCH 01/43] docs/platforms: Drop separate link to qemu-kvm on repology.org
On a Friday in 2021, Peter Krempa wrote:
The qemu-kvm page redirects to qemu on repology.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
docs/platforms.rst | 2 --
1 file changed, 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Push-before: 2021 May 7
Jano
9:56 a.m.
New subject: [RFC PATCH 02/43] qemuxml2xmltest: testInfoSetPaths: Remove return value
The function doesn't fail. Remove the return value and checks.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2xmltest.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 70a4a57df1..03cb405123 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -50,7 +50,7 @@ testXML2XMLInactive(const void *opaque)
}
-static int
+static void
testInfoSetPaths(struct testQemuInfo *info,
const char *suffix,
int when)
@@ -71,8 +71,6 @@ testInfoSetPaths(struct testQemuInfo *info,
info->outfile = g_strdup_printf("%s/qemuxml2xmloutdata/%s%s.xml",
abs_srcdir, info->name, suffix);
}
-
- return 0;
}
@@ -140,20 +138,14 @@ mymain(void)
} \
\
if (when & WHEN_INACTIVE) { \
- if (testInfoSetPaths(&info, suffix, WHEN_INACTIVE) < 0) { \
- VIR_TEST_DEBUG("Failed to generate inactive paths for
'%s'", _name); \
- return -1; \
- } \
+ testInfoSetPaths(&info, suffix, WHEN_INACTIVE); \
if (virTestRun("QEMU XML-2-XML-inactive " _name, \
testXML2XMLInactive, &info) < 0) \
ret = -1; \
} \
\
if (when & WHEN_ACTIVE) { \
- if (testInfoSetPaths(&info, suffix, WHEN_ACTIVE) < 0) { \
- VIR_TEST_DEBUG("Failed to generate active paths for
'%s'", _name); \
- return -1; \
- } \
+ testInfoSetPaths(&info, suffix, WHEN_ACTIVE); \
if (virTestRun("QEMU XML-2-XML-active " _name, \
testXML2XMLActive, &info) < 0) \
ret = -1; \
--
2.30.2
10:39 a.m.
New subject: [RFC PATCH 02/43] qemuxml2xmltest: testInfoSetPaths: Remove return value
On a Friday in 2021, Peter Krempa wrote:
The function doesn't fail. Remove the return value and checks.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2xmltest.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Push-before: 2021 May 7
Jano
9:56 a.m.
New subject: [RFC PATCH 03/43] qemuxml2(argv|xml)test: Don't exit early when testQemuInfoSetArgs fails
Set the return code to failure and continue testing.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 2 +-
tests/qemuxml2xmltest.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 07cd522699..15a14be1bb 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -904,7 +904,7 @@ mymain(void)
info.qapiSchemaCache = qapiSchemaCache; \
if (testQemuInfoSetArgs(&info, capscache, capslatest, \
__VA_ARGS__, ARG_END) < 0) \
- return EXIT_FAILURE; \
+ ret = -1; \
testInfoSetPaths(&info, _suffix); \
if (virTestRun("QEMU XML-2-ARGV " _name _suffix, \
testCompareXMLToArgv, &info) < 0) \
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 03cb405123..2b8fca8316 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -134,7 +134,7 @@ mymain(void)
ARG_END) < 0 || \
qemuTestCapsCacheInsert(driver.qemuCapsCache, info.qemuCaps) < 0) { \
VIR_TEST_DEBUG("Failed to generate test data for '%s'",
_name); \
- return -1; \
+ ret = -1; \
} \
\
if (when & WHEN_INACTIVE) { \
--
2.30.2
10:39 a.m.
New subject: [RFC PATCH 03/43] qemuxml2(argv|xml)test: Don't exit early when testQemuInfoSetArgs fails
On a Friday in 2021, Peter Krempa wrote:
Set the return code to failure and continue testing.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 2 +-
tests/qemuxml2xmltest.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Push-before: 2021 May 7
Jano
9:56 a.m.
New subject: [RFC PATCH 04/43] qemu: Formally deprecate support for qemu < 2.11
As of May 7 2021, rhel-8 will be out for two years, which means we no
longer have to support rhel-7 ancient qemu.
QEMU versions in our supported distros:
RHEL-8: 2.12
Debian Stable: 3.1
OpenSuse LEAP 15.0 (SLES15 GA): 2.11
OpenSuse LEAP 15.2: 4.2
Ubuntu (Bionic): 2.11
Ubuntu (Focal): 4.2
This means we can bring up the minimum supported version to 2.11.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
docs/drvqemu.rst | 2 +-
tests/testutilsqemu.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst
index 12e3369e5d..e18075d865 100644
--- a/docs/drvqemu.rst
+++ b/docs/drvqemu.rst
@@ -5,7 +5,7 @@
KVM/QEMU hypervisor driver
==========================
-The libvirt KVM/QEMU driver can manage any QEMU emulator from version 1.5.0 or
+The libvirt KVM/QEMU driver can manage any QEMU emulator from version 2.11.0 or
later.
.. contents::
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 22f43c3bec..4ea5b8d72f 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -44,7 +44,7 @@ static const char *const i386_machines[] = {
"pc", "isapc", NULL
};
/**
- * Oldest supported qemu-1.5 supports machine types back to pc-0.10.
+ * Oldest supported qemu-2.11 supports machine types back to pc-0.10.
*/
static const char *const x86_64_machines[] = {
"pc", "isapc", "q35",
--
2.30.2
9:56 a.m.
New subject: [RFC PATCH 05/43] NEWS: Mention that minimum supported qemu version was bumped to 2.11
TODO: move news to correct section, add sign-off (anti-push failsafe)
---
NEWS.rst | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/NEWS.rst b/NEWS.rst
index 0a34798483..d2103e1150 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -5,6 +5,13 @@ libvirt releases
This is the list of official releases for libvirt, along with an overview of
the changes introduced by each of them.
+* **Removed features**
+
+ * qemu: Remove support for QEMU < 2.11
+
+ In accordance with our platform support policy, the oldest supported QEMU
+ version is now bumped to 2.11 from 1.5.
+
For a more fine-grained view, use the `git log`_.
--
2.30.2
10:40 a.m.
New subject: [RFC PATCH 05/43] NEWS: Mention that minimum supported qemu version was bumped to 2.11
On a Friday in 2021, Peter Krempa wrote:
TODO: move news to correct section, add sign-off (anti-push failsafe)
---
NEWS.rst | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/NEWS.rst b/NEWS.rst
index 0a34798483..d2103e1150 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -5,6 +5,13 @@ libvirt releases
This is the list of official releases for libvirt, along with an overview of
the changes introduced by each of them.
+* **Removed features**
+
+ * qemu: Remove support for QEMU < 2.11
+
+ In accordance with our platform support policy, the oldest supported QEMU
+ version is now bumped to 2.11 from 1.5.
+
Consider moving the lower version first:
version is now bumped from 1.5 to 2.11.
reads better for me.
Jano
For a more fine-grained view, use the `git log`_.
--
2.30.2
9:56 a.m.
New subject: [RFC PATCH 06/43] qemuxml2argvtest: Remove versioned tests for qemu < 2.11
Drop all the cases pinned to unsupported versions.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 15a14be1bb..5e062eefcb 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1197,19 +1197,14 @@ mymain(void)
QEMU_CAPS_USB_HUB,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST_CAPS_VER("eoi-disabled", "2.7.0");
DO_TEST_CAPS_VER("eoi-disabled", "4.0.0");
DO_TEST_CAPS_LATEST("eoi-disabled");
- DO_TEST_CAPS_VER("eoi-enabled", "2.7.0");
DO_TEST_CAPS_VER("eoi-enabled", "4.0.0");
DO_TEST_CAPS_LATEST("eoi-enabled");
- DO_TEST_CAPS_VER("pv-spinlock-disabled", "2.7.0");
DO_TEST_CAPS_VER("pv-spinlock-disabled", "4.0.0");
DO_TEST_CAPS_LATEST("pv-spinlock-disabled");
- DO_TEST_CAPS_VER("pv-spinlock-enabled", "2.7.0");
DO_TEST_CAPS_VER("pv-spinlock-enabled", "4.0.0");
DO_TEST_CAPS_LATEST("pv-spinlock-enabled");
- DO_TEST_CAPS_VER("kvmclock+eoi-disabled", "2.7.0");
DO_TEST_CAPS_VER("kvmclock+eoi-disabled", "4.0.0");
DO_TEST_CAPS_LATEST("kvmclock+eoi-disabled");
@@ -1339,9 +1334,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-error-policy");
DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x",
"2.12.0");
DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x");
- DO_TEST_CAPS_VER("disk-cache", "1.5.3");
- DO_TEST_CAPS_VER("disk-cache", "2.6.0");
- DO_TEST_CAPS_VER("disk-cache", "2.7.0");
DO_TEST_CAPS_VER("disk-cache", "2.12.0");
DO_TEST_CAPS_LATEST("disk-cache");
DO_TEST_CAPS_LATEST("disk-metadata-cache");
@@ -1364,7 +1356,6 @@ mymain(void)
QEMU_CAPS_GLUSTER_DEBUG_LEVEL);
DO_TEST_CAPS_VER("disk-network-gluster", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-gluster");
- DO_TEST_CAPS_VER("disk-network-rbd", "2.5.0");
DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-rbd");
DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE);
@@ -1402,7 +1393,6 @@ mymain(void)
DO_TEST_PARSE_ERROR("disk-usb-pci",
QEMU_CAPS_DEVICE_USB_STORAGE);
DO_TEST_CAPS_LATEST("disk-scsi");
- DO_TEST_CAPS_VER("disk-scsi-device-auto", "1.5.3");
DO_TEST_CAPS_LATEST("disk-scsi-device-auto");
DO_TEST("disk-scsi-disk-split",
QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
@@ -1510,7 +1500,6 @@ mymain(void)
driver.config->vncTLS = 1;
driver.config->vncTLSx509verify = 1;
DO_TEST("graphics-vnc-tls", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST_CAPS_VER("graphics-vnc-tls", "2.4.0");
DO_TEST_CAPS_LATEST("graphics-vnc-tls");
driver.config->vncTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
DO_TEST_CAPS_VER("graphics-vnc-tls-secret", "5.2.0");
@@ -1599,7 +1588,6 @@ mymain(void)
DO_TEST("misc-uuid", NONE);
DO_TEST_PARSE_ERROR("vhost_queues-invalid", NONE);
DO_TEST("net-vhostuser", QEMU_CAPS_CHARDEV_FD_PASS);
- DO_TEST_CAPS_VER("net-vhostuser", "2.5.0");
DO_TEST_CAPS_LATEST("net-vhostuser");
DO_TEST("net-vhostuser-multiq",
QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
@@ -1721,7 +1709,6 @@ mymain(void)
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("parallel-tcp-chardev", NONE);
DO_TEST("parallel-parport-chardev", NONE);
- DO_TEST_CAPS_VER("parallel-unix-chardev", "2.5.0");
DO_TEST_CAPS_LATEST("parallel-unix-chardev");
DO_TEST("console-compat-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL);
@@ -1729,7 +1716,6 @@ mymain(void)
QEMU_CAPS_DEVICE_PCI_SERIAL);
DO_TEST("channel-guestfwd", NONE);
- DO_TEST_CAPS_VER("channel-unix-guestfwd", "2.5.0");
DO_TEST_CAPS_LATEST("channel-unix-guestfwd");
DO_TEST("channel-virtio", NONE);
DO_TEST("channel-virtio-state", NONE);
@@ -1744,7 +1730,6 @@ mymain(void)
DO_TEST("console-virtio-ccw",
QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390);
- DO_TEST_CAPS_VER("console-virtio-unix", "2.5.0");
DO_TEST_CAPS_LATEST("console-virtio-unix");
DO_TEST("console-sclp",
QEMU_CAPS_VIRTIO_S390,
@@ -1768,7 +1753,6 @@ mymain(void)
QEMU_CAPS_CCID_PASSTHRU);
DO_TEST("smartcard-controller",
QEMU_CAPS_CCID_EMULATED);
- DO_TEST_CAPS_VER("smartcard-passthrough-unix", "2.5.0");
DO_TEST_CAPS_LATEST("smartcard-passthrough-unix");
DO_TEST("chardev-reconnect",
@@ -1835,7 +1819,6 @@ mymain(void)
QEMU_CAPS_USB_REDIR,
QEMU_CAPS_SPICE,
QEMU_CAPS_USB_REDIR_FILTER);
- DO_TEST_CAPS_VER("usb-redir-unix", "2.5.0");
DO_TEST_CAPS_LATEST("usb-redir-unix");
DO_TEST("usb1-usb2",
QEMU_CAPS_PIIX3_USB_UHCI,
@@ -2546,7 +2529,6 @@ mymain(void)
QEMU_CAPS_OBJECT_RNG_EGD);
DO_TEST_CAPS_VER("virtio-rng-builtin", "5.2.0");
DO_TEST_CAPS_LATEST("virtio-rng-builtin");
- DO_TEST_CAPS_VER("virtio-rng-egd-unix", "2.5.0");
DO_TEST_CAPS_VER("virtio-rng-egd-unix", "5.2.0");
DO_TEST_CAPS_LATEST("virtio-rng-egd-unix");
DO_TEST("virtio-rng-multiple",
@@ -2905,10 +2887,8 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_DEVICE_PXB_PCIE);
- DO_TEST_CAPS_VER("hostdev-scsi-lsi", "2.8.0");
DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0");
DO_TEST_CAPS_LATEST("hostdev-scsi-lsi");
- DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "2.8.0");
DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0");
DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi");
@@ -3388,7 +3368,6 @@ mymain(void)
DO_TEST("acpi-table", NONE);
DO_TEST_CAPS_LATEST("intel-iommu");
- DO_TEST_CAPS_VER("intel-iommu", "2.6.0");
DO_TEST_CAPS_LATEST("intel-iommu-caching-mode");
DO_TEST_CAPS_LATEST("intel-iommu-eim");
DO_TEST_CAPS_LATEST("intel-iommu-device-iotlb");
@@ -3520,7 +3499,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("tseg-explicit-size");
DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-i440fx");
- DO_TEST_CAPS_VER_PARSE_ERROR("tseg-explicit-size", "2.10.0");
DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-invalid-size");
DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_CCW,
--
2.30.2
9:56 a.m.
New subject: [RFC PATCH 07/43] [fixup] qemuxml2argvdata: Remove unused output files
Remove the output files unused since the last commit.
TODO/RFC: Squash into previous commit?
---
.../channel-unix-guestfwd.x86_64-2.5.0.args | 33 -------------
.../console-virtio-unix.x86_64-2.5.0.args | 34 --------------
.../disk-cache.x86_64-1.5.3.args | 38 ---------------
.../disk-cache.x86_64-2.6.0.args | 40 ----------------
.../disk-cache.x86_64-2.7.0.args | 40 ----------------
.../disk-network-rbd.x86_64-2.5.0.args | 40 ----------------
.../disk-scsi-device-auto.x86_64-1.5.3.args | 33 -------------
.../eoi-disabled.x86_64-2.7.0.args | 30 ------------
.../eoi-enabled.x86_64-2.7.0.args | 30 ------------
.../graphics-vnc-tls.x86_64-2.4.0.args | 30 ------------
.../hostdev-scsi-lsi.x86_64-2.8.0.args | 45 ------------------
...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 47 -------------------
.../intel-iommu.x86_64-2.6.0.args | 29 ------------
.../kvmclock+eoi-disabled.x86_64-2.7.0.args | 30 ------------
.../net-vhostuser.x86_64-2.5.0.args | 36 --------------
.../parallel-unix-chardev.x86_64-2.5.0.args | 33 -------------
.../pv-spinlock-disabled.x86_64-2.7.0.args | 30 ------------
.../pv-spinlock-enabled.x86_64-2.7.0.args | 30 ------------
...artcard-passthrough-unix.x86_64-2.5.0.args | 32 -------------
.../usb-redir-unix.x86_64-2.5.0.args | 36 --------------
.../virtio-rng-egd-unix.x86_64-2.5.0.args | 32 -------------
21 files changed, 728 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
delete mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
delete mode 100644 tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
deleted file mode 100644
index 7dfe29e892..0000000000
--- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--chardev socket,id=charchannel0,path=/tmp/guestfwd-listen.socket,server=on,wait=off \
--netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
--chardev socket,id=charchannel1,path=/tmp/guestfwd-connect.socket \
--netdev user,guestfwd=tcp:10.0.2.1:4601-chardev:charchannel1,id=channel1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
deleted file mode 100644
index 2c09118e98..0000000000
--- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
--chardev socket,id=charconsole0,path=/tmp/listen.socket,server=on,wait=off \
--device virtconsole,chardev=charconsole0,id=console0 \
--chardev socket,id=charconsole1,path=/tmp/connect.socket \
--device virtconsole,chardev=charconsole1,id=console1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
deleted file mode 100644
index b60db3ee82..0000000000
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
--S \
--machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device lsi,id=scsi0,bus=pci.0,addr=0x3 \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=writeback
\
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-1,cache=unsafe \
--device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,cache=none \
--device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \
--drive
file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-virtio-disk0,cache=writethrough
\
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \
--drive
file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-usb-disk1,cache=directsync \
--device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk1,id=usb-disk1,removable=off
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
deleted file mode 100644
index b82483c083..0000000000
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
+++ /dev/null
@@ -1,40 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-2.6,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device lsi,id=scsi0,bus=pci.0,addr=0x2 \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=writeback
\
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-1,cache=unsafe \
--device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,cache=none \
--device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \
--drive
file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-virtio-disk0,cache=writethrough
\
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 \
--drive
file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-usb-disk1,cache=directsync \
--device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk1,id=usb-disk1,removable=off \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
deleted file mode 100644
index f94cb247a1..0000000000
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
+++ /dev/null
@@ -1,40 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device lsi,id=scsi0,bus=pci.0,addr=0x2 \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=writeback
\
--device
ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,write-cache=on \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-1,cache=unsafe \
--device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,write-cache=on \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,cache=none \
--device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,write-cache=on
\
--drive
file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-virtio-disk0,cache=writethrough
\
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,write-cache=off
\
--drive
file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-usb-disk1,cache=directsync \
--device
usb-storage,bus=usb.0,port=1,drive=drive-usb-disk1,id=usb-disk1,removable=off,write-cache=off
\
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
deleted file mode 100644
index e316ff9ee6..0000000000
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
+++ /dev/null
@@ -1,40 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--drive
'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk0'
\
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1
\
--drive
file=rbd:pool/image@asdf:auth_supported=none,format=raw,if=none,id=drive-virtio-disk1 \
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
--drive
'file=rbd:pool/image@foo:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk2'
\
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,id=virtio-disk2 \
--drive
file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,format=raw,if=none,id=drive-virtio-disk3
\
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,id=virtio-disk3 \
--drive
'file=rbd:pool/image:id=myname:key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk4'
\
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,id=virtio-disk4 \
--drive
'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:ff00\:42\:8329]\:6322,format=raw,if=none,id=drive-virtio-disk5'
\
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk5,id=virtio-disk5 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
deleted file mode 100644
index 7f874d7721..0000000000
--- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
--S \
--machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device lsi,id=scsi0,bus=pci.0,addr=0x3 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \
--device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
deleted file mode 100644
index 119bfd8058..0000000000
--- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
--cpu qemu32,-kvm_pv_eoi \
--m 214 \
--realtime mlock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
deleted file mode 100644
index 29651e132a..0000000000
--- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
--cpu qemu32,+kvm_pv_eoi \
--m 214 \
--realtime mlock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
deleted file mode 100644
index 111c097683..0000000000
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-SASL_CONF_PATH=/root/.sasl2 \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--machine pc-i440fx-2.4,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--vnc 127.0.0.1:3,tls=on,x509verify=/etc/pki/libvirt-vnc,sasl=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
deleted file mode 100644
index c933011f9d..0000000000
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
+++ /dev/null
@@ -1,45 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest2 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest2,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
--machine pc-i440fx-2.8,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device lsi,id=scsi0,bus=pci.0,addr=0x2 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0 \
--device scsi-generic,bus=scsi0.0,scsi-id=7,drive=drive-hostdev0,id=hostdev0 \
--drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \
--device scsi-generic,bus=scsi0.0,scsi-id=6,drive=drive-hostdev1,id=hostdev1 \
--drive
file=iscsi://example.org:3260/iqn.1992-01.com.example/0,if=none,format=raw,id=drive-hostdev2
\
--device scsi-generic,bus=scsi0.0,scsi-id=4,drive=drive-hostdev2,id=hostdev2 \
--drive
file=iscsi://example.org:3260/iqn.1992-01.com.example/1,if=none,format=raw,id=drive-hostdev3
\
--device scsi-generic,bus=scsi0.0,scsi-id=5,drive=drive-hostdev3,id=hostdev3 \
--drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:3260/iqn.1992-01.com.example%3Astorage/1,if=none,format=raw,id=drive-hostdev4
\
--device scsi-generic,bus=scsi0.0,scsi-id=3,drive=drive-hostdev4,id=hostdev4 \
--drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:3260/iqn.1992-01.com.example%3Astorage/2,if=none,format=raw,id=drive-hostdev5
\
--device scsi-generic,bus=scsi0.0,scsi-id=2,drive=drive-hostdev5,id=hostdev5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
deleted file mode 100644
index 6125d9e2b7..0000000000
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
+++ /dev/null
@@ -1,47 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest2 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest2,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
--machine pc-i440fx-2.8,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0 \
--device
scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,id=hostdev0 \
--drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \
--device
scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=7,drive=drive-hostdev1,id=hostdev1 \
--drive file=/dev/sg0,if=none,format=raw,id=drive-ua-7996c8dc-a4fa-4012-b76f-043d20144263
\
--device
scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=6,drive=drive-ua-7996c8dc-a4fa-4012-b76f-043d20144263,id=ua-7996c8dc-a4fa-4012-b76f-043d20144263
\
--drive
file=iscsi://example.org:3260/iqn.1992-01.com.example/0,if=none,format=raw,id=drive-hostdev2
\
--device
scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,drive=drive-hostdev2,id=hostdev2 \
--drive
file=iscsi://example.org:3260/iqn.1992-01.com.example/1,if=none,format=raw,id=drive-hostdev3,readonly=on
\
--device
scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,drive=drive-hostdev3,id=hostdev3 \
--drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:3260/iqn.1992-01.com.example%3Astorage/1,if=none,format=raw,id=drive-hostdev4
\
--device
scsi-generic,bus=scsi0.0,channel=0,scsi-id=3,lun=4,drive=drive-hostdev4,id=hostdev4 \
--drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:3260/iqn.1992-01.com.example%3Astorage/2,if=none,format=raw,id=drive-hostdev5
\
--device
scsi-generic,bus=scsi0.0,channel=0,scsi-id=3,lun=5,drive=drive-hostdev5,id=hostdev5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
b/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
deleted file mode 100644
index b68f5908c5..0000000000
--- a/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
+++ /dev/null
@@ -1,29 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-q35-2.6,accel=tcg,usb=off,dump-guest-core=off,iommu=on \
--cpu qemu64 \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
deleted file mode 100644
index 9367978bff..0000000000
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
--cpu qemu32,-kvmclock,-kvm_pv_eoi \
--m 214 \
--realtime mlock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
deleted file mode 100644
index 718156b864..0000000000
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
--netdev vhost-user,chardev=charnet0,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x2
\
--chardev socket,id=charnet1,path=/tmp/vhost1.sock \
--netdev vhost-user,chardev=charnet1,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x3
\
--netdev socket,listen=:2015,id=hostnet2 \
--device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x4 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
deleted file mode 100644
index a9d1f97626..0000000000
--- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--chardev socket,id=charparallel0,path=/tmp/parport0.socket,server=on,wait=off \
--device isa-parallel,chardev=charparallel0,id=parallel0 \
--chardev socket,id=charparallel1,path=/tmp/parport1.socket \
--device isa-parallel,chardev=charparallel1,id=parallel1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
deleted file mode 100644
index 8efe3ad1bb..0000000000
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
--cpu qemu32,-kvm_pv_unhalt \
--m 214 \
--realtime mlock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
deleted file mode 100644
index fb18f19f3e..0000000000
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
--cpu qemu32,+kvm_pv_unhalt \
--m 214 \
--realtime mlock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
deleted file mode 100644
index 3129ae1cb5..0000000000
--- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device usb-ccid,id=ccid0,bus=usb.0,port=1 \
--chardev socket,id=charsmartcard0,path=/tmp/smartcard.sock,server=on,wait=off \
--device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
deleted file mode 100644
index bc7806841c..0000000000
--- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
--chardev socket,id=charredir0,path=/tmp/connect.socket \
--device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \
--chardev socket,id=charredir1,path=/tmp/listen.socket,server=on,wait=off \
--device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
deleted file mode 100644
index 7373ffd480..0000000000
--- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--chardev socket,id=charrng0,path=/tmp/rng.socket,server=on,wait=off \
--object rng-egd,id=objrng0,chardev=charrng0 \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x3 \
--msg timestamp=on
--
2.30.2
10:42 a.m.
New subject: [RFC PATCH 07/43] [fixup] qemuxml2argvdata: Remove unused output files
On a Friday in 2021, Peter Krempa wrote:
Remove the output files unused since the last commit.
TODO/RFC: Squash into previous commit?
Definitely on pushing. But even in the review phase - the changes in
tests will be separated thanks to alphabetical sorting.
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
9:56 a.m.
New subject: [RFC PATCH 08/43] qemuxml2xmltest: Remove versioned tests for qemu < 2.11
Drop all the cases pinned to unsupported versions.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2xmltest.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 2b8fca8316..c7030a22e9 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -286,9 +286,6 @@ mymain(void)
DO_TEST("disk-boot-cdrom", NONE);
DO_TEST("disk-error-policy", NONE);
DO_TEST("disk-fmt-qcow", NONE);
- DO_TEST_CAPS_VER("disk-cache", "1.5.3");
- DO_TEST_CAPS_VER("disk-cache", "2.6.0");
- DO_TEST_CAPS_VER("disk-cache", "2.7.0");
DO_TEST_CAPS_VER("disk-cache", "2.12.0");
DO_TEST_CAPS_LATEST("disk-cache");
DO_TEST_CAPS_LATEST("disk-metadata-cache");
@@ -1343,7 +1340,6 @@ mymain(void)
DO_TEST("video-none-device", QEMU_CAPS_VNC);
DO_TEST_CAPS_LATEST("intel-iommu");
- DO_TEST_CAPS_VER("intel-iommu", "2.6.0");
DO_TEST_CAPS_LATEST("intel-iommu-caching-mode");
DO_TEST_CAPS_LATEST("intel-iommu-eim");
DO_TEST_CAPS_LATEST("intel-iommu-device-iotlb");
--
2.30.2
9:56 a.m.
New subject: [RFC PATCH 09/43] [fixup] qemuxml2xmldata: Remove unused output files
Remove the output files unused since the last commit.
TODO/RFC: Squash into previous commit?
---
.../disk-cache.x86_64-1.5.3.xml | 61 -------------------
.../disk-cache.x86_64-2.6.0.xml | 61 -------------------
.../disk-cache.x86_64-2.7.0.xml | 61 -------------------
.../intel-iommu.x86_64-2.6.0.xml | 31 ----------
4 files changed, 214 deletions(-)
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
b/tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
deleted file mode 100644
index a57c2cd5d0..0000000000
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc-i440fx-1.5'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2' cache='writeback'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2' cache='unsafe'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hdb' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='1'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2' cache='none'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='sda' bus='scsi'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2'
cache='writethrough'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2'
cache='directsync'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='sdb' bus='usb'/>
- </disk>
- <controller type='usb' index='0' model='piix3-uhci'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <controller type='ide' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'/>
- <controller type='scsi' index='0' model='lsilogic'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
- </controller>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
deleted file mode 100644
index e499c7b5a9..0000000000
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc-i440fx-2.6'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2' cache='writeback'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2' cache='unsafe'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hdb' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='1'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2' cache='none'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='sda' bus='scsi'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2'
cache='writethrough'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2'
cache='directsync'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='sdb' bus='usb'/>
- </disk>
- <controller type='usb' index='0' model='piix3-uhci'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <controller type='ide' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'/>
- <controller type='scsi' index='0' model='lsilogic'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
- </controller>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
deleted file mode 100644
index 3bf5792c60..0000000000
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc-i440fx-2.7'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2' cache='writeback'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2' cache='unsafe'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hdb' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='1'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2' cache='none'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='sda' bus='scsi'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2'
cache='writethrough'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
- </disk>
- <disk type='block' device='disk'>
- <driver name='qemu' type='qcow2'
cache='directsync'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='sdb' bus='usb'/>
- </disk>
- <controller type='usb' index='0' model='piix3-uhci'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <controller type='ide' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'/>
- <controller type='scsi' index='0' model='lsilogic'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
- </controller>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
b/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
deleted file mode 100644
index 735f21be97..0000000000
--- a/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219100</memory>
- <currentMemory unit='KiB'>219100</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc-q35-2.6'>hvm</type>
- <boot dev='hd'/>
- </os>
- <cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>qemu64</model>
- </cpu>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='pci' index='0' model='pcie-root'/>
- <controller type='usb' index='0' model='none'/>
- <controller type='sata' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
- </controller>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'/>
- <memballoon model='none'/>
- <iommu model='intel'/>
- </devices>
-</domain>
--
2.30.2
10:43 a.m.
New subject: [RFC PATCH 09/43] [fixup] qemuxml2xmldata: Remove unused output files
On a Friday in 2021, Peter Krempa wrote:
Remove the output files unused since the last commit.
TODO/RFC: Squash into previous commit?
Yes.
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
---
.../disk-cache.x86_64-1.5.3.xml | 61 -------------------
.../disk-cache.x86_64-2.6.0.xml | 61 -------------------
.../disk-cache.x86_64-2.7.0.xml | 61 -------------------
.../intel-iommu.x86_64-2.6.0.xml | 31 ----------
4 files changed, 214 deletions(-)
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
10:47 a.m.
New subject: [RFC PATCH 09/43] [fixup] qemuxml2xmldata: Remove unused output files
On a Friday in 2021, Peter Krempa wrote:
Remove the output files unused since the last commit.
TODO/RFC: Squash into previous commit?
Yes
---
.../disk-cache.x86_64-1.5.3.xml | 61 -------------------
.../disk-cache.x86_64-2.6.0.xml | 61 -------------------
.../disk-cache.x86_64-2.7.0.xml | 61 -------------------
.../intel-iommu.x86_64-2.6.0.xml | 31 ----------
4 files changed, 214 deletions(-)
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
9:56 a.m.
New subject: [RFC PATCH 10/43] qemucapabilitiesdata: Drop capability test data for qemu < 2.11
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../caps_1.5.3.x86_64.replies | 3327 ---
.../caps_1.5.3.x86_64.xml | 176 -
.../caps_1.6.0.x86_64.replies | 3298 ---
.../caps_1.6.0.x86_64.xml | 185 -
.../caps_1.7.0.x86_64.replies | 3521 ---
.../caps_1.7.0.x86_64.xml | 191 -
.../caps_2.1.1.x86_64.replies | 4041 ---
.../caps_2.1.1.x86_64.xml | 217 -
.../caps_2.10.0.aarch64.replies | 16975 -------------
.../caps_2.10.0.aarch64.xml | 325 -
.../caps_2.10.0.ppc64.replies | 20756 ----------------
.../caps_2.10.0.ppc64.xml | 1067 -
.../caps_2.10.0.s390x.replies | 16608 -------------
.../caps_2.10.0.s390x.xml | 1277 -
.../caps_2.10.0.x86_64.replies | 19329 --------------
.../caps_2.10.0.x86_64.xml | 997 -
.../caps_2.4.0.x86_64.replies | 4868 ----
.../caps_2.4.0.x86_64.xml | 263 -
.../caps_2.5.0.x86_64.replies | 12506 ----------
.../caps_2.5.0.x86_64.xml | 273 -
.../caps_2.6.0.aarch64.replies | 13317 ----------
.../caps_2.6.0.aarch64.xml | 283 -
.../caps_2.6.0.ppc64.replies | 15692 ------------
.../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1026 -
.../caps_2.6.0.x86_64.replies | 13061 ----------
.../caps_2.6.0.x86_64.xml | 273 -
.../caps_2.7.0.s390x.replies | 12137 ---------
.../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 113 -
.../caps_2.7.0.x86_64.replies | 13680 ----------
.../caps_2.7.0.x86_64.xml | 284 -
.../caps_2.8.0.s390x.replies | 13553 ----------
.../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 265 -
.../caps_2.8.0.x86_64.replies | 14594 -----------
.../caps_2.8.0.x86_64.xml | 419 -
.../caps_2.9.0.ppc64.replies | 19514 ---------------
.../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1056 -
.../caps_2.9.0.s390x.replies | 14607 -----------
.../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 273 -
.../caps_2.9.0.x86_64.replies | 18290 --------------
.../caps_2.9.0.x86_64.xml | 910 -
40 files changed, 263547 deletions(-)
delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
deleted file mode 100644
index 82b07dc86e..0000000000
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
+++ /dev/null
@@ -1,3327 +0,0 @@
-{
- "execute": "qmp_capabilities",
- "id": "libvirt-1"
-}
[truncated]
10:47 a.m.
New subject: [RFC PATCH 10/43] qemucapabilitiesdata: Drop capability test data for qemu < 2.11
On a Friday in 2021, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../caps_1.5.3.x86_64.replies | 3327 ---
.../caps_1.5.3.x86_64.xml | 176 -
.../caps_1.6.0.x86_64.replies | 3298 ---
.../caps_1.6.0.x86_64.xml | 185 -
.../caps_1.7.0.x86_64.replies | 3521 ---
.../caps_1.7.0.x86_64.xml | 191 -
.../caps_2.1.1.x86_64.replies | 4041 ---
.../caps_2.1.1.x86_64.xml | 217 -
.../caps_2.10.0.aarch64.replies | 16975 -------------
.../caps_2.10.0.aarch64.xml | 325 -
.../caps_2.10.0.ppc64.replies | 20756 ----------------
.../caps_2.10.0.ppc64.xml | 1067 -
.../caps_2.10.0.s390x.replies | 16608 -------------
.../caps_2.10.0.s390x.xml | 1277 -
.../caps_2.10.0.x86_64.replies | 19329 --------------
.../caps_2.10.0.x86_64.xml | 997 -
.../caps_2.4.0.x86_64.replies | 4868 ----
.../caps_2.4.0.x86_64.xml | 263 -
.../caps_2.5.0.x86_64.replies | 12506 ----------
.../caps_2.5.0.x86_64.xml | 273 -
.../caps_2.6.0.aarch64.replies | 13317 ----------
.../caps_2.6.0.aarch64.xml | 283 -
.../caps_2.6.0.ppc64.replies | 15692 ------------
.../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1026 -
.../caps_2.6.0.x86_64.replies | 13061 ----------
.../caps_2.6.0.x86_64.xml | 273 -
.../caps_2.7.0.s390x.replies | 12137 ---------
.../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 113 -
.../caps_2.7.0.x86_64.replies | 13680 ----------
.../caps_2.7.0.x86_64.xml | 284 -
.../caps_2.8.0.s390x.replies | 13553 ----------
.../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 265 -
.../caps_2.8.0.x86_64.replies | 14594 -----------
.../caps_2.8.0.x86_64.xml | 419 -
.../caps_2.9.0.ppc64.replies | 19514 ---------------
.../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1056 -
.../caps_2.9.0.s390x.replies | 14607 -----------
.../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 273 -
.../caps_2.9.0.x86_64.replies | 18290 --------------
.../caps_2.9.0.x86_64.xml | 910 -
40 files changed, 263547 deletions(-)
delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
9:56 a.m.
New subject: [RFC PATCH 11/43] virQEMUCapsHasPCIMultiBus: Remove logic for PPC multibus support check
All machine types which have PCI support multibus since qemu 2.0
according to the logic we had, thus we can remove all the machine type
and version checks which are now dead code.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_alias.c | 4 ++--
src/qemu/qemu_capabilities.c | 42 +++---------------------------------
src/qemu/qemu_capabilities.h | 3 +--
src/qemu/qemu_command.c | 4 ++--
4 files changed, 8 insertions(+), 45 deletions(-)
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 1c6f04c0ba..a36b245811 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -122,7 +122,7 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def,
int
qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
- virQEMUCapsPtr qemuCaps,
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED,
virDomainControllerDefPtr controller)
{
const char *prefix = virDomainControllerTypeToString(controller->type);
@@ -131,7 +131,7 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
return 0;
if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
- if (!virQEMUCapsHasPCIMultiBus(qemuCaps, domainDef)) {
+ if (!virQEMUCapsHasPCIMultiBus(domainDef)) {
/* qemus that don't support multiple PCI buses have
* hardcoded the name of their single PCI controller as
* "pci".
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 37ed750f8b..e7ae174bcc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2062,53 +2062,17 @@ virQEMUCapsGet(virQEMUCapsPtr qemuCaps,
}
-bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
- const virDomainDef *def)
+bool virQEMUCapsHasPCIMultiBus(const virDomainDef *def)
{
/* x86_64 and i686 support PCI-multibus on all machine types
* since forever */
if (ARCH_IS_X86(def->os.arch))
return true;
+ /* PPC supports multibus on all machine types which have pci since qemu-2.0.0 */
if (def->os.arch == VIR_ARCH_PPC ||
ARCH_IS_PPC64(def->os.arch)) {
- /*
- * Usage of pci.0 naming:
- *
- * ref405ep: no pci
- * taihu: no pci
- * bamboo: 1.1.0 (<= 1.5.0, so basically forever)
- * mac99: 2.0.0
- * g3beige: 2.0.0
- * prep: 1.4.0 (<= 1.5.0, so basically forever)
- * pseries: 2.0.0
- * mpc8544ds: forever
- * virtex-m507: no pci
- * ppce500: 1.6.0
- */
-
- /* We do not store the qemu version in domain status XML.
- * Hope the user is using a QEMU new enough to use 'pci.0',
- * otherwise the results of this function will be wrong
- * for domains already running at the time of daemon
- * restart */
- if (qemuCaps->version == 0)
- return true;
-
- if (qemuCaps->version >= 2000000)
- return true;
-
- if (qemuCaps->version >= 1006000 &&
- STREQ(def->os.machine, "ppce500"))
- return true;
-
- if (STREQ(def->os.machine, "bamboo") ||
- STREQ(def->os.machine, "mpc8544ds") ||
- STREQ(def->os.machine, "prep")) {
- return true;
- }
-
- return false;
+ return true;
}
/* S390 supports PCI-multibus. */
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 1ca9c1ea7b..b521383f7b 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -634,8 +634,7 @@ bool virQEMUCapsGet(virQEMUCapsPtr qemuCaps,
void virQEMUCapsInitProcessCapsInterlock(virQEMUCapsPtr qemuCaps);
-bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
- const virDomainDef *def);
+bool virQEMUCapsHasPCIMultiBus(const virDomainDef *def);
bool virQEMUCapsSupportsVmport(virQEMUCapsPtr qemuCaps,
const virDomainDef *def);
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 45eb0dc976..0ac899ba80 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -344,7 +344,7 @@ static int
qemuBuildDeviceAddressStr(virBufferPtr buf,
const virDomainDef *domainDef,
virDomainDeviceInfoPtr info,
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
g_autofree char *devStr = NULL;
const char *contAlias = NULL;
@@ -381,7 +381,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
* case, use the default one. */
if (!qemuDomainIsPSeries(domainDef) &&
cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) {
- if (virQEMUCapsHasPCIMultiBus(qemuCaps, domainDef))
+ if (virQEMUCapsHasPCIMultiBus(domainDef))
contAlias = "pci.0";
else
contAlias = "pci";
--
2.30.2
10:48 a.m.
New subject: [RFC PATCH 11/43] virQEMUCapsHasPCIMultiBus: Remove logic for PPC multibus support check
On a Friday in 2021, Peter Krempa wrote:
All machine types which have PCI support multibus since qemu 2.0
according to the logic we had, thus we can remove all the machine type
and version checks which are now dead code.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_alias.c | 4 ++--
src/qemu/qemu_capabilities.c | 42 +++---------------------------------
src/qemu/qemu_capabilities.h | 3 +--
src/qemu/qemu_command.c | 4 ++--
4 files changed, 8 insertions(+), 45 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Yes-please-by: dtto
Jano
9:56 a.m.
New subject: [RFC PATCH 12/43] qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_alias.c | 3 +--
src/qemu/qemu_alias.h | 1 -
src/qemu/qemu_hotplug.c | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index a36b245811..7f93231e0b 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -122,7 +122,6 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def,
int
qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
- virQEMUCapsPtr qemuCaps G_GNUC_UNUSED,
virDomainControllerDefPtr controller)
{
const char *prefix = virDomainControllerTypeToString(controller->type);
@@ -653,7 +652,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
return -1;
}
for (i = 0; i < def->ncontrollers; i++) {
- if (qemuAssignDeviceControllerAlias(def, qemuCaps, def->controllers[i]) <
0)
+ if (qemuAssignDeviceControllerAlias(def, def->controllers[i]) < 0)
return -1;
}
for (i = 0; i < def->ninputs; i++) {
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index fc4bdf35fa..c2be4e2512 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -32,7 +32,6 @@ int qemuAssignDeviceChrAlias(virDomainDefPtr def,
ssize_t idx);
int qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
- virQEMUCapsPtr qemuCaps,
virDomainControllerDefPtr controller);
int qemuAssignDeviceDiskAlias(virDomainDefPtr def,
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 58d2abb862..cb5a536834 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -870,7 +870,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev,
"controller") < 0)
return -1;
- if (qemuAssignDeviceControllerAlias(vm->def, priv->qemuCaps, controller) <
0)
+ if (qemuAssignDeviceControllerAlias(vm->def, controller) < 0)
goto cleanup;
if (qemuBuildControllerDevStr(vm->def, controller, priv->qemuCaps, &devstr)
< 0)
--
2.30.2
10:48 a.m.
New subject: [RFC PATCH 12/43] qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument
On a Friday in 2021, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_alias.c | 3 +--
src/qemu/qemu_alias.h | 1 -
src/qemu/qemu_hotplug.c | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
9:56 a.m.
New subject: [RFC PATCH 13/43] qemuBuildDeviceAddressStr: Remove unused 'qemuCaps'
The qemuCaps is left for the device commandline formatters for now as it
might come in handy.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 73 ++++++++++++++++++++---------------------
1 file changed, 36 insertions(+), 37 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0ac899ba80..a0e489fb59 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -343,8 +343,7 @@ qemuVirCommandGetDevSet(virCommandPtr cmd, int fd)
static int
qemuBuildDeviceAddressStr(virBufferPtr buf,
const virDomainDef *domainDef,
- virDomainDeviceInfoPtr info,
- virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
+ virDomainDeviceInfoPtr info)
{
g_autofree char *devStr = NULL;
const char *contAlias = NULL;
@@ -1830,14 +1829,14 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
qemuBuildVirtioOptionsStr(&opt, disk->virtio);
- if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) <
0)
+ if (qemuBuildDeviceAddressStr(&opt, def, &disk->info) < 0)
return NULL;
break;
case VIR_DOMAIN_DISK_BUS_USB:
virBufferAddLit(&opt, "usb-storage");
- if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) <
0)
+ if (qemuBuildDeviceAddressStr(&opt, def, &disk->info) < 0)
return NULL;
break;
@@ -2303,7 +2302,7 @@ qemuBuildVHostUserFsCommandLine(virCommandPtr cmd,
if (fs->info.bootIndex)
virBufferAsprintf(&opt, ",bootindex=%u", fs->info.bootIndex);
- if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, priv->qemuCaps)
< 0)
+ if (qemuBuildDeviceAddressStr(&opt, def, &fs->info) < 0)
return -1;
virCommandAddArgBuffer(cmd, &opt);
@@ -2378,7 +2377,7 @@ qemuBuildFSDevStr(const virDomainDef *def,
qemuBuildVirtioOptionsStr(&opt, fs->virtio);
- if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&opt, def, &fs->info) < 0)
return NULL;
return virBufferContentAndReset(&opt);
@@ -2772,7 +2771,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
qemuBuildIoEventFdStr(&buf, def->ioeventfd, qemuCaps);
- if (qemuBuildDeviceAddressStr(&buf, domainDef, &def->info, qemuCaps) <
0)
+ if (qemuBuildDeviceAddressStr(&buf, domainDef, &def->info) < 0)
return -1;
*devstr = virBufferContentAndReset(&buf);
@@ -3418,7 +3417,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf,
char *
qemuBuildMemoryDeviceStr(const virDomainDef *def,
virDomainMemoryDefPtr mem,
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
const char *device = NULL;
@@ -3471,7 +3470,7 @@ qemuBuildMemoryDeviceStr(const virDomainDef *def,
virBufferAsprintf(&buf, "memdev=mem%s,id=%s",
mem->info.alias, mem->info.alias);
- if (qemuBuildDeviceAddressStr(&buf, def, &mem->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &mem->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -3631,7 +3630,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
virBufferAsprintf(&buf, ",mac=%s",
virMacAddrFormat(&net->mac, macaddr));
- if (qemuBuildDeviceAddressStr(&buf, def, &net->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &net->info) < 0)
return NULL;
if (qemuBuildRomStr(&buf, &net->info) < 0)
return NULL;
@@ -3840,7 +3839,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
char *
qemuBuildWatchdogDevStr(const virDomainDef *def,
virDomainWatchdogDefPtr dev,
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
@@ -3852,7 +3851,7 @@ qemuBuildWatchdogDevStr(const virDomainDef *def,
}
virBufferAsprintf(&buf, "%s,id=%s", model, dev->info.alias);
- if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -3919,7 +3918,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
}
virBufferAsprintf(&buf, ",id=%s", def->memballoon->info.alias);
- if (qemuBuildDeviceAddressStr(&buf, def, &def->memballoon->info,
qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &def->memballoon->info) <
0)
return -1;
if (def->memballoon->autodeflate != VIR_TRISTATE_SWITCH_ABSENT) {
@@ -4020,7 +4019,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def,
virQEMUBuildBufferEscapeComma(&buf, dev->source.evdev);
}
- if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0)
return NULL;
qemuBuildVirtioOptionsStr(&buf, dev->virtio);
@@ -4031,7 +4030,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def,
static char *
qemuBuildUSBInputDevStr(const virDomainDef *def,
virDomainInputDefPtr dev,
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
@@ -4047,7 +4046,7 @@ qemuBuildUSBInputDevStr(const virDomainDef *def,
break;
}
- if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -4155,7 +4154,7 @@ qemuBuildSoundDevStr(const virDomainDef *def,
return NULL;
virBufferAsprintf(&buf, ",audiodev=%s", audioid);
}
- if (qemuBuildDeviceAddressStr(&buf, def, &sound->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &sound->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -4353,7 +4352,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
virBufferAsprintf(&buf, ",xres=%u,yres=%u", video->res->x,
video->res->y);
}
- if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &video->info) < 0)
return NULL;
qemuBuildVirtioOptionsStr(&buf, video->virtio);
@@ -4535,7 +4534,7 @@ char *
qemuBuildPCIHostdevDevStr(const virDomainDef *def,
virDomainHostdevDefPtr dev,
unsigned int bootIndex, /* used iff dev->info->bootIndex
== 0 */
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virDomainHostdevSubsysPCIPtr pcisrc = &dev->source.subsys.u.pci;
@@ -4570,7 +4569,7 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def,
bootIndex = dev->info->bootIndex;
if (bootIndex)
virBufferAsprintf(&buf, ",bootindex=%u", bootIndex);
- if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, dev->info) < 0)
return NULL;
if (qemuBuildRomStr(&buf, dev->info) < 0)
return NULL;
@@ -4618,7 +4617,7 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def,
if (dev->info->bootIndex)
virBufferAsprintf(&buf, ",bootindex=%u",
dev->info->bootIndex);
- if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, dev->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -4628,13 +4627,13 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def,
static char *
qemuBuildHubDevStr(const virDomainDef *def,
virDomainHubDefPtr dev,
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virBufferAddLit(&buf, "usb-hub");
virBufferAsprintf(&buf, ",id=%s", dev->info.alias);
- if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -4712,7 +4711,7 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def,
vhostfdName,
dev->info->alias);
- if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, dev->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -5131,7 +5130,7 @@
qemuBuildHostdevMdevModelTypeString(virDomainHostdevSubsysMediatedDevPtr mdev)
char *
qemuBuildHostdevMediatedDevStr(const virDomainDef *def,
virDomainHostdevDefPtr dev,
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virDomainHostdevSubsysMediatedDevPtr mdevsrc = &dev->source.subsys.u.mdev;
@@ -5153,7 +5152,7 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *def,
virBufferAsprintf(&buf, ",display=%s",
virTristateSwitchTypeToString(mdevsrc->display));
- if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, dev->info) < 0)
return NULL;
if (dev->info->bootIndex)
@@ -5633,7 +5632,7 @@ qemuBuildRNGDevStr(const virDomainDef *def,
qemuBuildVirtioOptionsStr(&buf, dev->virtio);
- if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -9065,7 +9064,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager,
static char *
qemuBuildShmemDevLegacyStr(virDomainDefPtr def,
virDomainShmemDefPtr shmem,
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
@@ -9089,7 +9088,7 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def,
}
}
- if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -9098,7 +9097,7 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def,
char *
qemuBuildShmemDevStr(virDomainDefPtr def,
virDomainShmemDefPtr shmem,
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
@@ -9130,7 +9129,7 @@ qemuBuildShmemDevStr(virDomainDefPtr def,
virTristateSwitchTypeToString(shmem->msi.ioeventfd));
}
- if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -9578,7 +9577,7 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager,
char *
qemuBuildRedirdevDevStr(const virDomainDef *def,
virDomainRedirdevDefPtr dev,
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
size_t i;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
@@ -9621,7 +9620,7 @@ qemuBuildRedirdevDevStr(const virDomainDef *def,
if (dev->info.bootIndex)
virBufferAsprintf(&buf, ",bootindex=%u", dev->info.bootIndex);
- if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -9744,7 +9743,7 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd,
static char *
qemuBuildTPMDevStr(const virDomainDef *def,
virDomainTPMDefPtr tpm,
- virQEMUCapsPtr qemuCaps)
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
const char *model = virDomainTPMModelTypeToString(tpm->model);
@@ -9755,7 +9754,7 @@ qemuBuildTPMDevStr(const virDomainDef *def,
virBufferAsprintf(&buf, "%s,tpmdev=tpm-%s,id=%s",
model, tpm->info.alias, tpm->info.alias);
- if (qemuBuildDeviceAddressStr(&buf, def, &tpm->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &tpm->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -10325,7 +10324,7 @@ qemuBuildVsockDevStr(virDomainDefPtr def,
qemuBuildVirtioOptionsStr(&buf, vsock->virtio);
- if (qemuBuildDeviceAddressStr(&buf, def, &vsock->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &vsock->info) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -10763,7 +10762,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
virDomainChrSerialTargetModelTypeToString(serial->targetModel),
serial->info.alias, serial->info.alias);
- if (qemuBuildDeviceAddressStr(&buf, def, &serial->info, qemuCaps) < 0)
+ if (qemuBuildDeviceAddressStr(&buf, def, &serial->info) < 0)
return -1;
*deviceStr = virBufferContentAndReset(&buf);
--
2.30.2
10:48 a.m.
New subject: [RFC PATCH 13/43] qemuBuildDeviceAddressStr: Remove unused 'qemuCaps'
On a Friday in 2021, Peter Krempa wrote:
The qemuCaps is left for the device commandline formatters for now as
it
might come in handy.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 73 ++++++++++++++++++++---------------------
1 file changed, 36 insertions(+), 37 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
9:56 a.m.
New subject: [RFC PATCH 14/43] virQEMUCapsInitProcessCaps: Remove obsolete version checks
We no longer have to mask out IOMMU and NVDIMM support as we no longer
support the broken qemu versions.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e7ae174bcc..ec5fcc72b5 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5182,23 +5182,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCapsPtr qemuCaps)
static void
virQEMUCapsInitProcessCaps(virQEMUCapsPtr qemuCaps)
{
- /* 'intel-iommu' shows up as a device since 2.2.0, but can
- * not be used with -device until 2.7.0. Before that it
- * requires -machine iommu=on. So we must clear the device
- * capability we detected on older QEMUs
- */
- if (qemuCaps->version < 2007000 &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_INTEL_IOMMU)) {
- virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_INTEL_IOMMU);
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_IOMMU);
- }
-
- /* Prealloc on NVDIMMs is broken on older QEMUs leading to
- * user data corruption. If we are dealing with such version
- * of QEMU pretend we don't know how to NVDIMM. */
- if (qemuCaps->version < 2009000)
- virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_NVDIMM);
-
if (ARCH_IS_X86(qemuCaps->arch) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE);
--
2.30.2
10:51 a.m.
New subject: [RFC PATCH 14/43] virQEMUCapsInitProcessCaps: Remove obsolete version checks
On a Friday in 2021, Peter Krempa wrote:
We no longer have to mask out IOMMU and NVDIMM support as we no
longer
support the broken qemu versions.
I see QEMU_CAPS_MACHINE_IOMMU still present at the end of this series.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 17 -----------------
1 file changed, 17 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
9:56 a.m.
New subject: [RFC PATCH 15/43] virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks
Now that minimum supported qemu version is 2.11, we can remove the
conditions.
Note that the check enabling QEMU_CAPS_TCG was for < 2.10.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 65 +++++++++---------------------------
1 file changed, 15 insertions(+), 50 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ec5fcc72b5..f5d72e3ef0 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5067,66 +5067,31 @@ virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
static void
virQEMUCapsInitQMPVersionCaps(virQEMUCapsPtr qemuCaps)
{
- if (qemuCaps->version >= 1006000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
-
- /* vmport option is supported v2.2.0 onwards */
- if (qemuCaps->version >= 2002000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
+ /* Following caps were asserted by a version check for pre 2.11 qemus */
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
/* -cpu ...,aarch64=off supported in v2.3.0 and onwards. But it
isn't detectable via qmp at this point */
- if (qemuCaps->arch == VIR_ARCH_AARCH64 &&
- qemuCaps->version >= 2003000)
+ if (qemuCaps->arch == VIR_ARCH_AARCH64)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF);
- /* vhost-user supports multi-queue from v2.4.0 onwards,
- * but there is no way to query for that capability */
- if (qemuCaps->version >= 2004000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
-
- /* smm option is supported from v2.4.0 */
- if (qemuCaps->version >= 2004000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
-
- /* sdl -gl option is supported from v2.4.0 (qemu commit id 0b71a5d5) */
- if (qemuCaps->version >= 2004000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL);
-
- /* Since 2.4.50 ARM virt machine supports gic-version option */
- if (qemuCaps->version >= 2004050)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-
- /* no way to query if -machine kernel_irqchip supports split */
- if (qemuCaps->version >= 2006000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT);
-
- /* HPT resizing is supported since QEMU 2.10 on ppc64; unfortunately
- * there's no sane way to probe for it */
- if (qemuCaps->version >= 2010000 &&
- ARCH_IS_PPC64(qemuCaps->arch)) {
+ if (ARCH_IS_PPC64(qemuCaps->arch)) {
+ /* HPT resizing is supported since QEMU 2.10 on ppc64; unfortunately
+ * there's no sane way to probe for it */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
- }
-
- /* '-display egl-headless' cmdline option is supported since QEMU 2.10, but
- * there's no way to probe it */
- if (qemuCaps->version >= 2010000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
- /* no way to query for -numa dist */
- if (qemuCaps->version >= 2010000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
-
- /* no way to query max-cpu-compat */
- if (qemuCaps->version >= 2010000 &&
- ARCH_IS_PPC64(qemuCaps->arch)) {
+ /* no way to query max-cpu-compat */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT);
}
- /* TCG couldn't be disabled nor queried until QEMU 2.10 */
- if (qemuCaps->version < 2010000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_TCG);
-
/* -enable-fips is deprecated in QEMU 5.2.0, and QEMU
* should be built with gcrypt to achieve FIPS compliance
* automatically / implicitly
--
2.30.2
10:52 a.m.
New subject: [RFC PATCH 15/43] virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks
On a Friday in 2021, Peter Krempa wrote:
Now that minimum supported qemu version is 2.11, we can remove the
conditions.
Note that the check enabling QEMU_CAPS_TCG was for < 2.10.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 65 +++++++++---------------------------
1 file changed, 15 insertions(+), 50 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
9:56 a.m.
New subject: [RFC PATCH 16/43] virQEMUCapsInitQMPBasicArch: Use switch for arch-based decisions
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 56 ++++++++++++++++++++++++++++++++----
1 file changed, 50 insertions(+), 6 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f5d72e3ef0..6ac9f8bcf7 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5046,15 +5046,59 @@ virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps,
void
virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
{
- /* ACPI only works on x86 and aarch64 */
- if (ARCH_IS_X86(qemuCaps->arch) ||
- qemuCaps->arch == VIR_ARCH_AARCH64) {
+ switch (qemuCaps->arch) {
+ case VIR_ARCH_I686:
+ case VIR_ARCH_X86_64:
+ /* ACPI only works on x86 and aarch64 */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
- }
- /* HPET is x86 specific */
- if (ARCH_IS_X86(qemuCaps->arch))
+ /* HPET is x86 specific */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
+ break;
+
+ case VIR_ARCH_AARCH64:
+ /* ACPI only works on x86 and aarch64 */
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
+ break;
+
+ case VIR_ARCH_PPC64:
+ case VIR_ARCH_PPC64LE:
+ case VIR_ARCH_ALPHA:
+ case VIR_ARCH_PPC:
+ case VIR_ARCH_PPCEMB:
+ case VIR_ARCH_SH4:
+ case VIR_ARCH_SH4EB:
+ case VIR_ARCH_RISCV32:
+ case VIR_ARCH_RISCV64:
+ case VIR_ARCH_S390:
+ case VIR_ARCH_S390X:
+ case VIR_ARCH_SPARC:
+ case VIR_ARCH_SPARC64:
+ case VIR_ARCH_ARMV6L:
+ case VIR_ARCH_ARMV7L:
+ case VIR_ARCH_ARMV7B:
+ case VIR_ARCH_CRIS:
+ case VIR_ARCH_ITANIUM:
+ case VIR_ARCH_LM32:
+ case VIR_ARCH_M68K:
+ case VIR_ARCH_MICROBLAZE:
+ case VIR_ARCH_MICROBLAZEEL:
+ case VIR_ARCH_MIPS:
+ case VIR_ARCH_MIPSEL:
+ case VIR_ARCH_MIPS64:
+ case VIR_ARCH_MIPS64EL:
+ case VIR_ARCH_OR32:
+ case VIR_ARCH_PARISC:
+ case VIR_ARCH_PARISC64:
+ case VIR_ARCH_PPCLE:
+ case VIR_ARCH_UNICORE32:
+ case VIR_ARCH_XTENSA:
+ case VIR_ARCH_XTENSAEB:
+ case VIR_ARCH_NONE:
+ case VIR_ARCH_LAST:
+ default:
+ break;
+ }
}
--
2.30.2
10:53 a.m.
New subject: [RFC PATCH 16/43] virQEMUCapsInitQMPBasicArch: Use switch for arch-based decisions
On a Friday in 2021, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 56 ++++++++++++++++++++++++++++++++----
1 file changed, 50 insertions(+), 6 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f5d72e3ef0..6ac9f8bcf7 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5046,15 +5046,59 @@ virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps,
void
virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
{
- /* ACPI only works on x86 and aarch64 */
- if (ARCH_IS_X86(qemuCaps->arch) ||
- qemuCaps->arch == VIR_ARCH_AARCH64) {
+ switch (qemuCaps->arch) {
+ case VIR_ARCH_I686:
+ case VIR_ARCH_X86_64:
+ /* ACPI only works on x86 and aarch64 */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
- }
- /* HPET is x86 specific */
- if (ARCH_IS_X86(qemuCaps->arch))
+ /* HPET is x86 specific */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
+ break;
+
+ case VIR_ARCH_AARCH64:
+ /* ACPI only works on x86 and aarch64 */
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
+ break;
+
+ case VIR_ARCH_PPC64:
+ case VIR_ARCH_PPC64LE:
+ case VIR_ARCH_ALPHA:
+ case VIR_ARCH_PPC:
+ case VIR_ARCH_PPCEMB:
+ case VIR_ARCH_SH4:
+ case VIR_ARCH_SH4EB:
+ case VIR_ARCH_RISCV32:
+ case VIR_ARCH_RISCV64:
+ case VIR_ARCH_S390:
+ case VIR_ARCH_S390X:
+ case VIR_ARCH_SPARC:
+ case VIR_ARCH_SPARC64:
+ case VIR_ARCH_ARMV6L:
+ case VIR_ARCH_ARMV7L:
+ case VIR_ARCH_ARMV7B:
+ case VIR_ARCH_CRIS:
+ case VIR_ARCH_ITANIUM:
+ case VIR_ARCH_LM32:
+ case VIR_ARCH_M68K:
+ case VIR_ARCH_MICROBLAZE:
+ case VIR_ARCH_MICROBLAZEEL:
+ case VIR_ARCH_MIPS:
+ case VIR_ARCH_MIPSEL:
+ case VIR_ARCH_MIPS64:
+ case VIR_ARCH_MIPS64EL:
+ case VIR_ARCH_OR32:
+ case VIR_ARCH_PARISC:
+ case VIR_ARCH_PARISC64:
+ case VIR_ARCH_PPCLE:
+ case VIR_ARCH_UNICORE32:
+ case VIR_ARCH_XTENSA:
+ case VIR_ARCH_XTENSAEB:
+ case VIR_ARCH_NONE:
+ case VIR_ARCH_LAST:
Optimistic to the _LAST case.
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
+ default:
+ break;
+ }
}
--
2.30.2
9:56 a.m.
New subject: [RFC PATCH 17/43] qemuxml2argvtest: Rewrite parsing of XMLs to provide earlier parsing
In upcoming patches we'll need to parse a certain bit of XML before
calling the full XML parser. This effectively open-codes what
virDomainDefParseFile to reach virDomainDefParseNode.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5e062eefcb..aa6ae9bb4b 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -645,6 +645,9 @@ testCompareXMLToArgv(const void *data)
char *log = NULL;
g_autoptr(virCommand) cmd = NULL;
qemuDomainObjPrivatePtr priv = NULL;
+ g_autoptr(xmlDoc) xml = NULL;
+ g_autoptr(xmlXPathContext) ctxt = NULL;
+ xmlNodePtr root;
if (info->arch != VIR_ARCH_NONE && info->arch != VIR_ARCH_X86_64)
qemuTestSetHostArch(&driver, info->arch);
@@ -668,6 +671,21 @@ testCompareXMLToArgv(const void *data)
if (testCheckExclusiveFlags(info->flags) < 0)
goto cleanup;
+ if (!(xml = virXMLParse(info->infile, NULL, "(domain_definition)")))
+ goto cleanup;
+
+ root = xmlDocGetRootElement(xml);
+ if (!virXMLNodeNameEqual(root, "domain")) {
+ VIR_TEST_VERBOSE("unexpected root element <%s>, expecting
<domain>",
+ root->name);
+ goto cleanup;
+ }
+
+ if (!(ctxt = virXMLXPathContextNew(xml)))
+ goto cleanup;
+
+ ctxt->node = root;
+
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
goto cleanup;
@@ -686,9 +704,9 @@ testCompareXMLToArgv(const void *data)
}
parseFlags |= VIR_DOMAIN_DEF_PARSE_INACTIVE;
- if (!(vm->def = virDomainDefParseFile(info->infile,
- driver.xmlopt,
- NULL, parseFlags))) {
+
+ if (!(vm->def = virDomainDefParseNode(xml, root, driver.xmlopt, NULL,
+ parseFlags))) {
err = virGetLastError();
if (!err) {
VIR_TEST_DEBUG("no error was reported for expected parse error");
--
2.30.2
7:16 a.m.
New subject: [RFC PATCH 17/43] qemuxml2argvtest: Rewrite parsing of XMLs to provide earlier parsing
On Fri, Apr 09, 2021 at 04:56:53PM +0200, Peter Krempa wrote:
In upcoming patches we'll need to parse a certain bit of XML
before
calling the full XML parser. This effectively open-codes what
virDomainDefParseFile to reach virDomainDefParseNode.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
Can be pushed now.
9:56 a.m.
New subject: [RFC PATCH 18/43] qemuxml2argvtest: Parse 'arch' from XML early
If we want to provide correct (fake) caps already for the XML parser we
need to be able to parse the arch early so that we can properly
initialize the caps cache prior to calling the XML parser.
This patch adds code which parses the arch and updates the caps cache
prior to the parse step.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index aa6ae9bb4b..eb1bec88f2 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -353,13 +353,13 @@ testAddCPUModels(virQEMUCapsPtr caps, bool skipLegacy)
static int
testUpdateQEMUCaps(const struct testQemuInfo *info,
- virDomainObjPtr vm,
+ virArch arch,
virCapsPtr caps)
{
if (!caps)
return -1;
- virQEMUCapsSetArch(info->qemuCaps, vm->def->os.arch);
+ virQEMUCapsSetArch(info->qemuCaps, arch);
virQEMUCapsInitQMPBasicArch(info->qemuCaps);
@@ -648,6 +648,8 @@ testCompareXMLToArgv(const void *data)
g_autoptr(xmlDoc) xml = NULL;
g_autoptr(xmlXPathContext) ctxt = NULL;
xmlNodePtr root;
+ g_autofree char *archstr = NULL;
+ virArch arch = VIR_ARCH_NONE;
if (info->arch != VIR_ARCH_NONE && info->arch != VIR_ARCH_X86_64)
qemuTestSetHostArch(&driver, info->arch);
@@ -686,6 +688,17 @@ testCompareXMLToArgv(const void *data)
ctxt->node = root;
+ if ((archstr = virXPathString("string(./os/type[1]/@arch)", ctxt))) {
+ if ((arch = virArchFromString(archstr)) == VIR_ARCH_NONE) {
+ arch = virArchFromHost();
+ }
+ }
+
+ if (!(info->flags & FLAG_REAL_CAPS)) {
+ if (testUpdateQEMUCaps(info, arch, driver.caps) < 0)
+ goto cleanup;
+ }
+
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
goto cleanup;
@@ -739,7 +752,7 @@ testCompareXMLToArgv(const void *data)
goto cleanup;
if (!(info->flags & FLAG_REAL_CAPS)) {
- if (testUpdateQEMUCaps(info, vm, driver.caps) < 0)
+ if (testUpdateQEMUCaps(info, vm->def->os.arch, driver.caps) < 0)
goto cleanup;
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
goto cleanup;
--
2.30.2
7:17 a.m.
New subject: [RFC PATCH 18/43] qemuxml2argvtest: Parse 'arch' from XML early
On Fri, Apr 09, 2021 at 04:56:54PM +0200, Peter Krempa wrote:
If we want to provide correct (fake) caps already for the XML parser
we
need to be able to parse the arch early so that we can properly
initialize the caps cache prior to calling the XML parser.
This patch adds code which parses the arch and updates the caps cache
prior to the parse step.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
Can be pushed now.
9:56 a.m.
New subject: [RFC PATCH 19/43] qemuxml2xmltest: Always include basic set of capabilities
Use virQEMUCapsInitQMPBasicArch to add the basic set of capabilities
which all qemu versions will get.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2xmltest.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index c7030a22e9..f0030966a8 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -15,6 +15,9 @@
#include "virfilewrapper.h"
#include "configmake.h"
+#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
+#include "qemu/qemu_capspriv.h"
+
#define VIR_FROM_THIS VIR_FROM_NONE
static virQEMUDriver driver;
@@ -26,11 +29,27 @@ enum {
};
+static int
+testXML2XMLCommon(const struct testQemuInfo *info)
+{
+ if (!(info->flags & FLAG_REAL_CAPS)) {
+ virQEMUCapsInitQMPBasicArch(info->qemuCaps);
+ if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
+ return -1;
+ }
+
+ return 0;
+}
+
+
static int
testXML2XMLActive(const void *opaque)
{
const struct testQemuInfo *info = opaque;
+ if (testXML2XMLCommon(info) < 0)
+ return -1;
+
return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt,
info->infile, info->outfile, true,
info->parseFlags,
@@ -43,6 +62,9 @@ testXML2XMLInactive(const void *opaque)
{
const struct testQemuInfo *info = opaque;
+ if (testXML2XMLCommon(info) < 0)
+ return -1;
+
return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt,
info->infile, info->outfile, false,
info->parseFlags,
--
2.30.2
7:17 a.m.
New subject: [RFC PATCH 19/43] qemuxml2xmltest: Always include basic set of capabilities
On Fri, Apr 09, 2021 at 04:56:55PM +0200, Peter Krempa wrote:
Use virQEMUCapsInitQMPBasicArch to add the basic set of capabilities
which all qemu versions will get.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2xmltest.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
Can be pushed now.
9:56 a.m.
New subject: [RFC PATCH 20/43] qemu: capabilities: Move setting of QEMU_CAPS_CPU_AARCH64_OFF to virQEMUCapsInitQMPBasicArch
It's now always set for AARCH64, move it into the function setting basic
caps for the emulator.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6ac9f8bcf7..535f2d7e55 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5059,6 +5059,9 @@ virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
case VIR_ARCH_AARCH64:
/* ACPI only works on x86 and aarch64 */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
+
+ /* -cpu ...,aarch64=off is not detectable via qmp at this point */
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF);
break;
case VIR_ARCH_PPC64:
@@ -5122,11 +5125,6 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCapsPtr qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
- /* -cpu ...,aarch64=off supported in v2.3.0 and onwards. But it
- isn't detectable via qmp at this point */
- if (qemuCaps->arch == VIR_ARCH_AARCH64)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF);
-
if (ARCH_IS_PPC64(qemuCaps->arch)) {
/* HPT resizing is supported since QEMU 2.10 on ppc64; unfortunately
* there's no sane way to probe for it */
--
2.30.2
9:56 a.m.
New subject: [RFC PATCH 21/43] qemuxml2argvtest: Remove negative test case 'pseries-features-htp-resize'
All supported qemu versions now have the flag so the test doesn't make
sense any more.
The flag setting will be moved to virQEMUCapsInitQMPBasicArch which will
make this test fail.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../qemuxml2argvdata/pseries-features-htp-resize.err | 1 -
.../qemuxml2argvdata/pseries-features-htp-resize.xml | 1 -
tests/qemuxml2argvtest.c | 11 -----------
3 files changed, 13 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/pseries-features-htp-resize.err
delete mode 120000 tests/qemuxml2argvdata/pseries-features-htp-resize.xml
diff --git a/tests/qemuxml2argvdata/pseries-features-htp-resize.err
b/tests/qemuxml2argvdata/pseries-features-htp-resize.err
deleted file mode 100644
index d35c66b819..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-htp-resize.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: HTP resizing is not supported by this QEMU binary
diff --git a/tests/qemuxml2argvdata/pseries-features-htp-resize.xml
b/tests/qemuxml2argvdata/pseries-features-htp-resize.xml
deleted file mode 120000
index e7b69bba78..0000000000
--- a/tests/qemuxml2argvdata/pseries-features-htp-resize.xml
+++ /dev/null
@@ -1 +0,0 @@
-pseries-features.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index eb1bec88f2..1cab5a36e9 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2318,17 +2318,6 @@ mymain(void)
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS,
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
- /* parse error: no QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT */
- DO_TEST_PARSE_ERROR("pseries-features-htp-resize",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
- QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
- QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
- QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST,
- QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC,
- QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
- QEMU_CAPS_MACHINE_PSERIES_CAP_IBS);
-
/* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE */
DO_TEST_PARSE_ERROR("pseries-features-hpt-pagesize",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
--
2.30.2
9:56 a.m.
New subject: [RFC PATCH 22/43] qemu: capabilities: Move setting of PPC specific flags to virQEMUCapsInitQMPBasicArch
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT and
QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT are now always asserted on PPC
machine types, move them to virQEMUCapsInitQMPBasicArch.
It's now always set for AARCH64, move it into the function setting basic
caps for the emulator.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 13 ++++---------
.../qemuxml2argvdata/pseries-cpu-compat-power9.args | 4 ++--
tests/qemuxml2argvdata/pseries-cpu-compat.args | 4 ++--
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 535f2d7e55..347e32d68b 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5066,6 +5066,10 @@ virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
case VIR_ARCH_PPC64:
case VIR_ARCH_PPC64LE:
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT);
+ break;
+
case VIR_ARCH_ALPHA:
case VIR_ARCH_PPC:
case VIR_ARCH_PPCEMB:
@@ -5125,15 +5129,6 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCapsPtr qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
- if (ARCH_IS_PPC64(qemuCaps->arch)) {
- /* HPT resizing is supported since QEMU 2.10 on ppc64; unfortunately
- * there's no sane way to probe for it */
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
-
- /* no way to query max-cpu-compat */
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT);
- }
-
/* -enable-fips is deprecated in QEMU 5.2.0, and QEMU
* should be built with gcrypt to achieve FIPS compliance
* automatically / implicitly
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
index 00857740ae..f7f500da39 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
@@ -10,8 +10,8 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
-S \
--machine pseries,accel=kvm,usb=off,dump-guest-core=off \
--cpu host,compat=power9 \
+-machine pseries,accel=kvm,usb=off,dump-guest-core=off,max-cpu-compat=power9 \
+-cpu host \
-m 256 \
-realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-cpu-compat.args
index 8ace0b1623..7871651f9b 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args
@@ -10,8 +10,8 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
-S \
--machine pseries,accel=kvm,usb=off,dump-guest-core=off \
--cpu host,compat=power7 \
+-machine pseries,accel=kvm,usb=off,dump-guest-core=off,max-cpu-compat=power7 \
+-cpu host \
-m 256 \
-realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \
--
2.30.2
9:56 a.m.
New subject: [RFC PATCH 23/43] qemuxml2argvtest: Remove negative test for gic v3/host
QEMU_CAPS_MACH_VIRT_GIC_VERSION will be assumed for all aarch64 machines
starting from next commit, so this test will become invalid. Remove it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/aarch64-gic-host.err | 1 -
tests/qemuxml2argvdata/aarch64-gic-v3.err | 1 -
tests/qemuxml2argvtest.c | 4 ----
3 files changed, 6 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-host.err
delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-v3.err
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.err
b/tests/qemuxml2argvdata/aarch64-gic-host.err
deleted file mode 100644
index 448d5da391..0000000000
--- a/tests/qemuxml2argvdata/aarch64-gic-host.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: gic-version option is not available with this QEMU binary
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.err
b/tests/qemuxml2argvdata/aarch64-gic-v3.err
deleted file mode 100644
index 448d5da391..0000000000
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: gic-version option is not available with this QEMU binary
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1cab5a36e9..5e17432a37 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3049,8 +3049,6 @@ mymain(void)
DO_TEST_GIC("aarch64-gic-v2", GIC_BOTH,
QEMU_CAPS_KVM,
QEMU_CAPS_MACH_VIRT_GIC_VERSION);
- DO_TEST_FAILURE("aarch64-gic-v3",
- QEMU_CAPS_KVM, NONE);
DO_TEST_GIC("aarch64-gic-v3", GIC_NONE,
QEMU_CAPS_KVM,
QEMU_CAPS_MACH_VIRT_GIC_VERSION);
@@ -3063,8 +3061,6 @@ mymain(void)
DO_TEST_GIC("aarch64-gic-v3", GIC_BOTH,
QEMU_CAPS_KVM,
QEMU_CAPS_MACH_VIRT_GIC_VERSION);
- DO_TEST_FAILURE("aarch64-gic-host",
- QEMU_CAPS_KVM, NONE);
DO_TEST_GIC("aarch64-gic-host", GIC_NONE,
QEMU_CAPS_KVM,
QEMU_CAPS_MACH_VIRT_GIC_VERSION);
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 24/43] qemu: capabilities: Move setting of QEMU_CAPS_MACH_VIRT_GIC_VERSION to virQEMUCapsInitQMPBasicArch
Move it under AARCH 64, since it's a platform specific feature, thus it
will be removed from all other platforms.
Since virQEMUCapsInitQMPBasicArch is used in qemuxml2argv test to
initiate qemuCaps for tests with fake capabilities, all the tests gain
GIC support now.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 4 +++-
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 2 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +-
tests/qemuxml2argvdata/aarch64-cpu-passthrough.args | 2 +-
tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 2 +-
tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +-
tests/qemuxml2argvdata/aarch64-pci-serial.args | 2 +-
tests/qemuxml2argvdata/aarch64-traditional-pci.args | 2 +-
tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args | 2 +-
tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args | 2 +-
tests/qemuxml2argvdata/aarch64-video-default.args | 2 +-
tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args | 2 +-
.../qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args | 2 +-
tests/qemuxml2argvdata/aarch64-virt-default-nic.args | 2 +-
tests/qemuxml2argvdata/aarch64-virt-virtio.args | 2 +-
tests/qemuxml2argvdata/aarch64-virtio-pci-default.args | 2 +-
.../qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args | 2 +-
tests/qemuxml2argvdata/balloon-mmio-deflate.args | 2 +-
tests/qemuxml2argvdata/mach-virt-console-virtio.args | 2 +-
tests/qemuxml2argvdata/mach-virt-serial-native.args | 2 +-
tests/qemuxml2argvdata/mach-virt-serial-pci.args | 2 +-
tests/qemuxml2argvdata/mach-virt-serial-usb.args | 2 +-
53 files changed, 24 insertions(+), 53 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 347e32d68b..ea1c0a093f 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5062,6 +5062,9 @@ virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
/* -cpu ...,aarch64=off is not detectable via qmp at this point */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF);
+
+ /* gic is arm specific */
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
break;
case VIR_ARCH_PPC64:
@@ -5124,7 +5127,6 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCapsPtr qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL);
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 23ccb98c2a..5424d9e10d 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -48,7 +48,6 @@
<flag name='vhost-user-multiqueue'/>
<flag name='migration-event'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 5e310a452b..53da19ab37 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -100,7 +100,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 2b274dbbce..adda67292e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -74,7 +74,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index f74a4a807a..348c4a0137 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -48,7 +48,6 @@
<flag name='vhost-user-multiqueue'/>
<flag name='migration-event'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index f160c7d16e..fa6f941ef1 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -100,7 +100,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 09291babd6..58c9bf5911 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -73,7 +73,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 1c67d1b0a2..7cf5783af7 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -38,7 +38,6 @@
<flag name='vhost-user-multiqueue'/>
<flag name='migration-event'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 018747e385..b5f6ce92cb 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -38,7 +38,6 @@
<flag name='vhost-user-multiqueue'/>
<flag name='migration-event'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index fd5279987a..c9dc855dda 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -49,7 +49,6 @@
<flag name='vhost-user-multiqueue'/>
<flag name='migration-event'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 8bf6c831b1..7bc384aa47 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -99,7 +99,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 0464a8e456..fc47a03ec5 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -74,7 +74,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 1a3177d561..162b7d01d3 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -99,7 +99,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 3c32aceaf9..cff1446571 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -79,7 +79,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 3741f75aff..fe66c3d8d2 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -84,7 +84,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index c2ee65a232..38cc9c4de3 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -84,7 +84,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 3b25aabf93..69b2106043 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -49,7 +49,6 @@
<flag name='vhost-user-multiqueue'/>
<flag name='migration-event'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 5c2511eaa7..8df0bf7192 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -98,7 +98,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 49d5fc5578..13a7053940 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -98,7 +98,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index d18776778d..ddbd2c7433 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -79,7 +79,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 67c6f9248c..5be3113789 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -49,7 +49,6 @@
<flag name='vhost-user-multiqueue'/>
<flag name='migration-event'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 28f6666f7f..436cfe952b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -99,7 +99,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 3dd4139263..9388de40d0 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -80,7 +80,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 5993348d6b..8df6622737 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -84,7 +84,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 9467e4cfeb..b8a9ecf025 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -99,7 +99,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index a4838def4d..8f5d9a7565 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -37,7 +37,6 @@
<flag name='dea-key-wrap'/>
<flag name='vhost-user-multiqueue'/>
<flag name='migration-event'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 12bb9a1b0f..86b87647a9 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -99,7 +99,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 673d8b38ad..c8978d8e23 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -79,7 +79,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index da2320fd69..1a903d830e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -83,7 +83,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index a54b9bb096..675967ebbc 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -48,7 +48,6 @@
<flag name='vhost-user-multiqueue'/>
<flag name='migration-event'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 2fee135b1e..92c8688f31 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -99,7 +99,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 8cc949d735..754319fa48 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -98,7 +98,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
- <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/>
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 2e57c25058..bcc15a6f2e 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index 5ec12926fe..c51a2af9fd 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
-drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,unit=1 \
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index 6e3d4cda7a..1d334a84b8 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
-S \
--machine virt,accel=kvm,usb=off,dump-guest-core=off \
+-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
-cpu host \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
index 2a1fa4d5da..58b9449e1a 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
index 16632d78ee..2b2c62d779 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
-drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,unit=1 \
diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args
b/tests/qemuxml2argvdata/aarch64-pci-serial.args
index 64b0e6add1..9eff44146e 100644
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 1024 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
index 7230f8eb65..3f3a2627fe 100644
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 1024 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
index 1edf699001..2e337daf3e 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name QEMUGuest1 \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
index a6c2c0a556..ab4998aad6 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name QEMUGuest1 \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args
b/tests/qemuxml2argvdata/aarch64-video-default.args
index 01f6a3a617..b1fa1d9878 100644
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64-vgpu \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index 06c5a0c111..fd93d0772e 100644
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64-vgpu \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
index 83fffee500..37943c18a1 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
-S \
--machine virt-2.6,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt-2.6,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
index e9de59e63e..ca0de65601 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64-virt-default-nic \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index 634bece765..ea586f8a92 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index 3250ac3ba7..c8db3d4f96 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index 35d64aea0c..5d2461ccc9 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
index d6e76ba103..11286eaa53 100644
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
index 83488b30c3..51c95eee17 100644
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 512 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args
b/tests/qemuxml2argvdata/mach-virt-serial-native.args
index 0adf172b26..96ebf677b7 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 512 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
index a45fc55666..b44566f1e0 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 512 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
index dc83a571e6..e619ff3fa4 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
-S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 512 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 25/43] qemuxml2argvtest: Remove negative test case for 'net-vhostuser-multiq'
QEMU_CAPS_VHOSTUSER_MULTIQUEUE is now always enabled, so the negative
case doesn't make sense.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/net-vhostuser-multiq.err | 1 -
tests/qemuxml2argvtest.c | 1 -
2 files changed, 2 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.err
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.err
b/tests/qemuxml2argvdata/net-vhostuser-multiq.err
deleted file mode 100644
index 437112764e..0000000000
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: interface 52:54:00:ee:96:6e - multiqueue is not supported for
network interfaces of type vhost-user with this QEMU binary
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5e17432a37..12508fc51c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1622,7 +1622,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("net-vhostuser");
DO_TEST("net-vhostuser-multiq",
QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
- DO_TEST_FAILURE("net-vhostuser-multiq", NONE);
DO_TEST_FAILURE("net-vhostuser-fail",
QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
DO_TEST("net-user", NONE);
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 26/43] qemuxml2argvtest: Remove tests for absence of QEMU_CAPS_DEVICE_VIDEO_PRIMARY
All supported qemu versions now have the capability so testing the
absence doesn't make sense.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../qemuxml2argvdata/video-qxl-nodevice.args | 32 -------------------
tests/qemuxml2argvdata/video-qxl-nodevice.xml | 29 -----------------
.../qemuxml2argvdata/video-vga-nodevice.args | 30 -----------------
tests/qemuxml2argvdata/video-vga-nodevice.xml | 29 -----------------
tests/qemuxml2argvtest.c | 2 --
5 files changed, 122 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.xml
delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.args
delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.xml
diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.args
b/tests/qemuxml2argvdata/video-qxl-nodevice.args
deleted file mode 100644
index 2ef92283df..0000000000
--- a/tests/qemuxml2argvdata/video-qxl-nodevice.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
--S \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--usb \
--drive
file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none
\
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=67108864 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.xml
b/tests/qemuxml2argvdata/video-qxl-nodevice.xml
deleted file mode 100644
index d52fdf0fa0..0000000000
--- a/tests/qemuxml2argvdata/video-qxl-nodevice.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>1048576</memory>
- <currentMemory unit='KiB'>1048576</currentMemory>
- <vcpu>1</vcpu>
- <os>
- <type arch='i686' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2' cache='none'/>
- <source file='/var/lib/libvirt/images/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <controller type='ide' index='0'/>
- <video>
- <model type='qxl' heads='1'/>
- </video>
- <memballoon model='virtio'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.args
b/tests/qemuxml2argvdata/video-vga-nodevice.args
deleted file mode 100644
index c290c203e5..0000000000
--- a/tests/qemuxml2argvdata/video-vga-nodevice.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
--S \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--usb \
--drive
file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none
\
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--vga std \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.xml
b/tests/qemuxml2argvdata/video-vga-nodevice.xml
deleted file mode 100644
index 7e2080af0d..0000000000
--- a/tests/qemuxml2argvdata/video-vga-nodevice.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>1048576</memory>
- <currentMemory unit='KiB'>1048576</currentMemory>
- <vcpu>1</vcpu>
- <os>
- <type arch='i686' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2' cache='none'/>
- <source file='/var/lib/libvirt/images/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <controller type='ide' index='0'/>
- <video>
- <model type='vga' vram='16384' heads='1'/>
- </video>
- <memballoon model='virtio'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 12508fc51c..df7fbe3360 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2456,12 +2456,10 @@ mymain(void)
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-vga-nodevice", QEMU_CAPS_DEVICE_VGA);
DO_TEST("video-vga-device", QEMU_CAPS_DEVICE_VGA,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
DO_TEST("video-vga-device-vgamem", QEMU_CAPS_DEVICE_VGA,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_VGAMEM);
- DO_TEST("video-qxl-nodevice", QEMU_CAPS_DEVICE_QXL);
DO_TEST("video-qxl-device",
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 27/43] qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to virQEMUCapsInitQMPBasicArch
Until we clean up and remove all capabilities which no longer make sense
to have separately, we should use virQEMUCapsInitQMPBasicArch to set the
defaults as it's used by qemuxml2argvtest when testing with fake
capabilities.
This allows us to prevent testing dead code paths with the fake
capability tests.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 7 +++++--
tests/qemuxml2argvdata/audio-default-sdl.args | 2 +-
tests/qemuxml2argvdata/audio-default-spice.args | 2 +-
tests/qemuxml2argvdata/audio-default-vnc.args | 2 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 2 +-
tests/qemuxml2argvdata/controller-order.args | 2 +-
tests/qemuxml2argvdata/graphics-egl-headless.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args | 4 +---
tests/qemuxml2argvdata/graphics-spice-agentmouse.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-auto-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-compression.args | 4 +---
tests/qemuxml2argvdata/graphics-spice-egl-headless.args | 4 +---
tests/qemuxml2argvdata/graphics-spice-no-args.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 4 +---
tests/qemuxml2argvdata/graphics-spice-sasl.args | 4 +---
tests/qemuxml2argvdata/graphics-spice-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-timeout.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-usb-redir.args | 2 +-
tests/qemuxml2argvdata/graphics-spice.args | 4 +---
tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-auto-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-egl-headless.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-none.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-policy.args | 2 +-
.../graphics-vnc-remove-generated-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 2 +-
.../qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-websocket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +-
tests/qemuxml2argvdata/pci-bridge.args | 2 +-
tests/qemuxml2argvdata/pci-many.args | 2 +-
tests/qemuxml2argvdata/user-aliases.args | 2 +-
tests/qemuxml2argvdata/video-vga-qxl-heads.args | 5 +----
42 files changed, 46 insertions(+), 58 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ea1c0a093f..36836cad3d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5041,11 +5041,15 @@ virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps,
* virQEMUCapsInitQMPBasicArch:
* @qemuCaps: QEMU capabilities
*
- * Initialize @qemuCaps with basic architecture-dependent capabilities.
+ * Initialize @qemuCaps with basic always present and architecture-dependent
+ * capabilities.
*/
void
virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
{
+ /* Following caps were asserted by a version check for pre 2.11 qemus */
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+
switch (qemuCaps->arch) {
case VIR_ARCH_I686:
case VIR_ARCH_X86_64:
@@ -5122,7 +5126,6 @@ static void
virQEMUCapsInitQMPVersionCaps(virQEMUCapsPtr qemuCaps)
{
/* Following caps were asserted by a version check for pre 2.11 qemus */
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args
b/tests/qemuxml2argvdata/audio-default-sdl.args
index b3b700e771..459b88c9de 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.args
@@ -27,4 +27,4 @@ SDL_AUDIODRIVER=esd \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-display sdl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args
b/tests/qemuxml2argvdata/audio-default-spice.args
index e6599bdb7b..ca81df013b 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=spice \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-spice port=0,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args
b/tests/qemuxml2argvdata/audio-default-vnc.args
index 7218aa2f99..28709a5c5d 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=alsa \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-vnc 127.0.0.1:0 \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args
b/tests/qemuxml2argvdata/channel-spicevmc.args
index 66b769d741..f0e5cf0333 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -29,5 +29,5 @@ QEMU_AUDIO_DRV=spice \
-chardev spicevmc,id=charchannel0,name=vdagent \
-device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0
\
-spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on
\
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/controller-order.args
b/tests/qemuxml2argvdata/controller-order.args
index 2a372acd9f..721c31691a 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -40,7 +40,7 @@ QEMU_AUDIO_DRV=spice \
-device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0
\
-device usb-tablet,id=input0,bus=usb.0,port=1.2 \
-spice
port=5901,tls-port=5902,addr=0.0.0.0,x509-dir=/etc/pki/libvirt-spice,seamless-migration=on
\
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
-device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=2 \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args
b/tests/qemuxml2argvdata/graphics-egl-headless.args
index 343273fda0..15d6b05f06 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -25,4 +25,4 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-display egl-headless \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index e35091025b..3cb348e818 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -28,4 +28,4 @@ DISPLAY=:0.1 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-full-screen \
-display sdl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args
b/tests/qemuxml2argvdata/graphics-sdl.args
index 4cfa15550a..95e56ebf72 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -27,4 +27,4 @@ DISPLAY=:0.1 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-display sdl \
--vga std
+-device VGA,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
index 1a6f5eabf3..0e561a8b75 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer=on,seamless-migration=on
\
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
-device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
index c4dd28fe47..03c8c58e6c 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
@@ -29,5 +29,5 @@ QEMU_AUDIO_DRV=spice \
-chardev spicevmc,id=charchannel0,name=vdagent \
-device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0
\
-spice
port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on
\
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
index c590bef6af..6f79764446 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=spice \
-no-acpi \
-usb \
-spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
index c590bef6af..6f79764446 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=spice \
-no-acpi \
-usb \
-spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args
b/tests/qemuxml2argvdata/graphics-spice-compression.args
index a2fcbfdd68..7499b1b4b9 100644
--- a/tests/qemuxml2argvdata/graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/graphics-spice-compression.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,seamless-migration=on
\
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
-device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
index 38a1b3aa23..66d6e491bd 100644
--- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
@@ -27,7 +27,5 @@ QEMU_AUDIO_DRV=spice \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-spice port=5903,addr=127.0.0.1,seamless-migration=on \
-display egl-headless \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args
b/tests/qemuxml2argvdata/graphics-spice-no-args.args
index 4d0d4fa10c..016d19d9eb 100644
--- a/tests/qemuxml2argvdata/graphics-spice-no-args.args
+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args
@@ -24,5 +24,5 @@ QEMU_AUDIO_DRV=spice \
-no-acpi \
-usb \
-spice port=0,seamless-migration=on \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
index d4892deb58..f9ba765198 100644
--- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,seamless-migration=on
\
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
-device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args
b/tests/qemuxml2argvdata/graphics-spice-sasl.args
index 2bec8485a9..306f292388 100644
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
@@ -27,7 +27,5 @@ SASL_CONF_PATH=/root/.sasl2 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-spice
port=5903,tls-port=5904,addr=127.0.0.1,sasl=on,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,seamless-migration=on
\
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args
b/tests/qemuxml2argvdata/graphics-spice-socket.args
index a0fd778a58..71278eaab5 100644
--- a/tests/qemuxml2argvdata/graphics-spice-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=spice \
-no-acpi \
-usb \
-spice unix,addr=/tmp/spice.sock,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args
b/tests/qemuxml2argvdata/graphics-spice-timeout.args
index c23d02d05c..6ff61dfa88 100644
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
@@ -33,6 +33,6 @@ QEMU_AUDIO_DRV=spice \
-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \
-device usb-tablet,id=input0,bus=usb.0,port=1 \
-spice port=5900,addr=127.0.0.1,seamless-migration=on \
--vga std \
+-device VGA,id=video0,bus=pci.0,addr=0x2 \
-device AC97,id=sound0,bus=pci.0,addr=0x3 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
index aae5910b07..cfe591e882 100644
--- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
@@ -27,7 +27,7 @@ QEMU_AUDIO_DRV=spice \
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
-spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,tls-channel=usbredir,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,seamless-migration=on
\
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-chardev socket,id=charredir0,host=localhost,port=4000 \
-device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \
-chardev spicevmc,id=charredir1,name=usbredir \
diff --git a/tests/qemuxml2argvdata/graphics-spice.args
b/tests/qemuxml2argvdata/graphics-spice.args
index 4f5a08621f..7a9e55c59f 100644
--- a/tests/qemuxml2argvdata/graphics-spice.args
+++ b/tests/qemuxml2argvdata/graphics-spice.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-channel=inputs,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,disable-agent-file-xfer=on,seamless-migration=on
\
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
-device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
index 2add4f4332..d11ac68cb1 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
index 351a43351d..bbb464433d 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
index 2090f43609..5e9f417940 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-vnc '[2001:1:2:3:4:5:1234:1234]:3' \
-display egl-headless \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
index dea9aad2c5..4b314c4269 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-vnc '[2001:1:2:3:4:5:1234:1234]:3' \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args
b/tests/qemuxml2argvdata/graphics-vnc-none.args
index 87f9268c59..c75eb0ed52 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-none.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-none.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-vnc none \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args
b/tests/qemuxml2argvdata/graphics-vnc-policy.args
index 8e20230050..dbdfb0074e 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-vnc '[::]:59630,share=allow-exclusive' \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
index 5fff7d85b1..b598886017 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-vnc 127.0.0.1:0 \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
index fd8caee0da..c566c92c00 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
@@ -27,4 +27,4 @@ SASL_CONF_PATH=/root/.sasl2 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-vnc 127.0.0.1:3,sasl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
index e77d772af1..bede4e2e81 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-vnc vnc=unix:/tmp/foo=bar.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-socket.args
index 16f931b32e..d99802b334 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-vnc unix:/tmp/vnc.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index f1e0877a0d..e5b3f87ea0 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -25,4 +25,4 @@ SASL_CONF_PATH=/root/.sasl2 \
-no-acpi \
-usb \
-vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
index 30c10e3490..c4b11106de 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-vnc 127.0.0.1:0,websocket=5700 \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc.args
b/tests/qemuxml2argvdata/graphics-vnc.args
index dea9aad2c5..4b314c4269 100644
--- a/tests/qemuxml2argvdata/graphics-vnc.args
+++ b/tests/qemuxml2argvdata/graphics-vnc.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-vnc '[2001:1:2:3:4:5:1234:1234]:3' \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args
b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index c8abbc3501..65c0f4a15c 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -32,5 +32,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args
b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index 6b2dc13d1c..46fc711e97 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -33,5 +33,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args
b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 5c281de780..f21fb7b7d0 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-virtio-disk0,readonly=on \
-device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/pci-bridge.args
b/tests/qemuxml2argvdata/pci-bridge.args
index 00a9996bfe..571e25cb4d 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -92,5 +92,5 @@ QEMU_AUDIO_DRV=none \
-device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x6 \
-vnc 127.0.0.1:0 \
-k en-us \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 2512b2bdeb..972a5d43ff 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -81,5 +81,5 @@ QEMU_AUDIO_DRV=none \
-device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182
\
-drive
file=/var/lib/libvirt/images/disk-g-b.img,format=raw,if=none,id=drive-virtio-disk183 \
-device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183
\
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/user-aliases.args
b/tests/qemuxml2argvdata/user-aliases.args
index 1656e1df25..0afdab79f8 100644
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -59,7 +59,7 @@ QEMU_AUDIO_DRV=none \
-chardev
socket,id=charchannel0,path=/var/lib/libvirt/qemu/channel/target/gentoo.org.qemu.guest_agent.0,server=on,wait=off
\
-device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0
\
-vnc 127.0.0.1:0 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index 5fa7a53e52..1b0d2862b7 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -26,10 +26,7 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=67108864 \
--global qxl-vga.max_outputs=1 \
+-device
qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,max_outputs=1,bus=pci.0,addr=0x2 \
-device
qxl,id=video1,ram_size=67108864,vram_size=33554432,max_outputs=3,bus=pci.0,addr=0x4 \
-device
qxl,id=video2,ram_size=67108864,vram_size=67108864,max_outputs=7,bus=pci.0,addr=0x5 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 28/43] [fixup] Fix test fallout in tests/qemuxml2argvdata
---
tests/qemuxml2argvdata/autoindex.args | 2 +-
.../qemuxml2argvdata/balloon-device-auto.args | 2 +-
tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +-
tests/qemuxml2argvdata/bios-nvram.args | 2 +-
tests/qemuxml2argvdata/bios.args | 2 +-
tests/qemuxml2argvdata/blkiotune-device.args | 2 +-
tests/qemuxml2argvdata/blkiotune.args | 2 +-
tests/qemuxml2argvdata/boot-complex.args | 8 +-
.../boot-menu-disable-drive.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable.args | 2 +-
.../boot-menu-enable-with-timeout.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable.args | 2 +-
tests/qemuxml2argvdata/boot-multi.args | 2 +-
tests/qemuxml2argvdata/boot-order.args | 6 +-
tests/qemuxml2argvdata/boot-strict.args | 8 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
.../qemuxml2argvdata/channel-virtio-auto.args | 6 +-
.../channel-virtio-autoadd.args | 6 +-
.../channel-virtio-autoassign.args | 4 +-
.../channel-virtio-default.args | 4 +-
.../channel-virtio-state.args | 2 +-
.../qemuxml2argvdata/channel-virtio-unix.args | 2 +-
tests/qemuxml2argvdata/channel-virtio.args | 2 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 4 +-
tests/qemuxml2argvdata/clock-catchup.args | 2 +-
tests/qemuxml2argvdata/clock-france.args | 2 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 2 +-
.../clock-localtime-basis-localtime.args | 2 +-
.../clock-timer-hyperv-rtc.args | 2 +-
tests/qemuxml2argvdata/clock-variable.args | 2 +-
.../qemuxml2argvdata/console-compat-auto.args | 2 +-
.../console-compat-chardev.args | 2 +-
.../qemuxml2argvdata/console-virtio-many.args | 4 +-
tests/qemuxml2argvdata/console-virtio.args | 4 +-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable2.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable3.args | 2 +-
.../cpu-cache-emulate-l3.args | 2 +-
.../cpu-cache-passthrough.args | 2 +-
.../cpu-cache-passthrough2.args | 2 +-
.../cpu-check-default-none.args | 2 +-
.../cpu-check-default-none2.args | 2 +-
.../cpu-check-default-partial.args | 2 +-
.../cpu-check-default-partial2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-none.args | 2 +-
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +-
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +-
tests/qemuxml2argvdata/cpu-exact1.args | 2 +-
.../cpu-exact2-nofallback.args | 2 +-
tests/qemuxml2argvdata/cpu-exact2.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.args | 2 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +-
.../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +-
.../cpu-host-model-fallback.args | 2 +-
.../cpu-host-model-vendor.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.args | 2 +-
.../cpu-host-passthrough-features.args | 2 +-
.../cpu-host-passthrough.args | 2 +-
.../qemuxml2argvdata/cpu-hotplug-startup.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum2.args | 2 +-
.../cpu-no-removed-features.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +-
.../qemuxml2argvdata/cpu-numa-memshared.args | 2 +-
.../cpu-numa-no-memory-element.args | 2 +-
tests/qemuxml2argvdata/cpu-numa1.args | 2 +-
tests/qemuxml2argvdata/cpu-numa2.args | 2 +-
tests/qemuxml2argvdata/cpu-strict1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology2.args | 2 +-
tests/qemuxml2argvdata/cpu-topology3.args | 2 +-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +-
.../qemuxml2argvdata/cputune-zero-shares.args | 2 +-
tests/qemuxml2argvdata/cputune.args | 2 +-
tests/qemuxml2argvdata/debug-threads.args | 2 +-
.../default-kvm-host-arch.args | 2 +-
.../default-qemu-host-arch.args | 2 +-
tests/qemuxml2argvdata/disk-aio.args | 2 +-
tests/qemuxml2argvdata/disk-blockio.args | 2 +-
.../qemuxml2argvdata/disk-cdrom-network.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +-
tests/qemuxml2argvdata/disk-copy_on_read.args | 4 +-
tests/qemuxml2argvdata/disk-floppy-tray.args | 2 +-
tests/qemuxml2argvdata/disk-geometry.args | 2 +-
tests/qemuxml2argvdata/disk-ide-split.args | 2 +-
tests/qemuxml2argvdata/disk-ide-wwn.args | 2 +-
tests/qemuxml2argvdata/disk-ioeventfd.args | 4 +-
.../disk-network-gluster.args | 6 +-
.../disk-network-iscsi-modern.args | 10 +-
.../qemuxml2argvdata/disk-network-iscsi.args | 10 +-
tests/qemuxml2argvdata/disk-network-nbd.args | 10 +-
.../disk-network-sheepdog.args | 2 +-
.../disk-network-source-auth.args | 6 +-
tests/qemuxml2argvdata/disk-order.args | 6 +-
.../qemuxml2argvdata/disk-readonly-disk.args | 2 +-
tests/qemuxml2argvdata/disk-sata-device.args | 4 +-
.../disk-scsi-disk-split.args | 10 +-
.../qemuxml2argvdata/disk-scsi-disk-vpd.args | 6 +-
.../qemuxml2argvdata/disk-scsi-disk-wwn.args | 6 +-
.../disk-scsi-lun-passthrough.args | 6 +-
tests/qemuxml2argvdata/disk-serial.args | 2 +-
tests/qemuxml2argvdata/disk-snapshot.args | 2 +-
.../disk-source-pool-mode.args | 2 +-
tests/qemuxml2argvdata/disk-source-pool.args | 4 +-
.../disk-usb-device-removable.args | 2 +-
tests/qemuxml2argvdata/disk-usb-device.args | 2 +-
tests/qemuxml2argvdata/disk-virtio.args | 4 +-
tests/qemuxml2argvdata/encrypted-disk.args | 2 +-
tests/qemuxml2argvdata/event_idx.args | 4 +-
tests/qemuxml2argvdata/floppy-drive-fat.args | 2 +-
tests/qemuxml2argvdata/fs9p.args | 6 +-
.../hostdev-mdev-precreated.args | 2 +-
.../hostdev-pci-address-device.args | 4 +-
.../hostdev-pci-address-unassigned.args | 8 +-
.../qemuxml2argvdata/hostdev-pci-address.args | 2 +-
.../hostdev-pci-multifunction.args | 16 +-
.../hostdev-scsi-vhost-scsi-pci.args | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.args | 4 +-
.../hostdev-usb-address-device-boot.args | 2 +-
.../hostdev-usb-address-device.args | 2 +-
.../hostdev-vfio-multidomain.args | 4 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 4 +-
tests/qemuxml2argvdata/hugepages-default.args | 2 +-
tests/qemuxml2argvdata/hugepages-shared.args | 2 +-
.../qemuxml2argvdata/input-usbmouse-addr.args | 2 +-
tests/qemuxml2argvdata/iothreads-disk.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +-
.../luks-disks-source-qcow2.args | 8 +-
tests/qemuxml2argvdata/luks-disks-source.args | 6 +-
tests/qemuxml2argvdata/machine-aliases1.args | 2 +-
tests/qemuxml2argvdata/machine-aliases2.args | 2 +-
tests/qemuxml2argvdata/machine-smm-opt.args | 2 +-
.../qemuxml2argvdata/machine-vmport-opt.args | 2 +-
.../memory-hotplug-dimm-addr.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug.args | 2 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 2 +-
tests/qemuxml2argvdata/memtune.args | 2 +-
.../migrate-numa-unaligned.args | 2 +-
.../minimal-msg-timestamp.args | 2 +-
tests/qemuxml2argvdata/minimal-sandbox.args | 2 +-
tests/qemuxml2argvdata/minimal.args | 2 +-
tests/qemuxml2argvdata/monitor-json.args | 2 +-
.../multifunction-pci-device.args | 2 +-
tests/qemuxml2argvdata/net-client.args | 4 +-
tests/qemuxml2argvdata/net-eth-hostip.args | 2 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 2 +-
tests/qemuxml2argvdata/net-eth-names.args | 6 +-
.../net-eth-unmanaged-tap.args | 2 +-
tests/qemuxml2argvdata/net-eth.args | 2 +-
.../net-hostdev-bootorder.args | 2 +-
.../net-hostdev-multidomain.args | 4 +-
.../net-hostdev-vfio-multidomain.args | 4 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 4 +-
tests/qemuxml2argvdata/net-hostdev.args | 4 +-
tests/qemuxml2argvdata/net-many-models.args | 12 +-
tests/qemuxml2argvdata/net-mcast.args | 4 +-
tests/qemuxml2argvdata/net-server.args | 4 +-
tests/qemuxml2argvdata/net-udp.args | 4 +-
tests/qemuxml2argvdata/net-user.args | 2 +-
.../net-vhostuser-multiq.args | 10 +-
tests/qemuxml2argvdata/net-vhostuser.args | 6 +-
tests/qemuxml2argvdata/net-virtio-device.args | 4 +-
.../net-virtio-disable-offloads.args | 4 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 4 +-
.../net-virtio-rxtxqueuesize.args | 4 +-
.../qemuxml2argvdata/net-virtio-teaming.args | 10 +-
tests/qemuxml2argvdata/net-virtio.args | 2 +-
.../numad-auto-memory-vcpu-cpuset.args | 2 +-
...o-memory-vcpu-no-cpuset-and-placement.args | 2 +-
.../numad-auto-vcpu-static-numatune.args | 2 +-
.../numad-static-memory-auto-vcpu.args | 2 +-
tests/qemuxml2argvdata/numad.args | 2 +-
.../numatune-auto-nodeset-invalid.args | 2 +-
.../numatune-auto-prefer.args | 2 +-
.../qemuxml2argvdata/numatune-distances.args | 2 +-
.../numatune-memnode-no-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-memnode.args | 2 +-
tests/qemuxml2argvdata/numatune-memory.args | 2 +-
tests/qemuxml2argvdata/panic-no-address.args | 2 +-
tests/qemuxml2argvdata/panic.args | 2 +-
.../parallel-parport-chardev.args | 2 +-
.../parallel-tcp-chardev.args | 2 +-
.../pci-bridge-many-disks.args | 216 +++++++++---------
tests/qemuxml2argvdata/pci-expander-bus.args | 68 +++---
tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +-
tests/qemuxml2argvdata/pci-rom.args | 10 +-
.../pci-serial-dev-chardev.args | 2 +-
.../pcie-root-port-model-generic.args | 6 +-
.../pcie-root-port-model-ioh3420.args | 4 +-
tests/qemuxml2argvdata/pcihole64.args | 2 +-
.../q35-pci-force-address.args | 2 +-
.../q35-pm-disable-fallback.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +-
.../qemu-ns-commandline-ns0.args | 2 +-
.../qemu-ns-commandline-ns1.args | 2 +-
.../qemuxml2argvdata/qemu-ns-commandline.args | 2 +-
.../qemu-ns-domain-commandline-ns0.args | 2 +-
.../qemu-ns-domain-commandline.args | 2 +-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +-
.../seclabel-dynamic-baselabel.args | 2 +-
.../seclabel-dynamic-labelskip.args | 2 +-
.../seclabel-dynamic-override.args | 2 +-
.../seclabel-dynamic-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +-
tests/qemuxml2argvdata/seclabel-none.args | 2 +-
.../seclabel-static-labelskip.args | 2 +-
.../seclabel-static-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-static.args | 2 +-
.../serial-dev-chardev-iobase.args | 2 +-
.../qemuxml2argvdata/serial-dev-chardev.args | 2 +-
.../qemuxml2argvdata/serial-file-chardev.args | 2 +-
.../qemuxml2argvdata/serial-many-chardev.args | 2 +-
.../qemuxml2argvdata/serial-pty-chardev.args | 2 +-
.../serial-spiceport-nospice.args | 2 +-
.../qemuxml2argvdata/serial-tcp-chardev.args | 2 +-
.../serial-tcp-telnet-chardev.args | 2 +-
.../serial-tcp-tlsx509-chardev-verify.args | 2 +-
.../serial-tcp-tlsx509-chardev.args | 2 +-
.../qemuxml2argvdata/serial-udp-chardev.args | 2 +-
.../qemuxml2argvdata/serial-unix-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +-
.../shmem-plain-doorbell.args | 14 +-
tests/qemuxml2argvdata/shmem.args | 14 +-
.../smartcard-controller.args | 2 +-
.../smartcard-host-certificates-database.args | 2 +-
.../smartcard-host-certificates.args | 2 +-
tests/qemuxml2argvdata/smartcard-host.args | 2 +-
.../smartcard-passthrough-spicevmc.args | 2 +-
.../smartcard-passthrough-tcp.args | 2 +-
tests/qemuxml2argvdata/smbios.args | 2 +-
tests/qemuxml2argvdata/sound-device.args | 14 +-
tests/qemuxml2argvdata/sound.args | 4 +-
.../usb-controller-qemu-xhci.args | 2 +-
.../qemuxml2argvdata/usb-controller-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller.args | 2 +-
.../usb-hub-autoadd-deluxe.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +-
tests/qemuxml2argvdata/usb-hub.args | 2 +-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +-
.../qemuxml2argvdata/usb-ich9-companion.args | 2 +-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 26 +--
.../qemuxml2argvdata/usb-long-port-path.args | 2 +-
tests/qemuxml2argvdata/usb-none.args | 2 +-
.../usb-piix3-controller.args | 2 +-
.../qemuxml2argvdata/usb-port-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-port-missing.args | 2 +-
tests/qemuxml2argvdata/usb-ports.args | 2 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 2 +-
.../usb-redir-filter-version.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 2 +-
tests/qemuxml2argvdata/usb-redir.args | 2 +-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb1-usb2.args | 2 +-
tests/qemuxml2argvdata/user-aliases-usb.args | 2 +-
.../virtio-input-passthrough.args | 4 +-
tests/qemuxml2argvdata/virtio-input.args | 6 +-
tests/qemuxml2argvdata/virtio-lun.args | 4 +-
.../qemuxml2argvdata/virtio-rng-default.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-egd.args | 4 +-
.../qemuxml2argvdata/virtio-rng-multiple.args | 4 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 4 +-
tests/qemuxml2argvdata/vmcoreinfo.args | 2 +-
tests/qemuxml2argvdata/watchdog-device.args | 2 +-
tests/qemuxml2argvdata/watchdog-dump.args | 2 +-
.../qemuxml2argvdata/watchdog-injectnmi.args | 2 +-
276 files changed, 562 insertions(+), 562 deletions(-)
diff --git a/tests/qemuxml2argvdata/autoindex.args
b/tests/qemuxml2argvdata/autoindex.args
index 2f0c6041b0..bf128bd0ad 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
-device x3130-upstream,id=pci.4,bus=pci.3,addr=0x0 \
-device xio3130-downstream,port=0x0,chassis=5,id=pci.5,bus=pci.4,addr=0x0 \
-device xio3130-downstream,port=0x1,chassis=6,id=pci.6,bus=pci.4,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args
b/tests/qemuxml2argvdata/balloon-device-auto.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args
b/tests/qemuxml2argvdata/bios-nvram-secure.args
index 5132b97600..f721524d0a 100644
--- a/tests/qemuxml2argvdata/bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
@@ -28,7 +28,7 @@ QEMU_AUDIO_DRV=none \
-boot menu=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
-device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x1 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \
-device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1
\
diff --git a/tests/qemuxml2argvdata/bios-nvram.args
b/tests/qemuxml2argvdata/bios-nvram.args
index 464db3a047..c692a5a035 100644
--- a/tests/qemuxml2argvdata/bios-nvram.args
+++ b/tests/qemuxml2argvdata/bios-nvram.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-device usb-tablet,id=input0,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index 4371179132..5374996b15 100644
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -32,4 +32,4 @@ QEMU_AUDIO_DRV=none \
-chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0 \
-device usb-tablet,id=input0,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args
b/tests/qemuxml2argvdata/blkiotune-device.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/blkiotune.args
b/tests/qemuxml2argvdata/blkiotune.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/boot-complex.args
b/tests/qemuxml2argvdata/boot-complex.args
index 87f821ab89..ce418a182a 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -25,9 +25,9 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3
\
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3
\
-drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
-drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
@@ -40,6 +40,6 @@ QEMU_AUDIO_DRV=none \
-global isa-fdc.bootindexA=4 \
-global isa-fdc.driveB=drive-fdc0-0-1 \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,bootindex=2
\
+-device
virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x2,bootindex=2
\
-netdev user,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x4
+-device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 171dde0489..62272d8a7d 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args
b/tests/qemuxml2argvdata/boot-menu-disable.args
index 171dde0489..62272d8a7d 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index b888fc4154..b7ad9c3ebc 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args
b/tests/qemuxml2argvdata/boot-menu-enable.args
index dd1f97f48e..c3249b7db7 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/boot-multi.args
b/tests/qemuxml2argvdata/boot-multi.args
index dd1f97f48e..c3249b7db7 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/boot-order.args
b/tests/qemuxml2argvdata/boot-order.args
index fc2d3135f9..c42ccba803 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -29,10 +29,10 @@ QEMU_AUDIO_DRV=none \
-drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-drive file=sheepdog:example.org:6000:image,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3
\
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3
\
-drive file=/dev/null,format=raw,if=none,id=drive-fdc0-0-1 \
-global isa-fdc.driveB=drive-fdc0-0-1 \
-global isa-fdc.bootindexB=4 \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3,bootindex=2
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device
virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2,bootindex=2
\
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/boot-strict.args
b/tests/qemuxml2argvdata/boot-strict.args
index bb8b3e2b21..6f289c2e87 100644
--- a/tests/qemuxml2argvdata/boot-strict.args
+++ b/tests/qemuxml2argvdata/boot-strict.args
@@ -26,9 +26,9 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-usb \
-drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3
\
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3
\
-drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
-drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
@@ -41,6 +41,6 @@ QEMU_AUDIO_DRV=none \
-global isa-fdc.bootindexA=4 \
-global isa-fdc.driveB=drive-fdc0-0-1 \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,bootindex=2
\
+-device
virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x2,bootindex=2
\
-netdev user,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x4
+-device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args
b/tests/qemuxml2argvdata/channel-guestfwd.args
index 5bd2ae6881..6b354e032d 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pipe,id=charchannel0,path=/tmp/guestfwd \
-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args
b/tests/qemuxml2argvdata/channel-virtio-auto.args
index bf4be0586d..50fba54f4a 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -23,9 +23,9 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-serial-pci,id=virtio-serial0,max_ports=16,vectors=4,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,max_ports=16,vectors=4,bus=pci.0,addr=0x2 \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 \
+-device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x3 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
@@ -41,4 +41,4 @@ QEMU_AUDIO_DRV=none \
-device
virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh
\
-chardev pty,id=charchannel5 \
-device
virtserialport,bus=virtio-serial2.0,nr=1,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index f210a109d7..07c25b86c7 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -23,8 +23,8 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x3 \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x4 \
+-device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x2 \
+-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x3 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
@@ -40,4 +40,4 @@ QEMU_AUDIO_DRV=none \
-device
virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh
\
-chardev pty,id=charchannel5 \
-device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index cde003b76b..305d0d9660 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x2 \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
@@ -40,4 +40,4 @@ QEMU_AUDIO_DRV=none \
-device
virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh
\
-chardev pty,id=charchannel5 \
-device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args
b/tests/qemuxml2argvdata/channel-virtio-default.args
index 9d8e11c957..90ea43a339 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
@@ -32,4 +32,4 @@ QEMU_AUDIO_DRV=none \
-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0 \
-chardev spicevmc,id=charchannel1,name=vdagent \
-device
virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args
b/tests/qemuxml2argvdata/channel-virtio-state.args
index ac0e63deef..88e26d1c96 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -33,4 +33,4 @@ QEMU_AUDIO_DRV=none \
-device
virtserialport,bus=virtio-serial1.0,nr=4,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo1
\
-chardev pty,id=charchannel2 \
-device
virtserialport,bus=virtio-serial1.0,nr=5,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.foo2
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args
b/tests/qemuxml2argvdata/channel-virtio-unix.args
index 034383fc6d..b1a5409fc1 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio.args
b/tests/qemuxml2argvdata/channel-virtio.args
index 29b470abf6..7d78a04567 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charchannel0 \
-device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.foo
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args
b/tests/qemuxml2argvdata/chardev-reconnect.args
index 25d5fa16a3..00d89a9a82 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-chardev socket,id=charsmartcard0,path=/tmp/channel/asdf,reconnect=20 \
@@ -37,4 +37,4 @@ QEMU_AUDIO_DRV=none \
-device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \
-chardev socket,id=charrng0,host=localhost,port=2345,reconnect=5 \
-object rng-egd,id=objrng0,chardev=charrng0 \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x4
+-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/clock-catchup.args
b/tests/qemuxml2argvdata/clock-catchup.args
index 20c37e7c20..b5c6717c3f 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/clock-france.args
b/tests/qemuxml2argvdata/clock-france.args
index 3d51fcfcf7..a5da02742c 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args
b/tests/qemuxml2argvdata/clock-hpet-off.args
index e09b19123d..734eb5489f 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 6fb13564d4..015750213e 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index 4e7efb59c3..dfa15f0a58 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/clock-variable.args
b/tests/qemuxml2argvdata/clock-variable.args
index af6627e6aa..50520cd6f0 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args
b/tests/qemuxml2argvdata/console-compat-auto.args
index e46ad10442..10370f6483 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args
b/tests/qemuxml2argvdata/console-compat-chardev.args
index e46ad10442..10370f6483 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args
b/tests/qemuxml2argvdata/console-virtio-many.args
index 53e0ebc37e..8fac458a33 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
@@ -35,4 +35,4 @@ QEMU_AUDIO_DRV=none \
-device virtconsole,chardev=charconsole2,id=console2 \
-chardev pty,id=charconsole3 \
-device virtconsole,chardev=charconsole3,id=console3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/console-virtio.args
b/tests/qemuxml2argvdata/console-virtio.args
index 1d3979b9ea..9657c02717 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -23,10 +23,10 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index 1b0f358162..896da5d044 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args
b/tests/qemuxml2argvdata/cpu-Haswell.args
index 276213437b..8bbd6277fd 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args
b/tests/qemuxml2argvdata/cpu-Haswell2.args
index ece79d1c68..703500be19 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args
b/tests/qemuxml2argvdata/cpu-Haswell3.args
index dd2eddaed6..55b66b343d 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args
b/tests/qemuxml2argvdata/cpu-cache-disable.args
index 7dab2091a1..3aaaa97174 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args
b/tests/qemuxml2argvdata/cpu-cache-disable2.args
index 022bd7df74..26b4317973 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args
b/tests/qemuxml2argvdata/cpu-cache-disable3.args
index 567e7420e8..faa52fe863 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
index a3ebf04bd3..c16f4188c6 100644
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
index 44b0105f3c..6f23b00698 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
index bd35198e0c..c44db77acf 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args
b/tests/qemuxml2argvdata/cpu-check-default-none.args
index ebc0384649..a73f4d8d49 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args
b/tests/qemuxml2argvdata/cpu-check-default-none2.args
index 05d176667b..b3a334be1c 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args
b/tests/qemuxml2argvdata/cpu-check-default-partial.args
index 34ccfc6331..d33e7827eb 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
index b454b74e14..3ac1c1ce81 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-check-none.args
b/tests/qemuxml2argvdata/cpu-check-none.args
index b454b74e14..3ac1c1ce81 100644
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
index a911365399..5e6be6f32e 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
index 735839eacc..42df00a03c 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-exact1.args
b/tests/qemuxml2argvdata/cpu-exact1.args
index 5f40013a81..261f7e1907 100644
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
index 2f60af337a..517cf89208 100644
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-exact2.args
b/tests/qemuxml2argvdata/cpu-exact2.args
index 2f60af337a..517cf89208 100644
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-fallback.args
b/tests/qemuxml2argvdata/cpu-fallback.args
index 4032e6ef83..f30a288c0d 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
index 0947962475..51bf578190 100644
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
index 653b81c4fa..e21a889bee 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
index e820396777..0b0abd63a9 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
index 1e154840b2..597ce52915 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-host-model.args
b/tests/qemuxml2argvdata/cpu-host-model.args
index 8c0b682876..dc53789aa9 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index 1ea6108913..4cff096f78 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args
b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index ebc0384649..a73f4d8d49 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
index f5ba314b2f..46e0bf2c84 100644
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args
b/tests/qemuxml2argvdata/cpu-kvmclock.args
index 111ad819d5..6b954e75c8 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args
b/tests/qemuxml2argvdata/cpu-minimum1.args
index c53076953b..360a175524 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args
b/tests/qemuxml2argvdata/cpu-minimum2.args
index d1474367a5..e0c73e5af5 100644
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args
b/tests/qemuxml2argvdata/cpu-no-removed-features.args
index b454b74e14..3ac1c1ce81 100644
--- a/tests/qemuxml2argvdata/cpu-no-removed-features.args
+++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
index a267cf5696..121a4b3f36 100644
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args
b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 8568d7fea2..970900be7f 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
index 8eb3676ab1..e5ced8e924 100644
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-numa1.args
b/tests/qemuxml2argvdata/cpu-numa1.args
index 8eb3676ab1..e5ced8e924 100644
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-numa2.args
b/tests/qemuxml2argvdata/cpu-numa2.args
index 8eb3676ab1..e5ced8e924 100644
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-strict1.args
b/tests/qemuxml2argvdata/cpu-strict1.args
index 49f711fc1e..319a28cc8d 100644
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-topology1.args
b/tests/qemuxml2argvdata/cpu-topology1.args
index a269ebb532..e51fd4de90 100644
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-topology2.args
b/tests/qemuxml2argvdata/cpu-topology2.args
index b875bafff6..56783ad2b3 100644
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-topology3.args
b/tests/qemuxml2argvdata/cpu-topology3.args
index a269ebb532..e51fd4de90 100644
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
index e36f58e2b3..0f6f79653e 100644
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args
b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 91290fbe0e..e66bd7deb0 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 91290fbe0e..e66bd7deb0 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/debug-threads.args
b/tests/qemuxml2argvdata/debug-threads.args
index 65c389c9df..9b7e24adbf 100644
--- a/tests/qemuxml2argvdata/debug-threads.args
+++ b/tests/qemuxml2argvdata/debug-threads.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args
b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index 38b4ee0b56..e392624102 100644
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args
b/tests/qemuxml2argvdata/default-qemu-host-arch.args
index 24660946f9..85e6b20124 100644
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
index 965ac39b64..e2f52f0558 100644
--- a/tests/qemuxml2argvdata/disk-aio.args
+++ b/tests/qemuxml2argvdata/disk-aio.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-drive
file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,readonly=on,aio=threads
\
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-blockio.args
b/tests/qemuxml2argvdata/disk-blockio.args
index cb52e527f1..99ecabd724 100644
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ b/tests/qemuxml2argvdata/disk-blockio.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
-drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
-device
ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,bootindex=1,logical_block_size=512,physical_block_size=512
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args
b/tests/qemuxml2argvdata/disk-cdrom-network.args
index 91228511cf..f34ede7c8b 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-network.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
-drive
'file=https://host.name:443/url/path/file.iso?test=val,format=raw,if=none,id=drive-ide0-1-0,readonly=on'
\
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args
b/tests/qemuxml2argvdata/disk-cdrom-tray.args
index c425d9d875..3a6a14a90a 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-drive if=none,id=drive-ide0-1-1,readonly=on \
-device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args
b/tests/qemuxml2argvdata/disk-copy_on_read.args
index ace793b872..059bc11257 100644
--- a/tests/qemuxml2argvdata/disk-copy_on_read.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.args
@@ -31,5 +31,5 @@ QEMU_AUDIO_DRV=none \
-drive
file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on
\
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device
virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args
b/tests/qemuxml2argvdata/disk-floppy-tray.args
index 06a2548ee7..aabc225cf1 100644
--- a/tests/qemuxml2argvdata/disk-floppy-tray.args
+++ b/tests/qemuxml2argvdata/disk-floppy-tray.args
@@ -30,4 +30,4 @@ QEMU_AUDIO_DRV=none \
-drive if=none,id=drive-fdc0-0-1 \
-global isa-fdc.driveA=drive-fdc0-0-0 \
-global isa-fdc.driveB=drive-fdc0-0-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-geometry.args
b/tests/qemuxml2argvdata/disk-geometry.args
index 132aab4c11..7197829db8 100644
--- a/tests/qemuxml2argvdata/disk-geometry.args
+++ b/tests/qemuxml2argvdata/disk-geometry.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device
ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,cyls=16383,heads=16,secs=63,bios-chs-trans=lba
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-ide-split.args
b/tests/qemuxml2argvdata/disk-ide-split.args
index 2404f77cde..4e1f9ee8a9 100644
--- a/tests/qemuxml2argvdata/disk-ide-split.args
+++ b/tests/qemuxml2argvdata/disk-ide-split.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
-drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
-device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args
b/tests/qemuxml2argvdata/disk-ide-wwn.args
index 1412337add..ab657d59be 100644
--- a/tests/qemuxml2argvdata/disk-ide-wwn.args
+++ b/tests/qemuxml2argvdata/disk-ide-wwn.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \
-device
ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,bootindex=1,wwn=0x5000c50015ea71ad,serial=WD-WMAP9A966149
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args
b/tests/qemuxml2argvdata/disk-ioeventfd.args
index 0c2dbe0698..d2f491b8af 100644
--- a/tests/qemuxml2argvdata/disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.args
@@ -31,5 +31,5 @@ QEMU_AUDIO_DRV=none \
-drive
file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on
\
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,tx=bh,ioeventfd=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device
virtio-net-pci,tx=bh,ioeventfd=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2
\
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args
b/tests/qemuxml2argvdata/disk-network-gluster.args
index 99273286ec..2dab1b8896 100644
--- a/tests/qemuxml2argvdata/disk-network-gluster.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.args
@@ -25,8 +25,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-drive
file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device
virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive
'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,file.debug=4,format=raw,if=none,id=drive-virtio-disk1'
\
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
-drive
file.driver=gluster,file.volume=Volume3,file.path=Image.qcow2,file.server.0.type=tcp,file.server.0.host=example.org,file.server.0.port=6000,file.server.1.type=tcp,file.server.1.host=example.org,file.server.1.port=24007,file.server.2.type=unix,file.server.2.socket=/path/to/sock,file.debug=4,format=qcow2,if=none,id=drive-virtio-disk2
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,id=virtio-disk2
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
index e9eb41db68..738101b3a7 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
@@ -23,16 +23,16 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
-usb \
-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example,file.lun=1,file.transport=tcp,format=raw,if=none,id=drive-virtio-disk1
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,format=raw,if=none,id=drive-virtio-disk2
\
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2 \
-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=2,file.transport=tcp,file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,format=raw,if=none,id=drive-virtio-disk3
\
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
-drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,if=none,id=drive-scsi0-0-0-0
\
-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \
-drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,id=drive-scsi0-0-0-1
\
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args
b/tests/qemuxml2argvdata/disk-network-iscsi.args
index 59a3cb8452..2b347064dc 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.args
@@ -23,15 +23,15 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
-usb \
-drive
file=iscsi://example.org:6000/iqn.1992-01.com.example/0,format=raw,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive
file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,if=none,id=drive-virtio-disk1
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
-drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,id=drive-virtio-disk2
\
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2 \
-drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/2,format=raw,if=none,id=drive-virtio-disk3
\
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
-drive
file=iscsi://example.org:3260/iqn.1992-01.com.example/0,format=raw,if=none,id=drive-scsi0-0-0-0
\
-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0
diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args
b/tests/qemuxml2argvdata/disk-network-nbd.args
index fd6fb2a98d..58101b89e7 100644
--- a/tests/qemuxml2argvdata/disk-network-nbd.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.args
@@ -25,12 +25,12 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-drive file=nbd:example.org:6000,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device
virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive file=nbd:example.org:6000:exportname=bar,format=raw,if=none,id=drive-virtio-disk1
\
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
-drive 'file=nbd://[::1]:6000,format=raw,if=none,id=drive-virtio-disk2' \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,id=virtio-disk2 \
-drive 'file=nbd://[::1]:6000/bar,format=raw,if=none,id=drive-virtio-disk3' \
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,id=virtio-disk3 \
-drive
file=nbd:unix:/var/run/nbdsock:exportname=bar,format=raw,if=none,id=drive-virtio-disk4 \
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,id=virtio-disk4
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,id=virtio-disk4
diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args
b/tests/qemuxml2argvdata/disk-network-sheepdog.args
index fb7102fbb8..44032292f4 100644
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMU,,Guest,,,,1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-drive
file=sheepdog:example.org:6000:image,,with,,commas,format=raw,if=none,id=drive-virtio-disk0
\
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args
b/tests/qemuxml2argvdata/disk-network-source-auth.args
index 833a0fddd8..8e07be7ebc 100644
--- a/tests/qemuxml2argvdata/disk-network-source-auth.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.args
@@ -25,8 +25,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device
virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive
'file=rbd:pool/image:id=myname:key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk1'
\
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
-drive
'file=rbd:pool/image2:id=myname:key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk2'
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,id=virtio-disk2
diff --git a/tests/qemuxml2argvdata/disk-order.args
b/tests/qemuxml2argvdata/disk-order.args
index efce8661db..be33dfc545 100644
--- a/tests/qemuxml2argvdata/disk-order.args
+++ b/tests/qemuxml2argvdata/disk-order.args
@@ -29,7 +29,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-drive file=/tmp/data.img,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 \
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0 \
-drive file=/tmp/logs.img,format=raw,if=none,id=drive-virtio-disk1 \
--device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args
b/tests/qemuxml2argvdata/disk-readonly-disk.args
index 0e769fdc92..3102c4f27d 100644
--- a/tests/qemuxml2argvdata/disk-readonly-disk.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-drive file=/dev/sr0,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-sata-device.args
b/tests/qemuxml2argvdata/disk-sata-device.args
index 547fba7573..1b8dac8e4b 100644
--- a/tests/qemuxml2argvdata/disk-sata-device.args
+++ b/tests/qemuxml2argvdata/disk-sata-device.args
@@ -23,8 +23,8 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device ahci,id=sata0,bus=pci.0,addr=0x3 \
+-device ahci,id=sata0,bus=pci.0,addr=0x2 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
-device ide-hd,bus=sata0.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
index 64819a19aa..eb2bf3cbc3 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
@@ -23,10 +23,10 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
--device lsi,id=scsi1,bus=pci.0,addr=0x4 \
--device lsi,id=scsi2,bus=pci.0,addr=0x5 \
--device virtio-scsi-pci,id=scsi3,bus=pci.0,addr=0x6 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
+-device lsi,id=scsi2,bus=pci.0,addr=0x4 \
+-device virtio-scsi-pci,id=scsi3,bus=pci.0,addr=0x5 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,readonly=on \
-device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0 \
@@ -36,4 +36,4 @@ QEMU_AUDIO_DRV=none \
-device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1,bootindex=1
\
-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-1-1 \
-device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,id=scsi0-0-1-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
index 5d922c6d87..69c8f47e56 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
@@ -23,11 +23,11 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
--device lsi,id=scsi1,bus=pci.0,addr=0x4 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0,readonly=on \
-device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC
\
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi1-0-0,readonly=on \
-device
'scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0,bootindex=1,vendor=SEA
GATE,product=ST67 807GD' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
index 8ad1bcb7e0..4fd37a0268 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
@@ -23,11 +23,11 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
--device lsi,id=scsi1,bus=pci.0,addr=0x4 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,readonly=on \
-device
scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0,wwn=0x5000c50015ea71ac,serial=WD-WMAP9A966149
\
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-0-0 \
-device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1,wwn=0x5000c50015ea71ad
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
index b6343709d2..1265f6ecd7 100644
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
@@ -23,11 +23,11 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
--device lsi,id=scsi1,bus=pci.0,addr=0x4 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \
-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1
\
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-1-1 \
-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,id=scsi0-0-1-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/disk-serial.args
b/tests/qemuxml2argvdata/disk-serial.args
index 3fad5e098a..016e8b4354 100644
--- a/tests/qemuxml2argvdata/disk-serial.args
+++ b/tests/qemuxml2argvdata/disk-serial.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2 \
-device
'ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\
.+' \
-drive file=/some/file,format=raw,if=sd,index=0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-snapshot.args
b/tests/qemuxml2argvdata/disk-snapshot.args
index 884c15683d..53bef27c1a 100644
--- a/tests/qemuxml2argvdata/disk-snapshot.args
+++ b/tests/qemuxml2argvdata/disk-snapshot.args
@@ -30,4 +30,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.2,unit=0,drive=drive-ide0-2-0,id=ide0-2-0 \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args
b/tests/qemuxml2argvdata/disk-source-pool-mode.args
index 9f335e62be..0ea20e74be 100644
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args
@@ -32,4 +32,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3,bootindex=1 \
-drive
file=iscsi://iscsi.example.com:3260/demo-target/3,format=raw,if=none,id=drive-ide0-0-4,readonly=on
\
-device ide-cd,bus=ide.0,unit=4,drive=drive-ide0-0-4,id=ide0-0-4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-source-pool.args
b/tests/qemuxml2argvdata/disk-source-pool.args
index d662269a95..1e17d3482d 100644
--- a/tests/qemuxml2argvdata/disk-source-pool.args
+++ b/tests/qemuxml2argvdata/disk-source-pool.args
@@ -31,7 +31,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
-device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,bootindex=1 \
-drive file=fat:/some/dir/device/vol1,if=none,id=drive-virtio-disk0,readonly=on \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0 \
-drive file=fat:/some/dir/device/vol2,if=none,id=drive-virtio-disk1,readonly=on \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args
b/tests/qemuxml2argvdata/disk-usb-device-removable.args
index aca5eeffdc..901cfeb22f 100644
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.args
+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-drive file=/tmp/usbdisk.img,format=raw,if=none,id=drive-usb-disk0 \
-device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk0,id=usb-disk0,removable=on \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-usb-device.args
b/tests/qemuxml2argvdata/disk-usb-device.args
index 4cdda76d51..946a74e0b7 100644
--- a/tests/qemuxml2argvdata/disk-usb-device.args
+++ b/tests/qemuxml2argvdata/disk-usb-device.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-drive file=/tmp/usbdisk.img,format=raw,if=none,id=drive-usb-disk0 \
-device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk0,id=usb-disk0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/disk-virtio.args
b/tests/qemuxml2argvdata/disk-virtio.args
index bca665cd59..6787d46b59 100644
--- a/tests/qemuxml2argvdata/disk-virtio.args
+++ b/tests/qemuxml2argvdata/disk-virtio.args
@@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-drive file=/tmp/data.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0 \
-drive file=/tmp/logs.img,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1
diff --git a/tests/qemuxml2argvdata/encrypted-disk.args
b/tests/qemuxml2argvdata/encrypted-disk.args
index 1ffc287ea2..a98e0fc03a 100644
--- a/tests/qemuxml2argvdata/encrypted-disk.args
+++ b/tests/qemuxml2argvdata/encrypted-disk.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-object
secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=/storage/guest_disks/encryptdisk,encrypt.format=luks,encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk0
\
-device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/event_idx.args
b/tests/qemuxml2argvdata/event_idx.args
index e1a9cb3565..519a46ce1d 100644
--- a/tests/qemuxml2argvdata/event_idx.args
+++ b/tests/qemuxml2argvdata/event_idx.args
@@ -31,5 +31,5 @@ QEMU_AUDIO_DRV=none \
-drive
file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on
\
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,event_idx=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device
virtio-net-pci,event_idx=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2
\
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args
b/tests/qemuxml2argvdata/floppy-drive-fat.args
index 9d5fa3c771..79cfb2f5fa 100644
--- a/tests/qemuxml2argvdata/floppy-drive-fat.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=fat:floppy:/var/somefiles,if=none,id=drive-fdc0-0-0,readonly=on \
-global isa-fdc.driveA=drive-fdc0-0-0 \
-global isa-fdc.bootindexA=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
index 6eee0ac890..48de137191 100644
--- a/tests/qemuxml2argvdata/fs9p.args
+++ b/tests/qemuxml2argvdata/fs9p.args
@@ -24,8 +24,8 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
--device
virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.0,addr=0x3 \
+-device
virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.0,addr=0x2 \
-fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2
\
--device
virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,mount_tag=/import/from/host2,bus=pci.0,addr=0x4 \
+-device
virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,mount_tag=/import/from/host2,bus=pci.0,addr=0x3 \
-fsdev handle,writeout=immediate,id=fsdev-fs2,path=/export/to/guest3 \
--device
virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,mount_tag=/import/from/host3,bus=pci.0,addr=0x5
+-device
virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,mount_tag=/import/from/host3,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index 96de25ff7e..1804f87133 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device
vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,bus=pci.0,addr=0x3
+-device
vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
index 14b0b4e18b..ab38116c35 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
index 2f304127b1..8202374976 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x3 \
--device vfio-pci,host=0005:90:01.2,id=hostdev2,bus=pci.0,addr=0x4 \
--device vfio-pci,host=0005:90:01.3,id=hostdev3,bus=pci.0,addr=0x5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
+-device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x2 \
+-device vfio-pci,host=0005:90:01.2,id=hostdev2,bus=pci.0,addr=0x3 \
+-device vfio-pci,host=0005:90:01.3,id=hostdev3,bus=pci.0,addr=0x4 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args
b/tests/qemuxml2argvdata/hostdev-pci-address.args
index 2a2a23f5b4..73e6f71a5c 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x3
+-device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
index 70d759545f..2409762856 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
@@ -24,11 +24,11 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x3 \
--device vfio-pci,host=0001:01:00.1,id=hostdev1,bus=pci.0,addr=0x4 \
--device vfio-pci,host=0001:01:00.0,id=hostdev2,bus=pci.0,addr=0x5 \
--device vfio-pci,host=0005:90:01.2,id=hostdev3,bus=pci.0,addr=0x6 \
--device vfio-pci,host=0005:90:01.3,id=hostdev4,bus=pci.0,addr=0x7 \
--device vfio-pci,host=0000:06:12.1,id=hostdev5,bus=pci.0,addr=0x8 \
--device vfio-pci,host=0000:06:12.2,id=hostdev6,bus=pci.0,addr=0x9 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0xa
+-device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x2 \
+-device vfio-pci,host=0001:01:00.1,id=hostdev1,bus=pci.0,addr=0x3 \
+-device vfio-pci,host=0001:01:00.0,id=hostdev2,bus=pci.0,addr=0x4 \
+-device vfio-pci,host=0005:90:01.2,id=hostdev3,bus=pci.0,addr=0x5 \
+-device vfio-pci,host=0005:90:01.3,id=hostdev4,bus=pci.0,addr=0x6 \
+-device vfio-pci,host=0000:06:12.1,id=hostdev5,bus=pci.0,addr=0x7 \
+-device vfio-pci,host=0000:06:12.2,id=hostdev6,bus=pci.0,addr=0x8 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index 32434b3560..baa707029a 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.0,addr=0x5
\
+-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.0,addr=0x2
\
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index 28de74c885..7953e9e661 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
@@ -23,6 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device pcie-root-port,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2
\
--device pcie-root-port,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
+-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1
\
+-device pcie-root-port,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-device
vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.1,addr=0x0
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
index 82e7d77088..a5d5d7f725 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bootindex=1,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
index 512d76b3b1..e8e9f1b2bd 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index dad04098bb..371fbe30a1 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args
b/tests/qemuxml2argvdata/hostdev-vfio.args
index 8329001ab0..1e3118dcc3 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/hugepages-default.args
b/tests/qemuxml2argvdata/hugepages-default.args
index 8436d949a9..3bccaa83c3 100644
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args
b/tests/qemuxml2argvdata/hugepages-shared.args
index 659121d39e..c2b01e2012 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -34,4 +34,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args
b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index 721c99ad10..28f7cdff25 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-device usb-mouse,id=input0,bus=usb.0,port=2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/iothreads-disk.args
b/tests/qemuxml2argvdata/iothreads-disk.args
index 537c48b316..0a36315fb3 100644
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-drive
file=/var/lib/libvirt/images/iothrtest1.img,format=raw,if=none,id=drive-virtio-disk1 \
-device
virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1
\
-drive
file=/var/lib/libvirt/images/iothrtest2.img,format=raw,if=none,id=drive-virtio-disk2 \
--device
virtio-blk-pci,iothread=iothread2,bus=pci.0,addr=0x3,drive=drive-virtio-disk2,id=virtio-disk2
+-device
virtio-blk-pci,iothread=iothread2,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.args
index 1bba9ef7bc..a61203a01b 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -23,4 +23,4 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args
b/tests/qemuxml2argvdata/kvm-pit-delay.args
index e86ffd7422..d1e340b6a8 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args
b/tests/qemuxml2argvdata/kvm-pit-discard.args
index 4051949bde..3b0cb48230 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
index 3d169e301f..33e5b51264 100644
--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
+++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
@@ -33,14 +33,14 @@ QEMU_AUDIO_DRV=none \
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
-object
secret,id=virtio-disk2-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,encrypt.format=luks,encrypt.key-secret=virtio-disk2-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk2
\
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
-object
secret,id=virtio-disk3-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=iscsi://iscsi.example.com:3260/demo-target/3,encrypt.format=luks,encrypt.key-secret=virtio-disk3-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk3
\
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
-object
secret,id=virtio-disk4-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,encrypt.format=luks,encrypt.key-secret=virtio-disk4-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk4'
\
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk4,id=virtio-disk4 \
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,id=virtio-disk4 \
-object
secret,id=virtio-disk5-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=/storage/guest_disks/encryptdisk5,encrypt.format=luks,encrypt.key-secret=virtio-disk5-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk5
\
--device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk5,id=virtio-disk5 \
+-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk5,id=virtio-disk5 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/luks-disks-source.args
b/tests/qemuxml2argvdata/luks-disks-source.args
index 321754c718..2cc9495b65 100644
--- a/tests/qemuxml2argvdata/luks-disks-source.args
+++ b/tests/qemuxml2argvdata/luks-disks-source.args
@@ -33,11 +33,11 @@ QEMU_AUDIO_DRV=none \
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
-object
secret,id=virtio-disk2-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,key-secret=virtio-disk2-encryption-secret0,format=luks,if=none,id=drive-virtio-disk2
\
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
-object
secret,id=virtio-disk3-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=iscsi://iscsi.example.com:3260/demo-target/3,key-secret=virtio-disk3-encryption-secret0,format=luks,if=none,id=drive-virtio-disk3
\
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
-object
secret,id=virtio-disk4-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,key-secret=virtio-disk4-encryption-secret0,format=luks,if=none,id=drive-virtio-disk4'
\
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk4,id=virtio-disk4 \
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,id=virtio-disk4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args
b/tests/qemuxml2argvdata/machine-aliases1.args
index 58a1ee3cdc..e5c7056a2e 100644
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args
b/tests/qemuxml2argvdata/machine-aliases2.args
index ad291184b7..a1a8d8b70a 100644
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args
b/tests/qemuxml2argvdata/machine-smm-opt.args
index 62833351f6..5d2a0a02bb 100644
--- a/tests/qemuxml2argvdata/machine-smm-opt.args
+++ b/tests/qemuxml2argvdata/machine-smm-opt.args
@@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
-device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x1 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \
-device
scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1
\
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args
b/tests/qemuxml2argvdata/machine-vmport-opt.args
index 1ce42179ed..e59d477e38 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index c12879e6bc..ec5811dc74 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index cdadded1c9..7f52d89e40 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args
b/tests/qemuxml2argvdata/memory-hotplug.args
index 52b8ebec54..b459f50ce5 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args
b/tests/qemuxml2argvdata/memtune-unlimited.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
index 730af94f48..510abc5f57 100644
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-incoming fd:7 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.args
b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
index e495f6be1a..18838030fe 100644
--- a/tests/qemuxml2argvdata/minimal-msg-timestamp.args
+++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/minimal-sandbox.args
b/tests/qemuxml2argvdata/minimal-sandbox.args
index ce4914e960..c0878334cd 100644
--- a/tests/qemuxml2argvdata/minimal-sandbox.args
+++ b/tests/qemuxml2argvdata/minimal-sandbox.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/monitor-json.args
b/tests/qemuxml2argvdata/monitor-json.args
index 9d9d02fc4f..ba3587601b 100644
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/hda1,format=qcow2,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args
b/tests/qemuxml2argvdata/multifunction-pci-device.args
index f3ee4abc40..4938756b96 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -35,4 +35,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \
-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/net-client.args
b/tests/qemuxml2argvdata/net-client.args
index c47ee20be2..535533d044 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev socket,connect=192.168.0.1:5558,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args
b/tests/qemuxml2argvdata/net-eth-hostip.args
index 989004299e..a7cac16894 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
+-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args
b/tests/qemuxml2argvdata/net-eth-ifname.args
index 989004299e..a7cac16894 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
+-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/net-eth-names.args
b/tests/qemuxml2argvdata/net-eth-names.args
index dc9cefe7dd..3c74b44033 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -27,7 +27,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
+-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
-netdev tap,fd=3,id=hostnet1 \
--device e1000,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device e1000,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 136079b974..009071590d 100644
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev tap,fd=3,id=hostnet0,vhost=on,vhostfd=44 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=fe:11:22:33:44:55,bus=pci.0,addr=0x3
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=fe:11:22:33:44:55,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 989004299e..a7cac16894 100644
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
+-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index fc45018608..fa0288d577 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=2 \
--device vfio-pci,host=0000:03:07.1,id=hostdev0,bootindex=1,bus=pci.0,addr=0x3
+-device vfio-pci,host=0000:03:07.1,id=hostdev0,bootindex=1,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index 29de18202c..76cbdfd518 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index b24cc55aa4..935a849916 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args
b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index c63f414165..3466963173 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-hostdev.args
b/tests/qemuxml2argvdata/net-hostdev.args
index a8593e451f..4014cef655 100644
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-many-models.args
b/tests/qemuxml2argvdata/net-many-models.args
index 35bd256467..f83ab38122 100644
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ b/tests/qemuxml2argvdata/net-many-models.args
@@ -24,14 +24,14 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-netdev user,id=hostnet0 \
--device idontexist,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
+-device idontexist,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
-netdev user,id=hostnet1 \
--device vmxnet3,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x4 \
+-device vmxnet3,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x3 \
-netdev user,id=hostnet2 \
--device netfront,netdev=hostnet2,id=net2,mac=00:11:22:33:44:57,bus=pci.0,addr=0x5 \
+-device netfront,netdev=hostnet2,id=net2,mac=00:11:22:33:44:57,bus=pci.0,addr=0x4 \
-netdev user,id=hostnet3 \
--device virtio-net-pci,netdev=hostnet3,id=net3,mac=00:11:22:33:44:58,bus=pci.0,addr=0x6
\
+-device virtio-net-pci,netdev=hostnet3,id=net3,mac=00:11:22:33:44:58,bus=pci.0,addr=0x5
\
-netdev user,id=hostnet4 \
--device ne2k_pci,netdev=hostnet4,id=net4,mac=00:11:22:33:44:58,bus=pci.0,addr=0x7 \
+-device ne2k_pci,netdev=hostnet4,id=net4,mac=00:11:22:33:44:58,bus=pci.0,addr=0x6 \
-netdev user,id=hostnet5 \
--device pcnet,netdev=hostnet5,id=net5,mac=00:11:22:33:44:58,bus=pci.0,addr=0x8
+-device pcnet,netdev=hostnet5,id=net5,mac=00:11:22:33:44:58,bus=pci.0,addr=0x7
diff --git a/tests/qemuxml2argvdata/net-mcast.args
b/tests/qemuxml2argvdata/net-mcast.args
index 6af85fe616..c73b5383c2 100644
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev socket,mcast=192.0.0.1:5558,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-server.args
b/tests/qemuxml2argvdata/net-server.args
index 226b9e5ecc..ea75012859 100644
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev socket,listen=192.168.0.1:5558,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index 0fde906e4c..a7d1cdcb1e 100644
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index e44ca7572f..56dbab4bfc 100644
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
+-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index d3d80be212..0da421824d 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -28,15 +28,15 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
-netdev vhost-user,chardev=charnet0,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3
\
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x2
\
-chardev socket,id=charnet1,path=/tmp/vhost1.sock \
-netdev vhost-user,chardev=charnet1,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4
\
+-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x3
\
-netdev socket,listen=:2015,id=hostnet2 \
--device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x5 \
+-device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x4 \
-chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=10 \
-netdev vhost-user,chardev=charnet3,id=hostnet3 \
--device virtio-net-pci,netdev=hostnet3,id=net3,mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6
\
+-device virtio-net-pci,netdev=hostnet3,id=net3,mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x5
\
-chardev socket,id=charnet4,path=/tmp/vhost3.sock,reconnect=0 \
-netdev vhost-user,chardev=charnet4,queues=4,id=hostnet4 \
--device
virtio-net-pci,mq=on,vectors=10,netdev=hostnet4,id=net4,mac=52:54:00:ee:96:6e,bus=pci.0,addr=0x7
+-device
virtio-net-pci,mq=on,vectors=10,netdev=hostnet4,id=net4,mac=52:54:00:ee:96:6e,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/net-vhostuser.args
b/tests/qemuxml2argvdata/net-vhostuser.args
index 54869f8d17..d823a8130a 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -26,9 +26,9 @@ QEMU_AUDIO_DRV=none \
-usb \
-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
-netdev vhost-user,chardev=charnet0,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3
\
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x2
\
-chardev socket,id=charnet1,path=/tmp/vhost1.sock \
-netdev vhost-user,chardev=charnet1,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4
\
+-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x3
\
-netdev socket,listen=:2015,id=hostnet2 \
--device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x5
+-device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args
b/tests/qemuxml2argvdata/net-virtio-device.args
index 2bf3f1280c..6ed328d716 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device
virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index 970f6d1d89..3d6905f40c 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest7,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off,guest_ufo=off,netdev=hostnet0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,addr=0x3
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device
virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off,guest_ufo=off,netdev=hostnet0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,addr=0x2
\
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args
b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 01435ea24b..fff6d0ecb5 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index 22d911b1ab..d900d3590e 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device
virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args
b/tests/qemuxml2argvdata/net-virtio-teaming.args
index 6a8ae6a23b..567e5d76bc 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -27,9 +27,9 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostua-backup0 \
--device
virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
\
+-device
virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
-netdev user,id=hostua-backup1 \
--device
virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x4
\
--device
vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x5,failover_pair_id=ua-backup0 \
--device
vfio-pci,host=0000:03:07.2,id=hostdev1,bus=pci.0,addr=0x6,failover_pair_id=ua-backup1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
+-device
virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x3
\
+-device
vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x4,failover_pair_id=ua-backup0 \
+-device
vfio-pci,host=0000:03:07.2,id=hostdev1,bus=pci.0,addr=0x5,failover_pair_id=ua-backup1 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/net-virtio.args
b/tests/qemuxml2argvdata/net-virtio.args
index 66a588942c..de99277a0c 100644
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 91290fbe0e..e66bd7deb0 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
index 91290fbe0e..e66bd7deb0 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 91290fbe0e..e66bd7deb0 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 91290fbe0e..e66bd7deb0 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 91290fbe0e..e66bd7deb0 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 91290fbe0e..e66bd7deb0 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args
b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index 916220eb79..8816aca495 100644
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numatune-distances.args
b/tests/qemuxml2argvdata/numatune-distances.args
index b5a2e85c37..0445b8ec8b 100644
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -65,4 +65,4 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
index 6a07e829c5..9bce6ee90d 100644
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numatune-memnode.args
b/tests/qemuxml2argvdata/numatune-memnode.args
index 3d2f56c5ca..7b436cb712 100644
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -30,4 +30,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/numatune-memory.args
b/tests/qemuxml2argvdata/numatune-memory.args
index 91290fbe0e..e66bd7deb0 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/panic-no-address.args
b/tests/qemuxml2argvdata/panic-no-address.args
index 56454f1de5..d311679e99 100644
--- a/tests/qemuxml2argvdata/panic-no-address.args
+++ b/tests/qemuxml2argvdata/panic-no-address.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-device pvpanic
diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args
index 2758e99219..b7540a4c2e 100644
--- a/tests/qemuxml2argvdata/panic.args
+++ b/tests/qemuxml2argvdata/panic.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-device pvpanic,ioport=1285
diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args
b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index 45dce53512..0b428a1dab 100644
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev parport,id=charparallel0,path=/dev/parport0 \
-device isa-parallel,chardev=charparallel0,id=parallel0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index dcc8ad75e4..9ad6d7eb92 100644
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server=on,wait=off \
-device isa-parallel,chardev=charparallel0,id=parallel0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 297afb6374..cabb05a0f0 100644
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -24,217 +24,217 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \
--device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x5 \
+-device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x2 \
+-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x3 \
+-device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x4 \
-usb \
-drive file=/var/lib/libvirt/images/test.img,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device
virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive
file=/var/lib/libvirt/images/disk-a-a.img,format=raw,if=none,id=drive-virtio-disk26 \
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk26,id=virtio-disk26 \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk26,id=virtio-disk26 \
-drive
file=/var/lib/libvirt/images/disk-a-b.img,format=raw,if=none,id=drive-virtio-disk27 \
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk27,id=virtio-disk27 \
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk27,id=virtio-disk27 \
-drive
file=/var/lib/libvirt/images/disk-a-c.img,format=raw,if=none,id=drive-virtio-disk28 \
--device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk28,id=virtio-disk28 \
+-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk28,id=virtio-disk28 \
-drive
file=/var/lib/libvirt/images/disk-a-d.img,format=raw,if=none,id=drive-virtio-disk29 \
--device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk29,id=virtio-disk29 \
+-device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk29,id=virtio-disk29 \
-drive
file=/var/lib/libvirt/images/disk-b-a.img,format=raw,if=none,id=drive-virtio-disk52 \
--device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk52,id=virtio-disk52 \
+-device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk52,id=virtio-disk52 \
-drive
file=/var/lib/libvirt/images/disk-b-b.img,format=raw,if=none,id=drive-virtio-disk53 \
--device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk53,id=virtio-disk53 \
+-device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk53,id=virtio-disk53 \
-drive
file=/var/lib/libvirt/images/disk-b-c.img,format=raw,if=none,id=drive-virtio-disk54 \
--device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk54,id=virtio-disk54 \
+-device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk54,id=virtio-disk54 \
-drive
file=/var/lib/libvirt/images/disk-b-d.img,format=raw,if=none,id=drive-virtio-disk55 \
--device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk55,id=virtio-disk55 \
+-device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk55,id=virtio-disk55 \
-drive
file=/var/lib/libvirt/images/disk-c-a.img,format=raw,if=none,id=drive-virtio-disk78 \
--device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk78,id=virtio-disk78 \
+-device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk78,id=virtio-disk78 \
-drive
file=/var/lib/libvirt/images/disk-c-b.img,format=raw,if=none,id=drive-virtio-disk79 \
--device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk79,id=virtio-disk79 \
+-device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk79,id=virtio-disk79 \
-drive
file=/var/lib/libvirt/images/disk-c-c.img,format=raw,if=none,id=drive-virtio-disk80 \
--device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk80,id=virtio-disk80 \
+-device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk80,id=virtio-disk80 \
-drive
file=/var/lib/libvirt/images/disk-c-d.img,format=raw,if=none,id=drive-virtio-disk81 \
--device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk81,id=virtio-disk81 \
+-device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk81,id=virtio-disk81 \
-drive
file=/var/lib/libvirt/images/disk-d-a.img,format=raw,if=none,id=drive-virtio-disk104 \
--device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk104,id=virtio-disk104
\
+-device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk104,id=virtio-disk104
\
-drive
file=/var/lib/libvirt/images/disk-d-b.img,format=raw,if=none,id=drive-virtio-disk105 \
--device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk105,id=virtio-disk105
\
+-device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk105,id=virtio-disk105
\
-drive
file=/var/lib/libvirt/images/disk-d-c.img,format=raw,if=none,id=drive-virtio-disk106 \
--device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk106,id=virtio-disk106
\
+-device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk106,id=virtio-disk106
\
-drive
file=/var/lib/libvirt/images/disk-d-d.img,format=raw,if=none,id=drive-virtio-disk107 \
--device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk107,id=virtio-disk107
\
+-device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk107,id=virtio-disk107
\
-drive
file=/var/lib/libvirt/images/disk-e-a.img,format=raw,if=none,id=drive-virtio-disk130 \
--device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk130,id=virtio-disk130
\
+-device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk130,id=virtio-disk130
\
-drive
file=/var/lib/libvirt/images/disk-e-b.img,format=raw,if=none,id=drive-virtio-disk131 \
--device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk131,id=virtio-disk131
\
+-device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk131,id=virtio-disk131
\
-drive
file=/var/lib/libvirt/images/disk-e-c.img,format=raw,if=none,id=drive-virtio-disk132 \
--device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk132,id=virtio-disk132
\
+-device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk132,id=virtio-disk132
\
-drive
file=/var/lib/libvirt/images/disk-e-d.img,format=raw,if=none,id=drive-virtio-disk133 \
--device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk133,id=virtio-disk133
\
+-device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk133,id=virtio-disk133
\
-drive
file=/var/lib/libvirt/images/disk-f-a.img,format=raw,if=none,id=drive-virtio-disk156 \
--device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk156,id=virtio-disk156
\
+-device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk156,id=virtio-disk156
\
-drive
file=/var/lib/libvirt/images/disk-f-b.img,format=raw,if=none,id=drive-virtio-disk157 \
--device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk157,id=virtio-disk157
\
+-device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk157,id=virtio-disk157
\
-drive
file=/var/lib/libvirt/images/disk-f-c.img,format=raw,if=none,id=drive-virtio-disk158 \
--device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk158,id=virtio-disk158
\
+-device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk158,id=virtio-disk158
\
-drive
file=/var/lib/libvirt/images/disk-f-d.img,format=raw,if=none,id=drive-virtio-disk159 \
--device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk159,id=virtio-disk159
\
+-device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk159,id=virtio-disk159
\
-drive
file=/var/lib/libvirt/images/disk-g-a.img,format=raw,if=none,id=drive-virtio-disk182 \
--device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk182,id=virtio-disk182
\
+-device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182
\
-drive
file=/var/lib/libvirt/images/disk-g-b.img,format=raw,if=none,id=drive-virtio-disk183 \
--device virtio-blk-pci,bus=pci.1,addr=0x1,drive=drive-virtio-disk183,id=virtio-disk183 \
+-device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183
\
-drive
file=/var/lib/libvirt/images/disk-g-c.img,format=raw,if=none,id=drive-virtio-disk184 \
--device virtio-blk-pci,bus=pci.1,addr=0x2,drive=drive-virtio-disk184,id=virtio-disk184 \
+-device virtio-blk-pci,bus=pci.1,addr=0x1,drive=drive-virtio-disk184,id=virtio-disk184 \
-drive
file=/var/lib/libvirt/images/disk-g-d.img,format=raw,if=none,id=drive-virtio-disk185 \
--device virtio-blk-pci,bus=pci.1,addr=0x3,drive=drive-virtio-disk185,id=virtio-disk185 \
+-device virtio-blk-pci,bus=pci.1,addr=0x2,drive=drive-virtio-disk185,id=virtio-disk185 \
-drive
file=/var/lib/libvirt/images/disk-h-a.img,format=raw,if=none,id=drive-virtio-disk208 \
--device virtio-blk-pci,bus=pci.1,addr=0x4,drive=drive-virtio-disk208,id=virtio-disk208 \
+-device virtio-blk-pci,bus=pci.1,addr=0x3,drive=drive-virtio-disk208,id=virtio-disk208 \
-drive
file=/var/lib/libvirt/images/disk-h-b.img,format=raw,if=none,id=drive-virtio-disk209 \
--device virtio-blk-pci,bus=pci.1,addr=0x5,drive=drive-virtio-disk209,id=virtio-disk209 \
+-device virtio-blk-pci,bus=pci.1,addr=0x4,drive=drive-virtio-disk209,id=virtio-disk209 \
-drive
file=/var/lib/libvirt/images/disk-h-c.img,format=raw,if=none,id=drive-virtio-disk210 \
--device virtio-blk-pci,bus=pci.1,addr=0x6,drive=drive-virtio-disk210,id=virtio-disk210 \
+-device virtio-blk-pci,bus=pci.1,addr=0x5,drive=drive-virtio-disk210,id=virtio-disk210 \
-drive
file=/var/lib/libvirt/images/disk-h-d.img,format=raw,if=none,id=drive-virtio-disk211 \
--device virtio-blk-pci,bus=pci.1,addr=0x7,drive=drive-virtio-disk211,id=virtio-disk211 \
+-device virtio-blk-pci,bus=pci.1,addr=0x6,drive=drive-virtio-disk211,id=virtio-disk211 \
-drive
file=/var/lib/libvirt/images/disk-i-a.img,format=raw,if=none,id=drive-virtio-disk234 \
--device virtio-blk-pci,bus=pci.1,addr=0x8,drive=drive-virtio-disk234,id=virtio-disk234 \
+-device virtio-blk-pci,bus=pci.1,addr=0x7,drive=drive-virtio-disk234,id=virtio-disk234 \
-drive
file=/var/lib/libvirt/images/disk-i-b.img,format=raw,if=none,id=drive-virtio-disk235 \
--device virtio-blk-pci,bus=pci.1,addr=0x9,drive=drive-virtio-disk235,id=virtio-disk235 \
+-device virtio-blk-pci,bus=pci.1,addr=0x8,drive=drive-virtio-disk235,id=virtio-disk235 \
-drive
file=/var/lib/libvirt/images/disk-i-c.img,format=raw,if=none,id=drive-virtio-disk236 \
--device virtio-blk-pci,bus=pci.1,addr=0xa,drive=drive-virtio-disk236,id=virtio-disk236 \
+-device virtio-blk-pci,bus=pci.1,addr=0x9,drive=drive-virtio-disk236,id=virtio-disk236 \
-drive
file=/var/lib/libvirt/images/disk-i-d.img,format=raw,if=none,id=drive-virtio-disk237 \
--device virtio-blk-pci,bus=pci.1,addr=0xb,drive=drive-virtio-disk237,id=virtio-disk237 \
+-device virtio-blk-pci,bus=pci.1,addr=0xa,drive=drive-virtio-disk237,id=virtio-disk237 \
-drive
file=/var/lib/libvirt/images/disk-j-a.img,format=raw,if=none,id=drive-virtio-disk260 \
--device virtio-blk-pci,bus=pci.1,addr=0xc,drive=drive-virtio-disk260,id=virtio-disk260 \
+-device virtio-blk-pci,bus=pci.1,addr=0xb,drive=drive-virtio-disk260,id=virtio-disk260 \
-drive
file=/var/lib/libvirt/images/disk-j-b.img,format=raw,if=none,id=drive-virtio-disk261 \
--device virtio-blk-pci,bus=pci.1,addr=0xd,drive=drive-virtio-disk261,id=virtio-disk261 \
+-device virtio-blk-pci,bus=pci.1,addr=0xc,drive=drive-virtio-disk261,id=virtio-disk261 \
-drive
file=/var/lib/libvirt/images/disk-j-c.img,format=raw,if=none,id=drive-virtio-disk262 \
--device virtio-blk-pci,bus=pci.1,addr=0xe,drive=drive-virtio-disk262,id=virtio-disk262 \
+-device virtio-blk-pci,bus=pci.1,addr=0xd,drive=drive-virtio-disk262,id=virtio-disk262 \
-drive
file=/var/lib/libvirt/images/disk-j-d.img,format=raw,if=none,id=drive-virtio-disk263 \
--device virtio-blk-pci,bus=pci.1,addr=0xf,drive=drive-virtio-disk263,id=virtio-disk263 \
+-device virtio-blk-pci,bus=pci.1,addr=0xe,drive=drive-virtio-disk263,id=virtio-disk263 \
-drive
file=/var/lib/libvirt/images/disk-k-a.img,format=raw,if=none,id=drive-virtio-disk286 \
--device virtio-blk-pci,bus=pci.1,addr=0x10,drive=drive-virtio-disk286,id=virtio-disk286
\
+-device virtio-blk-pci,bus=pci.1,addr=0xf,drive=drive-virtio-disk286,id=virtio-disk286 \
-drive
file=/var/lib/libvirt/images/disk-k-b.img,format=raw,if=none,id=drive-virtio-disk287 \
--device virtio-blk-pci,bus=pci.1,addr=0x11,drive=drive-virtio-disk287,id=virtio-disk287
\
+-device virtio-blk-pci,bus=pci.1,addr=0x10,drive=drive-virtio-disk287,id=virtio-disk287
\
-drive
file=/var/lib/libvirt/images/disk-k-c.img,format=raw,if=none,id=drive-virtio-disk288 \
--device virtio-blk-pci,bus=pci.1,addr=0x12,drive=drive-virtio-disk288,id=virtio-disk288
\
+-device virtio-blk-pci,bus=pci.1,addr=0x11,drive=drive-virtio-disk288,id=virtio-disk288
\
-drive
file=/var/lib/libvirt/images/disk-k-d.img,format=raw,if=none,id=drive-virtio-disk289 \
--device virtio-blk-pci,bus=pci.1,addr=0x13,drive=drive-virtio-disk289,id=virtio-disk289
\
+-device virtio-blk-pci,bus=pci.1,addr=0x12,drive=drive-virtio-disk289,id=virtio-disk289
\
-drive
file=/var/lib/libvirt/images/disk-l-a.img,format=raw,if=none,id=drive-virtio-disk312 \
--device virtio-blk-pci,bus=pci.1,addr=0x14,drive=drive-virtio-disk312,id=virtio-disk312
\
+-device virtio-blk-pci,bus=pci.1,addr=0x13,drive=drive-virtio-disk312,id=virtio-disk312
\
-drive
file=/var/lib/libvirt/images/disk-l-b.img,format=raw,if=none,id=drive-virtio-disk313 \
--device virtio-blk-pci,bus=pci.1,addr=0x15,drive=drive-virtio-disk313,id=virtio-disk313
\
+-device virtio-blk-pci,bus=pci.1,addr=0x14,drive=drive-virtio-disk313,id=virtio-disk313
\
-drive
file=/var/lib/libvirt/images/disk-l-c.img,format=raw,if=none,id=drive-virtio-disk314 \
--device virtio-blk-pci,bus=pci.1,addr=0x16,drive=drive-virtio-disk314,id=virtio-disk314
\
+-device virtio-blk-pci,bus=pci.1,addr=0x15,drive=drive-virtio-disk314,id=virtio-disk314
\
-drive
file=/var/lib/libvirt/images/disk-l-d.img,format=raw,if=none,id=drive-virtio-disk315 \
--device virtio-blk-pci,bus=pci.1,addr=0x17,drive=drive-virtio-disk315,id=virtio-disk315
\
+-device virtio-blk-pci,bus=pci.1,addr=0x16,drive=drive-virtio-disk315,id=virtio-disk315
\
-drive
file=/var/lib/libvirt/images/disk-m-a.img,format=raw,if=none,id=drive-virtio-disk338 \
--device virtio-blk-pci,bus=pci.1,addr=0x18,drive=drive-virtio-disk338,id=virtio-disk338
\
+-device virtio-blk-pci,bus=pci.1,addr=0x17,drive=drive-virtio-disk338,id=virtio-disk338
\
-drive
file=/var/lib/libvirt/images/disk-m-b.img,format=raw,if=none,id=drive-virtio-disk339 \
--device virtio-blk-pci,bus=pci.1,addr=0x19,drive=drive-virtio-disk339,id=virtio-disk339
\
+-device virtio-blk-pci,bus=pci.1,addr=0x18,drive=drive-virtio-disk339,id=virtio-disk339
\
-drive
file=/var/lib/libvirt/images/disk-m-c.img,format=raw,if=none,id=drive-virtio-disk340 \
--device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=drive-virtio-disk340,id=virtio-disk340
\
+-device virtio-blk-pci,bus=pci.1,addr=0x19,drive=drive-virtio-disk340,id=virtio-disk340
\
-drive
file=/var/lib/libvirt/images/disk-m-d.img,format=raw,if=none,id=drive-virtio-disk341 \
--device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=drive-virtio-disk341,id=virtio-disk341
\
+-device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=drive-virtio-disk341,id=virtio-disk341
\
-drive
file=/var/lib/libvirt/images/disk-n-a.img,format=raw,if=none,id=drive-virtio-disk364 \
--device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=drive-virtio-disk364,id=virtio-disk364
\
+-device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=drive-virtio-disk364,id=virtio-disk364
\
-drive
file=/var/lib/libvirt/images/disk-n-b.img,format=raw,if=none,id=drive-virtio-disk365 \
--device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=drive-virtio-disk365,id=virtio-disk365
\
+-device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=drive-virtio-disk365,id=virtio-disk365
\
-drive
file=/var/lib/libvirt/images/disk-n-c.img,format=raw,if=none,id=drive-virtio-disk366 \
--device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=drive-virtio-disk366,id=virtio-disk366
\
+-device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=drive-virtio-disk366,id=virtio-disk366
\
-drive
file=/var/lib/libvirt/images/disk-n-d.img,format=raw,if=none,id=drive-virtio-disk367 \
--device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=drive-virtio-disk367,id=virtio-disk367
\
+-device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=drive-virtio-disk367,id=virtio-disk367
\
-drive
file=/var/lib/libvirt/images/disk-o-a.img,format=raw,if=none,id=drive-virtio-disk390 \
--device virtio-blk-pci,bus=pci.2,addr=0x1,drive=drive-virtio-disk390,id=virtio-disk390 \
+-device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=drive-virtio-disk390,id=virtio-disk390
\
-drive
file=/var/lib/libvirt/images/disk-o-b.img,format=raw,if=none,id=drive-virtio-disk391 \
--device virtio-blk-pci,bus=pci.2,addr=0x2,drive=drive-virtio-disk391,id=virtio-disk391 \
+-device virtio-blk-pci,bus=pci.2,addr=0x1,drive=drive-virtio-disk391,id=virtio-disk391 \
-drive
file=/var/lib/libvirt/images/disk-o-c.img,format=raw,if=none,id=drive-virtio-disk392 \
--device virtio-blk-pci,bus=pci.2,addr=0x3,drive=drive-virtio-disk392,id=virtio-disk392 \
+-device virtio-blk-pci,bus=pci.2,addr=0x2,drive=drive-virtio-disk392,id=virtio-disk392 \
-drive
file=/var/lib/libvirt/images/disk-o-d.img,format=raw,if=none,id=drive-virtio-disk393 \
--device virtio-blk-pci,bus=pci.2,addr=0x4,drive=drive-virtio-disk393,id=virtio-disk393 \
+-device virtio-blk-pci,bus=pci.2,addr=0x3,drive=drive-virtio-disk393,id=virtio-disk393 \
-drive
file=/var/lib/libvirt/images/disk-p-a.img,format=raw,if=none,id=drive-virtio-disk416 \
--device virtio-blk-pci,bus=pci.2,addr=0x5,drive=drive-virtio-disk416,id=virtio-disk416 \
+-device virtio-blk-pci,bus=pci.2,addr=0x4,drive=drive-virtio-disk416,id=virtio-disk416 \
-drive
file=/var/lib/libvirt/images/disk-p-b.img,format=raw,if=none,id=drive-virtio-disk417 \
--device virtio-blk-pci,bus=pci.2,addr=0x6,drive=drive-virtio-disk417,id=virtio-disk417 \
+-device virtio-blk-pci,bus=pci.2,addr=0x5,drive=drive-virtio-disk417,id=virtio-disk417 \
-drive
file=/var/lib/libvirt/images/disk-p-c.img,format=raw,if=none,id=drive-virtio-disk418 \
--device virtio-blk-pci,bus=pci.2,addr=0x7,drive=drive-virtio-disk418,id=virtio-disk418 \
+-device virtio-blk-pci,bus=pci.2,addr=0x6,drive=drive-virtio-disk418,id=virtio-disk418 \
-drive
file=/var/lib/libvirt/images/disk-p-d.img,format=raw,if=none,id=drive-virtio-disk419 \
--device virtio-blk-pci,bus=pci.2,addr=0x8,drive=drive-virtio-disk419,id=virtio-disk419 \
+-device virtio-blk-pci,bus=pci.2,addr=0x7,drive=drive-virtio-disk419,id=virtio-disk419 \
-drive
file=/var/lib/libvirt/images/disk-q-a.img,format=raw,if=none,id=drive-virtio-disk442 \
--device virtio-blk-pci,bus=pci.2,addr=0x9,drive=drive-virtio-disk442,id=virtio-disk442 \
+-device virtio-blk-pci,bus=pci.2,addr=0x8,drive=drive-virtio-disk442,id=virtio-disk442 \
-drive
file=/var/lib/libvirt/images/disk-q-b.img,format=raw,if=none,id=drive-virtio-disk443 \
--device virtio-blk-pci,bus=pci.2,addr=0xa,drive=drive-virtio-disk443,id=virtio-disk443 \
+-device virtio-blk-pci,bus=pci.2,addr=0x9,drive=drive-virtio-disk443,id=virtio-disk443 \
-drive
file=/var/lib/libvirt/images/disk-q-c.img,format=raw,if=none,id=drive-virtio-disk444 \
--device virtio-blk-pci,bus=pci.2,addr=0xb,drive=drive-virtio-disk444,id=virtio-disk444 \
+-device virtio-blk-pci,bus=pci.2,addr=0xa,drive=drive-virtio-disk444,id=virtio-disk444 \
-drive
file=/var/lib/libvirt/images/disk-q-d.img,format=raw,if=none,id=drive-virtio-disk445 \
--device virtio-blk-pci,bus=pci.2,addr=0xc,drive=drive-virtio-disk445,id=virtio-disk445 \
+-device virtio-blk-pci,bus=pci.2,addr=0xb,drive=drive-virtio-disk445,id=virtio-disk445 \
-drive
file=/var/lib/libvirt/images/disk-r-a.img,format=raw,if=none,id=drive-virtio-disk468 \
--device virtio-blk-pci,bus=pci.2,addr=0xd,drive=drive-virtio-disk468,id=virtio-disk468 \
+-device virtio-blk-pci,bus=pci.2,addr=0xc,drive=drive-virtio-disk468,id=virtio-disk468 \
-drive
file=/var/lib/libvirt/images/disk-r-b.img,format=raw,if=none,id=drive-virtio-disk469 \
--device virtio-blk-pci,bus=pci.2,addr=0xe,drive=drive-virtio-disk469,id=virtio-disk469 \
+-device virtio-blk-pci,bus=pci.2,addr=0xd,drive=drive-virtio-disk469,id=virtio-disk469 \
-drive
file=/var/lib/libvirt/images/disk-r-c.img,format=raw,if=none,id=drive-virtio-disk470 \
--device virtio-blk-pci,bus=pci.2,addr=0xf,drive=drive-virtio-disk470,id=virtio-disk470 \
+-device virtio-blk-pci,bus=pci.2,addr=0xe,drive=drive-virtio-disk470,id=virtio-disk470 \
-drive
file=/var/lib/libvirt/images/disk-r-d.img,format=raw,if=none,id=drive-virtio-disk471 \
--device virtio-blk-pci,bus=pci.2,addr=0x10,drive=drive-virtio-disk471,id=virtio-disk471
\
+-device virtio-blk-pci,bus=pci.2,addr=0xf,drive=drive-virtio-disk471,id=virtio-disk471 \
-drive
file=/var/lib/libvirt/images/disk-s-a.img,format=raw,if=none,id=drive-virtio-disk494 \
--device virtio-blk-pci,bus=pci.2,addr=0x11,drive=drive-virtio-disk494,id=virtio-disk494
\
+-device virtio-blk-pci,bus=pci.2,addr=0x10,drive=drive-virtio-disk494,id=virtio-disk494
\
-drive
file=/var/lib/libvirt/images/disk-s-b.img,format=raw,if=none,id=drive-virtio-disk495 \
--device virtio-blk-pci,bus=pci.2,addr=0x12,drive=drive-virtio-disk495,id=virtio-disk495
\
+-device virtio-blk-pci,bus=pci.2,addr=0x11,drive=drive-virtio-disk495,id=virtio-disk495
\
-drive
file=/var/lib/libvirt/images/disk-s-c.img,format=raw,if=none,id=drive-virtio-disk496 \
--device virtio-blk-pci,bus=pci.2,addr=0x13,drive=drive-virtio-disk496,id=virtio-disk496
\
+-device virtio-blk-pci,bus=pci.2,addr=0x12,drive=drive-virtio-disk496,id=virtio-disk496
\
-drive
file=/var/lib/libvirt/images/disk-s-d.img,format=raw,if=none,id=drive-virtio-disk497 \
--device virtio-blk-pci,bus=pci.2,addr=0x14,drive=drive-virtio-disk497,id=virtio-disk497
\
+-device virtio-blk-pci,bus=pci.2,addr=0x13,drive=drive-virtio-disk497,id=virtio-disk497
\
-drive
file=/var/lib/libvirt/images/disk-t-a.img,format=raw,if=none,id=drive-virtio-disk520 \
--device virtio-blk-pci,bus=pci.2,addr=0x15,drive=drive-virtio-disk520,id=virtio-disk520
\
+-device virtio-blk-pci,bus=pci.2,addr=0x14,drive=drive-virtio-disk520,id=virtio-disk520
\
-drive
file=/var/lib/libvirt/images/disk-t-b.img,format=raw,if=none,id=drive-virtio-disk521 \
--device virtio-blk-pci,bus=pci.2,addr=0x16,drive=drive-virtio-disk521,id=virtio-disk521
\
+-device virtio-blk-pci,bus=pci.2,addr=0x15,drive=drive-virtio-disk521,id=virtio-disk521
\
-drive
file=/var/lib/libvirt/images/disk-t-c.img,format=raw,if=none,id=drive-virtio-disk522 \
--device virtio-blk-pci,bus=pci.2,addr=0x17,drive=drive-virtio-disk522,id=virtio-disk522
\
+-device virtio-blk-pci,bus=pci.2,addr=0x16,drive=drive-virtio-disk522,id=virtio-disk522
\
-drive
file=/var/lib/libvirt/images/disk-t-d.img,format=raw,if=none,id=drive-virtio-disk523 \
--device virtio-blk-pci,bus=pci.2,addr=0x18,drive=drive-virtio-disk523,id=virtio-disk523
\
+-device virtio-blk-pci,bus=pci.2,addr=0x17,drive=drive-virtio-disk523,id=virtio-disk523
\
-drive
file=/var/lib/libvirt/images/disk-u-a.img,format=raw,if=none,id=drive-virtio-disk546 \
--device virtio-blk-pci,bus=pci.2,addr=0x19,drive=drive-virtio-disk546,id=virtio-disk546
\
+-device virtio-blk-pci,bus=pci.2,addr=0x18,drive=drive-virtio-disk546,id=virtio-disk546
\
-drive
file=/var/lib/libvirt/images/disk-u-b.img,format=raw,if=none,id=drive-virtio-disk547 \
--device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=drive-virtio-disk547,id=virtio-disk547
\
+-device virtio-blk-pci,bus=pci.2,addr=0x19,drive=drive-virtio-disk547,id=virtio-disk547
\
-drive
file=/var/lib/libvirt/images/disk-u-c.img,format=raw,if=none,id=drive-virtio-disk548 \
--device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=drive-virtio-disk548,id=virtio-disk548
\
+-device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=drive-virtio-disk548,id=virtio-disk548
\
-drive
file=/var/lib/libvirt/images/disk-u-d.img,format=raw,if=none,id=drive-virtio-disk549 \
--device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=drive-virtio-disk549,id=virtio-disk549
\
+-device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=drive-virtio-disk549,id=virtio-disk549
\
-drive
file=/var/lib/libvirt/images/disk-v-a.img,format=raw,if=none,id=drive-virtio-disk572 \
--device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=drive-virtio-disk572,id=virtio-disk572
\
+-device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=drive-virtio-disk572,id=virtio-disk572
\
-drive
file=/var/lib/libvirt/images/disk-v-b.img,format=raw,if=none,id=drive-virtio-disk573 \
--device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=drive-virtio-disk573,id=virtio-disk573
\
+-device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=drive-virtio-disk573,id=virtio-disk573
\
-drive
file=/var/lib/libvirt/images/disk-v-c.img,format=raw,if=none,id=drive-virtio-disk574 \
--device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=drive-virtio-disk574,id=virtio-disk574
\
+-device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=drive-virtio-disk574,id=virtio-disk574
\
-drive
file=/var/lib/libvirt/images/disk-v-d.img,format=raw,if=none,id=drive-virtio-disk575 \
--device virtio-blk-pci,bus=pci.3,addr=0x1,drive=drive-virtio-disk575,id=virtio-disk575 \
+-device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=drive-virtio-disk575,id=virtio-disk575
\
-drive
file=/var/lib/libvirt/images/disk-w-a.img,format=raw,if=none,id=drive-virtio-disk598 \
--device virtio-blk-pci,bus=pci.3,addr=0x2,drive=drive-virtio-disk598,id=virtio-disk598 \
+-device virtio-blk-pci,bus=pci.3,addr=0x1,drive=drive-virtio-disk598,id=virtio-disk598 \
-drive
file=/var/lib/libvirt/images/disk-w-b.img,format=raw,if=none,id=drive-virtio-disk599 \
--device virtio-blk-pci,bus=pci.3,addr=0x3,drive=drive-virtio-disk599,id=virtio-disk599 \
+-device virtio-blk-pci,bus=pci.3,addr=0x2,drive=drive-virtio-disk599,id=virtio-disk599 \
-drive
file=/var/lib/libvirt/images/disk-w-c.img,format=raw,if=none,id=drive-virtio-disk600 \
--device virtio-blk-pci,bus=pci.3,addr=0x4,drive=drive-virtio-disk600,id=virtio-disk600 \
+-device virtio-blk-pci,bus=pci.3,addr=0x3,drive=drive-virtio-disk600,id=virtio-disk600 \
-drive
file=/var/lib/libvirt/images/disk-w-d.img,format=raw,if=none,id=drive-virtio-disk601 \
--device virtio-blk-pci,bus=pci.3,addr=0x5,drive=drive-virtio-disk601,id=virtio-disk601 \
+-device virtio-blk-pci,bus=pci.3,addr=0x4,drive=drive-virtio-disk601,id=virtio-disk601 \
-drive
file=/var/lib/libvirt/images/disk-x-a.img,format=raw,if=none,id=drive-virtio-disk624 \
--device virtio-blk-pci,bus=pci.3,addr=0x6,drive=drive-virtio-disk624,id=virtio-disk624 \
+-device virtio-blk-pci,bus=pci.3,addr=0x5,drive=drive-virtio-disk624,id=virtio-disk624 \
-drive
file=/var/lib/libvirt/images/disk-x-b.img,format=raw,if=none,id=drive-virtio-disk625 \
--device virtio-blk-pci,bus=pci.3,addr=0x7,drive=drive-virtio-disk625,id=virtio-disk625 \
+-device virtio-blk-pci,bus=pci.3,addr=0x6,drive=drive-virtio-disk625,id=virtio-disk625 \
-drive
file=/var/lib/libvirt/images/disk-x-c.img,format=raw,if=none,id=drive-virtio-disk626 \
--device virtio-blk-pci,bus=pci.3,addr=0x8,drive=drive-virtio-disk626,id=virtio-disk626 \
+-device virtio-blk-pci,bus=pci.3,addr=0x7,drive=drive-virtio-disk626,id=virtio-disk626 \
-drive
file=/var/lib/libvirt/images/disk-x-d.img,format=raw,if=none,id=drive-virtio-disk627 \
--device virtio-blk-pci,bus=pci.3,addr=0x9,drive=drive-virtio-disk627,id=virtio-disk627 \
+-device virtio-blk-pci,bus=pci.3,addr=0x8,drive=drive-virtio-disk627,id=virtio-disk627 \
-drive
file=/var/lib/libvirt/images/disk-y-a.img,format=raw,if=none,id=drive-virtio-disk650 \
--device virtio-blk-pci,bus=pci.3,addr=0xa,drive=drive-virtio-disk650,id=virtio-disk650 \
+-device virtio-blk-pci,bus=pci.3,addr=0x9,drive=drive-virtio-disk650,id=virtio-disk650 \
-drive
file=/var/lib/libvirt/images/disk-y-b.img,format=raw,if=none,id=drive-virtio-disk651 \
--device virtio-blk-pci,bus=pci.3,addr=0xb,drive=drive-virtio-disk651,id=virtio-disk651 \
+-device virtio-blk-pci,bus=pci.3,addr=0xa,drive=drive-virtio-disk651,id=virtio-disk651 \
-drive
file=/var/lib/libvirt/images/disk-y-c.img,format=raw,if=none,id=drive-virtio-disk652 \
--device virtio-blk-pci,bus=pci.3,addr=0xc,drive=drive-virtio-disk652,id=virtio-disk652 \
+-device virtio-blk-pci,bus=pci.3,addr=0xb,drive=drive-virtio-disk652,id=virtio-disk652 \
-drive
file=/var/lib/libvirt/images/disk-y-d.img,format=raw,if=none,id=drive-virtio-disk653 \
--device virtio-blk-pci,bus=pci.3,addr=0xd,drive=drive-virtio-disk653,id=virtio-disk653 \
+-device virtio-blk-pci,bus=pci.3,addr=0xc,drive=drive-virtio-disk653,id=virtio-disk653 \
-drive
file=/var/lib/libvirt/images/disk-z-a.img,format=raw,if=none,id=drive-virtio-disk676 \
--device virtio-blk-pci,bus=pci.3,addr=0xe,drive=drive-virtio-disk676,id=virtio-disk676 \
+-device virtio-blk-pci,bus=pci.3,addr=0xd,drive=drive-virtio-disk676,id=virtio-disk676 \
-drive
file=/var/lib/libvirt/images/disk-z-b.img,format=raw,if=none,id=drive-virtio-disk677 \
--device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk677,id=virtio-disk677 \
+-device virtio-blk-pci,bus=pci.3,addr=0xe,drive=drive-virtio-disk677,id=virtio-disk677 \
-drive
file=/var/lib/libvirt/images/disk-z-c.img,format=raw,if=none,id=drive-virtio-disk678 \
--device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk678,id=virtio-disk678
\
+-device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk678,id=virtio-disk678 \
-drive
file=/var/lib/libvirt/images/disk-z-d.img,format=raw,if=none,id=drive-virtio-disk679 \
--device virtio-blk-pci,bus=pci.3,addr=0x11,drive=drive-virtio-disk679,id=virtio-disk679
+-device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk679,id=virtio-disk679
diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args
b/tests/qemuxml2argvdata/pci-expander-bus.args
index c010cc90c9..a4fcd982fe 100644
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -25,70 +25,70 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device pxb,bus_nr=254,id=pci.1,numa_node=1,bus=pci.0,addr=0x3 \
--device pxb,bus_nr=252,id=pci.2,bus=pci.0,addr=0x4 \
+-device pxb,bus_nr=254,id=pci.1,numa_node=1,bus=pci.0,addr=0x2 \
+-device pxb,bus_nr=252,id=pci.2,bus=pci.0,addr=0x3 \
-netdev user,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.0,addr=0x5 \
+-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.0,addr=0x4 \
-netdev user,id=hostnet1 \
--device e1000,netdev=hostnet1,id=net1,mac=52:54:00:5c:c6:1a,bus=pci.0,addr=0x7 \
+-device e1000,netdev=hostnet1,id=net1,mac=52:54:00:5c:c6:1a,bus=pci.0,addr=0x5 \
-netdev user,id=hostnet2 \
--device e1000,netdev=hostnet2,id=net2,mac=52:54:00:39:97:ac,bus=pci.0,addr=0x8 \
+-device e1000,netdev=hostnet2,id=net2,mac=52:54:00:39:97:ac,bus=pci.0,addr=0x7 \
-netdev user,id=hostnet3 \
--device e1000,netdev=hostnet3,id=net3,mac=52:54:00:45:28:cb,bus=pci.0,addr=0x9 \
+-device e1000,netdev=hostnet3,id=net3,mac=52:54:00:45:28:cb,bus=pci.0,addr=0x8 \
-netdev user,id=hostnet4 \
--device e1000,netdev=hostnet4,id=net4,mac=52:54:00:ee:b9:a8,bus=pci.0,addr=0xa \
+-device e1000,netdev=hostnet4,id=net4,mac=52:54:00:ee:b9:a8,bus=pci.0,addr=0x9 \
-netdev user,id=hostnet5 \
--device e1000,netdev=hostnet5,id=net5,mac=52:54:00:a9:f7:17,bus=pci.0,addr=0xb \
+-device e1000,netdev=hostnet5,id=net5,mac=52:54:00:a9:f7:17,bus=pci.0,addr=0xa \
-netdev user,id=hostnet6 \
--device e1000,netdev=hostnet6,id=net6,mac=52:54:00:df:2b:f3,bus=pci.0,addr=0xc \
+-device e1000,netdev=hostnet6,id=net6,mac=52:54:00:df:2b:f3,bus=pci.0,addr=0xb \
-netdev user,id=hostnet7 \
--device e1000,netdev=hostnet7,id=net7,mac=52:54:00:78:94:b4,bus=pci.0,addr=0xd \
+-device e1000,netdev=hostnet7,id=net7,mac=52:54:00:78:94:b4,bus=pci.0,addr=0xc \
-netdev user,id=hostnet8 \
--device e1000,netdev=hostnet8,id=net8,mac=52:54:00:6b:9b:06,bus=pci.0,addr=0xe \
+-device e1000,netdev=hostnet8,id=net8,mac=52:54:00:6b:9b:06,bus=pci.0,addr=0xd \
-netdev user,id=hostnet9 \
--device e1000,netdev=hostnet9,id=net9,mac=52:54:00:17:df:bc,bus=pci.0,addr=0xf \
+-device e1000,netdev=hostnet9,id=net9,mac=52:54:00:17:df:bc,bus=pci.0,addr=0xe \
-netdev user,id=hostnet10 \
--device e1000,netdev=hostnet10,id=net10,mac=52:54:00:3b:d0:51,bus=pci.0,addr=0x10 \
+-device e1000,netdev=hostnet10,id=net10,mac=52:54:00:3b:d0:51,bus=pci.0,addr=0xf \
-netdev user,id=hostnet11 \
--device e1000,netdev=hostnet11,id=net11,mac=52:54:00:8d:2d:17,bus=pci.0,addr=0x11 \
+-device e1000,netdev=hostnet11,id=net11,mac=52:54:00:8d:2d:17,bus=pci.0,addr=0x10 \
-netdev user,id=hostnet12 \
--device e1000,netdev=hostnet12,id=net12,mac=52:54:00:a7:66:af,bus=pci.0,addr=0x12 \
+-device e1000,netdev=hostnet12,id=net12,mac=52:54:00:a7:66:af,bus=pci.0,addr=0x11 \
-netdev user,id=hostnet13 \
--device e1000,netdev=hostnet13,id=net13,mac=52:54:00:54:ab:d7,bus=pci.0,addr=0x13 \
+-device e1000,netdev=hostnet13,id=net13,mac=52:54:00:54:ab:d7,bus=pci.0,addr=0x12 \
-netdev user,id=hostnet14 \
--device e1000,netdev=hostnet14,id=net14,mac=52:54:00:1f:99:90,bus=pci.0,addr=0x14 \
+-device e1000,netdev=hostnet14,id=net14,mac=52:54:00:1f:99:90,bus=pci.0,addr=0x13 \
-netdev user,id=hostnet15 \
--device e1000,netdev=hostnet15,id=net15,mac=52:54:00:c8:43:87,bus=pci.0,addr=0x15 \
+-device e1000,netdev=hostnet15,id=net15,mac=52:54:00:c8:43:87,bus=pci.0,addr=0x14 \
-netdev user,id=hostnet16 \
--device e1000,netdev=hostnet16,id=net16,mac=52:54:00:df:22:b2,bus=pci.0,addr=0x16 \
+-device e1000,netdev=hostnet16,id=net16,mac=52:54:00:df:22:b2,bus=pci.0,addr=0x15 \
-netdev user,id=hostnet17 \
--device e1000,netdev=hostnet17,id=net17,mac=52:54:00:d2:9a:47,bus=pci.0,addr=0x17 \
+-device e1000,netdev=hostnet17,id=net17,mac=52:54:00:d2:9a:47,bus=pci.0,addr=0x16 \
-netdev user,id=hostnet18 \
--device e1000,netdev=hostnet18,id=net18,mac=52:54:00:86:05:e2,bus=pci.0,addr=0x18 \
+-device e1000,netdev=hostnet18,id=net18,mac=52:54:00:86:05:e2,bus=pci.0,addr=0x17 \
-netdev user,id=hostnet19 \
--device e1000,netdev=hostnet19,id=net19,mac=52:54:00:8c:1c:c2,bus=pci.0,addr=0x19 \
+-device e1000,netdev=hostnet19,id=net19,mac=52:54:00:8c:1c:c2,bus=pci.0,addr=0x18 \
-netdev user,id=hostnet20 \
--device e1000,netdev=hostnet20,id=net20,mac=52:54:00:48:58:92,bus=pci.0,addr=0x1a \
+-device e1000,netdev=hostnet20,id=net20,mac=52:54:00:48:58:92,bus=pci.0,addr=0x19 \
-netdev user,id=hostnet21 \
--device e1000,netdev=hostnet21,id=net21,mac=52:54:00:99:e5:bf,bus=pci.0,addr=0x1b \
+-device e1000,netdev=hostnet21,id=net21,mac=52:54:00:99:e5:bf,bus=pci.0,addr=0x1a \
-netdev user,id=hostnet22 \
--device e1000,netdev=hostnet22,id=net22,mac=52:54:00:b1:8c:25,bus=pci.0,addr=0x1c \
+-device e1000,netdev=hostnet22,id=net22,mac=52:54:00:b1:8c:25,bus=pci.0,addr=0x1b \
-netdev user,id=hostnet23 \
--device e1000,netdev=hostnet23,id=net23,mac=52:54:00:60:e0:d0,bus=pci.0,addr=0x1d \
+-device e1000,netdev=hostnet23,id=net23,mac=52:54:00:60:e0:d0,bus=pci.0,addr=0x1c \
-netdev user,id=hostnet24 \
--device e1000,netdev=hostnet24,id=net24,mac=52:54:00:37:00:6a,bus=pci.0,addr=0x1e \
+-device e1000,netdev=hostnet24,id=net24,mac=52:54:00:37:00:6a,bus=pci.0,addr=0x1d \
-netdev user,id=hostnet25 \
--device e1000,netdev=hostnet25,id=net25,mac=52:54:00:c7:c8:ad,bus=pci.0,addr=0x1f \
+-device e1000,netdev=hostnet25,id=net25,mac=52:54:00:c7:c8:ad,bus=pci.0,addr=0x1e \
-netdev user,id=hostnet26 \
--device e1000,netdev=hostnet26,id=net26,mac=52:54:00:4e:a7:cf,bus=pci.1,addr=0x0 \
+-device e1000,netdev=hostnet26,id=net26,mac=52:54:00:4e:a7:cf,bus=pci.0,addr=0x1f \
-netdev user,id=hostnet27 \
--device e1000,netdev=hostnet27,id=net27,mac=52:54:00:00:79:69,bus=pci.1,addr=0x1 \
+-device e1000,netdev=hostnet27,id=net27,mac=52:54:00:00:79:69,bus=pci.1,addr=0x0 \
-netdev user,id=hostnet28 \
--device e1000,netdev=hostnet28,id=net28,mac=52:54:00:47:00:6f,bus=pci.1,addr=0x2 \
+-device e1000,netdev=hostnet28,id=net28,mac=52:54:00:47:00:6f,bus=pci.1,addr=0x1 \
-netdev user,id=hostnet29 \
--device e1000,netdev=hostnet29,id=net29,mac=52:54:00:2a:8c:8b,bus=pci.1,addr=0x3 \
+-device e1000,netdev=hostnet29,id=net29,mac=52:54:00:2a:8c:8b,bus=pci.1,addr=0x2 \
-netdev user,id=hostnet30 \
--device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x4 \
+-device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x3 \
-netdev user,id=hostnet31 \
--device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x5 \
+-device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args
b/tests/qemuxml2argvdata/pci-rom-disabled.args
index 1552a069f5..10fd805c8e 100644
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x3,romfile=
+-device
virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,romfile=
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index 047f27d2d9..1d0eeb17e0 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -27,9 +27,9 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
--device
virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x3,rombar=1
\
+-device
virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,rombar=1
\
-netdev user,id=hostnet1 \
--device
virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:24:a5:9e,bus=pci.0,addr=0x4,romfile=/etc/fake/bootrom.bin
\
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x5,rombar=0 \
--device
vfio-pci,host=0000:06:12.6,id=hostdev1,bus=pci.0,addr=0x6,rombar=1,romfile=/etc/fake/bootrom.bin
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
+-device
virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:24:a5:9e,bus=pci.0,addr=0x3,romfile=/etc/fake/bootrom.bin
\
+-device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x4,rombar=0 \
+-device
vfio-pci,host=0000:06:12.6,id=hostdev1,bus=pci.0,addr=0x5,rombar=1,romfile=/etc/fake/bootrom.bin
\
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index 543c645b8b..d4e1768e52 100644
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev tty,id=charserial0,path=/dev/ttyS2 \
-device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index 234f58be60..ea3a735b9c 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -23,6 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device pcie-root-port,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2
\
--device pcie-root-port,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
--device ioh3420,port=0x12,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2
+-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1
\
+-device pcie-root-port,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-device ioh3420,port=0xa,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index 38f61ccc13..d0ffa60b86 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -23,5 +23,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
--device ioh3420,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1
+-device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
+-device ioh3420,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1
diff --git a/tests/qemuxml2argvdata/pcihole64.args
b/tests/qemuxml2argvdata/pcihole64.args
index 9cf277b390..2d45126d01 100644
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-global i440FX-pcihost.pci-hole64-size=1048576K \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args
b/tests/qemuxml2argvdata/q35-pci-force-address.args
index 19f8648c7c..e61a43dfe0 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
-netdev user,id=hostnet0 \
-device e1000e,netdev=hostnet0,id=net0,mac=52:54:00:aa:bf:ef,bus=pci.2,addr=0x1 \
-device intel-hda,id=sound0,bus=pci.3,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index 0f9a375230..f75686f463 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-global PIIX4_PM.disable_s4=1 \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args
b/tests/qemuxml2argvdata/q35-pm-disable.args
index 485ea80e14..dcdd457432 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
-global ICH9-LPC.disable_s4=1 \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args
b/tests/qemuxml2argvdata/qemu-ns-alt.args
index 04c9a66cb9..19c884813b 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -28,5 +28,5 @@ BAR='' \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-unknown parameter
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index 05bab92f30..d88a94b4bd 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
ARGUMENT
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index 05bab92f30..d88a94b4bd 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
ARGUMENT
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index 05bab92f30..d88a94b4bd 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
ARGUMENT
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index 05bab92f30..d88a94b4bd 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
ARGUMENT
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index 05bab92f30..d88a94b4bd 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
ARGUMENT
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index 05bab92f30..d88a94b4bd 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
ARGUMENT
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args
b/tests/qemuxml2argvdata/restore-v2-fd.args
index 1fe1913513..9535795942 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-incoming fd:7 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args
b/tests/qemuxml2argvdata/seclabel-dac-none.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index c1c4ffcf99..72dbb0f1c5 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-1 \
-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args
b/tests/qemuxml2argvdata/seclabel-dynamic.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/seclabel-none.args
b/tests/qemuxml2argvdata/seclabel-none.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args
b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/seclabel-static.args
b/tests/qemuxml2argvdata/seclabel-static.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index 7669ecd87c..a3a3c71c3f 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev tty,id=charserial0,path=/dev/ttyS2 \
-device isa-serial,chardev=charserial0,id=serial0,iobase=0x3f8,irq=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args
b/tests/qemuxml2argvdata/serial-dev-chardev.args
index a55f247077..209e27bdc9 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev tty,id=charserial0,path=/dev/ttyS2 \
-device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args
b/tests/qemuxml2argvdata/serial-file-chardev.args
index 5654e1ac13..99c67377a5 100644
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev file,id=charserial0,path=/tmp/serial.log,append=on \
-device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args
b/tests/qemuxml2argvdata/serial-many-chardev.args
index 9918c3a599..6656a6009e 100644
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -30,4 +30,4 @@ QEMU_AUDIO_DRV=none \
-device isa-serial,chardev=charserial0,id=serial0 \
-chardev file,id=charserial1,path=/tmp/serial.log \
-device isa-serial,chardev=charserial1,id=serial1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args
b/tests/qemuxml2argvdata/serial-pty-chardev.args
index e46ad10442..10370f6483 100644
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
index 5770ba928a..699ed70abc 100644
--- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index 963619be2b..cc7d6b8639 100644
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev socket,id=charserial0,host=127.0.0.1,port=9999 \
-device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index ec834152fa..d9e450fe75 100644
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet=on,server=on,wait=off \
-device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index cb62e40f48..06ff3a3a4d 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-object
tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on
\
-chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
-device isa-serial,chardev=charserial1,id=serial1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index cb62e40f48..06ff3a3a4d 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-object
tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on
\
-chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
-device isa-serial,chardev=charserial1,id=serial1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args
b/tests/qemuxml2argvdata/serial-udp-chardev.args
index bf92f10578..dfbc7e11e1 100644
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -30,4 +30,4 @@ QEMU_AUDIO_DRV=none \
-device isa-serial,chardev=charserial0,id=serial0 \
-chardev udp,id=charserial1,host=,port=9999,localaddr=,localport=0 \
-device isa-serial,chardev=charserial1,id=serial1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args
b/tests/qemuxml2argvdata/serial-unix-chardev.args
index 659006e991..aaec92a96e 100644
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device isa-serial,chardev=charserial0,id=serial0 \
-chardev socket,id=charserial1,path=/tmp/serial-server.sock,server=on,wait=off \
-device isa-serial,chardev=charserial1,id=serial1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args
b/tests/qemuxml2argvdata/serial-vc-chardev.args
index 7e37ca631c..19f54a4119 100644
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev vc,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index aeb27e5ed5..ba3204233a 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -25,18 +25,18 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-object
memory-backend-file,id=shmmem-shmem0,mem-path=/dev/shm/shmem0,size=4194304,share=on \
--device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x3 \
+-device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x2 \
-object
memory-backend-file,id=shmmem-shmem1,mem-path=/dev/shm/shmem1,size=134217728,share=on \
--device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,master=off,bus=pci.0,addr=0x5 \
+-device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,master=off,bus=pci.0,addr=0x3 \
-object
memory-backend-file,id=shmmem-shmem2,mem-path=/dev/shm/shmem2,size=268435456,share=on \
-device ivshmem-plain,id=shmem2,memdev=shmmem-shmem2,master=on,bus=pci.0,addr=0x4 \
--device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,addr=0x6 \
+-device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,addr=0x5 \
-chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
--device ivshmem-doorbell,id=shmem4,chardev=charshmem4,ioeventfd=on,bus=pci.0,addr=0x7 \
+-device ivshmem-doorbell,id=shmem4,chardev=charshmem4,ioeventfd=on,bus=pci.0,addr=0x6 \
-chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
--device ivshmem-doorbell,id=shmem5,chardev=charshmem5,ioeventfd=off,bus=pci.0,addr=0x8 \
+-device ivshmem-doorbell,id=shmem5,chardev=charshmem5,ioeventfd=off,bus=pci.0,addr=0x7 \
-chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
--device
ivshmem-doorbell,id=shmem6,chardev=charshmem6,vectors=16,ioeventfd=on,bus=pci.0,addr=0x9
\
+-device
ivshmem-doorbell,id=shmem6,chardev=charshmem6,vectors=16,ioeventfd=on,bus=pci.0,addr=0x8
\
-chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
--device
ivshmem-doorbell,id=shmem7,chardev=charshmem7,vectors=32,ioeventfd=on,bus=pci.0,addr=0xa
\
+-device
ivshmem-doorbell,id=shmem7,chardev=charshmem7,vectors=32,ioeventfd=on,bus=pci.0,addr=0x9
\
-chardev socket,id=charshmem7,path=/tmp/shmem7-sock
diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index 89df230fc5..8e55cc3287 100644
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -24,16 +24,16 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device ivshmem,id=shmem0,size=4m,shm=shmem0,bus=pci.0,addr=0x3 \
--device ivshmem,id=shmem1,size=128m,shm=shmem1,bus=pci.0,addr=0x5 \
+-device ivshmem,id=shmem0,size=4m,shm=shmem0,bus=pci.0,addr=0x2 \
+-device ivshmem,id=shmem1,size=128m,shm=shmem1,bus=pci.0,addr=0x3 \
-device ivshmem,id=shmem2,size=256m,shm=shmem2,bus=pci.0,addr=0x4 \
--device ivshmem,id=shmem3,size=512m,chardev=charshmem3,bus=pci.0,addr=0x6 \
+-device ivshmem,id=shmem3,size=512m,chardev=charshmem3,bus=pci.0,addr=0x5 \
-chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
--device ivshmem,id=shmem4,size=1024m,chardev=charshmem4,bus=pci.0,addr=0x7 \
+-device ivshmem,id=shmem4,size=1024m,chardev=charshmem4,bus=pci.0,addr=0x6 \
-chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
--device
ivshmem,id=shmem5,size=2048m,chardev=charshmem5,msi=on,ioeventfd=off,bus=pci.0,addr=0x8 \
+-device
ivshmem,id=shmem5,size=2048m,chardev=charshmem5,msi=on,ioeventfd=off,bus=pci.0,addr=0x7 \
-chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
--device
ivshmem,id=shmem6,size=4096m,chardev=charshmem6,msi=on,vectors=16,bus=pci.0,addr=0x9 \
+-device
ivshmem,id=shmem6,size=4096m,chardev=charshmem6,msi=on,vectors=16,bus=pci.0,addr=0x8 \
-chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
--device
ivshmem,id=shmem7,size=8192m,chardev=charshmem7,msi=on,vectors=32,ioeventfd=on,bus=pci.0,addr=0xa
\
+-device
ivshmem,id=shmem7,size=8192m,chardev=charshmem7,msi=on,vectors=32,ioeventfd=on,bus=pci.0,addr=0x9
\
-chardev socket,id=charshmem7,path=/tmp/shmem7-sock
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args
b/tests/qemuxml2argvdata/smartcard-controller.args
index b1f55f66ee..4906c23e0a 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index d99a343db9..52cbb3884e 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device
ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3,db=/tmp/foo,id=smartcard0,bus=ccid0.0
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args
b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index 907a58d081..cab65b1733 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device
ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3,db=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/smartcard-host.args
b/tests/qemuxml2argvdata/smartcard-host.args
index b1f55f66ee..4906c23e0a 100644
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index a57c74d558..0a10a212e0 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-chardev spicevmc,id=charsmartcard0,name=smartcard \
-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index 905ced4ed2..c06f16ae53 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-chardev socket,id=charsmartcard0,host=127.0.0.1,port=2001,server=on,wait=off \
-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 7b434e7e32..d58d410809 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/sound-device.args
b/tests/qemuxml2argvdata/sound-device.args
index f8b1792a1d..cc026df2ec 100644
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -27,20 +27,20 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-soundhw pcspk \
--device ES1370,id=sound1,bus=pci.0,addr=0x3 \
+-device ES1370,id=sound1,bus=pci.0,addr=0x2 \
-device sb16,id=sound2 \
--device AC97,id=sound3,bus=pci.0,addr=0x4 \
--device intel-hda,id=sound4,bus=pci.0,addr=0x5 \
+-device AC97,id=sound3,bus=pci.0,addr=0x3 \
+-device intel-hda,id=sound4,bus=pci.0,addr=0x4 \
-device hda-duplex,id=sound4-codec0,bus=sound4.0,cad=0 \
--device intel-hda,id=sound5,bus=pci.0,addr=0x6 \
+-device intel-hda,id=sound5,bus=pci.0,addr=0x5 \
-device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0 \
-device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1 \
-device hda-output,id=sound5-codec2,bus=sound5.0,cad=2 \
--device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x7 \
+-device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x6 \
-device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0 \
--device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x8 \
+-device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x7 \
-device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0 \
-device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1 \
-device hda-output,id=sound7-codec2,bus=sound7.0,cad=2 \
-device usb-audio,id=sound8,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8
diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index 8d861a47f5..e76bec43ed 100644
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -27,6 +27,6 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-soundhw pcspk \
--device ES1370,id=sound1,bus=pci.0,addr=0x3 \
+-device ES1370,id=sound1,bus=pci.0,addr=0x2 \
-device sb16,id=sound2 \
--device AC97,id=sound3,bus=pci.0,addr=0x4
+-device AC97,id=sound3,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index 46e623b3d3..6b84c62f92 100644
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -23,4 +23,4 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device qemu-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x3
+-device qemu-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args
b/tests/qemuxml2argvdata/usb-controller-xhci.args
index a061f72d4f..e624d4db10 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -23,4 +23,4 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x3
+-device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-controller.args
b/tests/qemuxml2argvdata/usb-controller.args
index f48cd09164..22f4032a6b 100644
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index d19103aaa6..171cca0709 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -43,4 +43,4 @@ QEMU_AUDIO_DRV=none \
-device usb-tablet,id=input13,bus=usb.0,port=1.1.7 \
-device usb-tablet,id=input14,bus=usb.0,port=1.1.8 \
-device usb-tablet,id=input15,bus=usb.0,port=2.1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args
b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index 449421b103..5f6974bff3 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
-device usb-mouse,id=input1,bus=usb.0,port=1.1 \
-device usb-mouse,id=input2,bus=usb.0,port=1.2 \
-device usb-tablet,id=input3,bus=usb.0,port=1.3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 6cbd8c61a7..d751493360 100644
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-usb \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index b7f7b64517..1b1a0b8b09 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -32,4 +32,4 @@ QEMU_AUDIO_DRV=none \
-device usb-mouse,id=input0,bus=usb.0,port=3 \
-device usb-mouse,id=input1,bus=usb.0,port=4 \
-device usb-mouse,id=input2,bus=usb.0,port=5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args
b/tests/qemuxml2argvdata/usb-ich9-companion.args
index e9f437cded..77aa396263 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index 122923294f..bb7a9b3983 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -23,16 +23,16 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x3.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x3 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x3.0x2 \
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x3.0x1 \
--device ich9-usb-ehci1,id=usb1,bus=pci.0,addr=0x4.0x7 \
--device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4
\
--device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
--device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
--device ich9-usb-ehci1,id=usb2,bus=pci.0,addr=0x5.0x7 \
--device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,addr=0x5
\
--device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x5.0x2 \
--device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x5.0x1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
+-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x2.0x7 \
+-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x2 \
+-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x2.0x2 \
+-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x2.0x1 \
+-device ich9-usb-ehci1,id=usb1,bus=pci.0,addr=0x3.0x7 \
+-device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x3
\
+-device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pci.0,addr=0x3.0x2 \
+-device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pci.0,addr=0x3.0x1 \
+-device ich9-usb-ehci1,id=usb2,bus=pci.0,addr=0x4.0x7 \
+-device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4
\
+-device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args
b/tests/qemuxml2argvdata/usb-long-port-path.args
index 2fd62a7997..9da0d13db6 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device usb-hub,id=hub1,bus=usb.0,port=1.1 \
-device usb-hub,id=hub2,bus=usb.0,port=1.1.1 \
-device usb-hub,id=hub3,bus=usb.0,port=1.1.1.1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index 1c50617665..000961d51c 100644
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -23,4 +23,4 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args
b/tests/qemuxml2argvdata/usb-piix3-controller.args
index 4e004d9273..efaf5c49f8 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args
b/tests/qemuxml2argvdata/usb-port-autoassign.args
index 8e40f6ac34..2533c91b5e 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
-device usb-mouse,id=input0,bus=usb.0,port=1.1 \
-device usb-mouse,id=input1,bus=usb.0,port=1.2 \
-device usb-mouse,id=input2,bus=usb.0,port=1.3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-port-missing.args
b/tests/qemuxml2argvdata/usb-port-missing.args
index c4c45c051a..d6d971fbc0 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-hub,id=hub1,bus=usb.0,port=2 \
-device usb-mouse,id=input0,bus=usb.0,port=1.1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-ports.args
b/tests/qemuxml2argvdata/usb-ports.args
index 35a1aff6e7..fe477e0558 100644
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
-device usb-mouse,id=input0,bus=usb.0,port=1.1 \
-device usb-mouse,id=input1,bus=usb.0,port=1.2.1 \
-device usb-mouse,id=input2,bus=usb.0,port=1.2.2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args
b/tests/qemuxml2argvdata/usb-redir-boot.args
index dbc6863cef..ce66ccd421 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-device usb-redir,chardev=charredir0,id=redir0,bootindex=1,bus=usb.0,port=1 \
-chardev spicevmc,id=charredir1,name=usbredir \
-device usb-redir,chardev=charredir1,id=redir1,bootindex=2,bus=usb.0,port=4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args
b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index 550ef2c49a..c44948e540 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device
'usb-redir,chardev=charredir0,id=redir0,filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,bus=usb.0,port=1'
\
-chardev spicevmc,id=charredir1,name=usbredir \
-device
'usb-redir,chardev=charredir1,id=redir1,filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,bus=usb.0,port=2'
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args
b/tests/qemuxml2argvdata/usb-redir-filter.args
index e3a58aac4d..bb4709faf7 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-device
'usb-redir,chardev=charredir0,id=redir0,filter=0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0,bus=usb.0,port=4'
\
-chardev spicevmc,id=charredir1,name=usbredir \
-device
'usb-redir,chardev=charredir1,id=redir1,filter=0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0,bus=usb.0,port=5'
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-redir.args
b/tests/qemuxml2argvdata/usb-redir.args
index a34ff4574d..a03f839f4b 100644
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
-device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \
-chardev spicevmc,id=charredir1,name=usbredir \
-device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index 25a9fc8a93..a59d91bf18 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x3 \
+-device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-hub,id=hub1,bus=usb.0,port=2 \
-device usb-mouse,id=input0,bus=usb.0,port=3 \
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args
b/tests/qemuxml2argvdata/usb1-usb2.args
index f2f00b824c..07039edfff 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -36,4 +36,4 @@ QEMU_AUDIO_DRV=none \
-device usb-tablet,id=input0,bus=usb.0,port=2 \
-device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb2.0,port=1 \
-device usb-host,hostbus=14,hostaddr=7,id=hostdev1,bus=usb2.0,port=2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args
b/tests/qemuxml2argvdata/user-aliases-usb.args
index b19b978cc4..f57aaa8a0d 100644
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -34,4 +34,4 @@ QEMU_AUDIO_DRV=none \
-device ich9-usb-uhci3,masterbus=ua-myUSB5.0,firstport=4,bus=pci.0,addr=0x5.0x2 \
-device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=ua-myUSB1.0,port=3 \
-device usb-host,hostbus=15,hostaddr=6,id=hostdev1,bus=ua-myUSB5.0,port=3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args
b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index d7094f2161..c8c8354695 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -24,5 +24,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.0,addr=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/virtio-input.args
b/tests/qemuxml2argvdata/virtio-input.args
index 034c3e09f6..ea624f9193 100644
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-mouse-pci,id=input0,bus=pci.0,addr=0x4 \
+-device virtio-mouse-pci,id=input0,bus=pci.0,addr=0x3 \
-device virtio-keyboard-pci,id=input1,bus=pci.0,addr=0xa \
--device virtio-tablet-pci,id=input2,bus=pci.0,addr=0x5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-tablet-pci,id=input2,bus=pci.0,addr=0x4 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/virtio-lun.args
b/tests/qemuxml2argvdata/virtio-lun.args
index 1001b8fb6d..571122b78b 100644
--- a/tests/qemuxml2argvdata/virtio-lun.args
+++ b/tests/qemuxml2argvdata/virtio-lun.args
@@ -31,5 +31,5 @@ QEMU_AUDIO_DRV=none \
-drive file=/dev/sdfake2,format=raw,if=none,id=drive-virtio-disk1 \
-device
virtio-blk-pci,scsi=on,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
-netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2
\
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args
b/tests/qemuxml2argvdata/virtio-rng-default.args
index 9eca1101f8..a2ff88c7ca 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -24,6 +24,6 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args
b/tests/qemuxml2argvdata/virtio-rng-egd.args
index f631741cf4..1b34bf65b7 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-chardev socket,id=charrng0,host=1.2.3.4,port=1234 \
-object rng-egd,id=objrng0,chardev=charrng0 \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x4
+-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args
b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 0c34ae32ba..29464ae63f 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -24,9 +24,9 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \
-chardev socket,id=charrng1,host=1.2.3.4,port=1234 \
-object rng-egd,id=objrng1,chardev=charrng1 \
--device virtio-rng-pci,rng=objrng1,id=rng1,bus=pci.0,addr=0x4
+-device virtio-rng-pci,rng=objrng1,id=rng1,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args
b/tests/qemuxml2argvdata/virtio-rng-random.args
index b1fb99bd1d..9c480dbef8 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -24,6 +24,6 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-object rng-random,id=objrng0,filename=/dev/urandom \
--device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.0,addr=0x4
+-device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args
b/tests/qemuxml2argvdata/vmcoreinfo.args
index d1ac737031..99a0917803 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-device vmcoreinfo
diff --git a/tests/qemuxml2argvdata/watchdog-device.args
b/tests/qemuxml2argvdata/watchdog-device.args
index 4924d88a12..1db0bbf5c2 100644
--- a/tests/qemuxml2argvdata/watchdog-device.args
+++ b/tests/qemuxml2argvdata/watchdog-device.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-device ib700,id=watchdog0 \
-watchdog-action poweroff \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/watchdog-dump.args
b/tests/qemuxml2argvdata/watchdog-dump.args
index 5e4df54d0e..c191193a11 100644
--- a/tests/qemuxml2argvdata/watchdog-dump.args
+++ b/tests/qemuxml2argvdata/watchdog-dump.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-device ib700,id=watchdog0 \
-watchdog-action pause \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args
b/tests/qemuxml2argvdata/watchdog-injectnmi.args
index 5637db0912..872aa0ad70 100644
--- a/tests/qemuxml2argvdata/watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-device ib700,id=watchdog0 \
-watchdog-action inject-nmi \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 29/43] [fixup] Fix test fallout in tests/qemuxml2xmloutdata
---
tests/qemuxml2xmloutdata/autoindex.xml | 4 +-
.../balloon-device-auto.xml | 2 +-
.../bios-nvram-os-interleave.xml | 2 +-
tests/qemuxml2xmloutdata/bios-nvram.xml | 2 +-
tests/qemuxml2xmloutdata/blkiotune-device.xml | 2 +-
tests/qemuxml2xmloutdata/blkiotune.xml | 2 +-
.../boot-menu-disable-with-timeout.xml | 2 +-
.../qemuxml2xmloutdata/boot-menu-disable.xml | 2 +-
.../boot-menu-enable-with-timeout.xml | 2 +-
tests/qemuxml2xmloutdata/boot-multi.xml | 2 +-
tests/qemuxml2xmloutdata/boot-order.xml | 6 +-
tests/qemuxml2xmloutdata/channel-guestfwd.xml | 2 +-
.../channel-unix-source-path-active.xml | 2 +-
.../channel-unix-source-path-inactive.xml | 2 +-
.../channel-virtio-auto.xml | 6 +-
.../channel-virtio-state-active.xml | 2 +-
.../channel-virtio-state-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/channel-virtio.xml | 2 +-
tests/qemuxml2xmloutdata/chardev-label.xml | 4 +-
tests/qemuxml2xmloutdata/clock-catchup.xml | 2 +-
.../clock-timer-hyperv-rtc.xml | 2 +-
.../console-compat-auto.xml | 2 +-
tests/qemuxml2xmloutdata/console-compat2.xml | 2 +-
.../console-virtio-many.xml | 4 +-
tests/qemuxml2xmloutdata/console-virtio.xml | 4 +-
.../controller-usb-order.xml | 2 +-
.../controller-virtio-scsi.xml | 12 +-
.../cpu-check-default-none.xml | 2 +-
.../cpu-check-default-none2.xml | 2 +-
.../cpu-check-default-partial.xml | 2 +-
.../cpu-check-default-partial2.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-check-full.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-check-none.xml | 2 +-
.../qemuxml2xmloutdata/cpu-check-partial.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-empty.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 2 +-
.../qemuxml2xmloutdata/cpu-host-kvmclock.xml | 2 +-
.../cpu-host-model-features.xml | 2 +-
.../cpu-host-model-vendor.xml | 2 +-
.../cpu-host-passthrough-features.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-kvmclock.xml | 2 +-
.../qemuxml2xmloutdata/cpu-numa-disjoint.xml | 2 +-
.../cpu-numa-disordered.xml | 2 +-
.../qemuxml2xmloutdata/cpu-numa-memshared.xml | 2 +-
.../cpu-numa-no-memory-element.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-numa1.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-numa2.xml | 2 +-
.../qemuxml2xmloutdata/cputune-iothreads.xml | 2 +-
.../cputune-iothreadsched-zeropriority.xml | 2 +-
.../cputune-iothreadsched.xml | 2 +-
.../cputune-zero-shares.xml | 2 +-
tests/qemuxml2xmloutdata/cputune.xml | 2 +-
.../default-kvm-host-arch.xml | 2 +-
.../default-qemu-host-arch.xml | 2 +-
.../disk-active-commit-active.xml | 2 +-
.../disk-active-commit-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/disk-aio.xml | 2 +-
.../disk-backing-chains-active.xml | 12 +-
.../disk-backing-chains-inactive.xml | 12 +-
.../disk-backing-chains-index-active.xml | 14 +-
.../disk-backing-chains-index-inactive.xml | 14 +-
.../disk-backing-chains-noindex.xml | 14 +-
.../qemuxml2xmloutdata/disk-copy_on_read.xml | 4 +-
.../qemuxml2xmloutdata/disk-mirror-active.xml | 8 +-
.../disk-mirror-inactive.xml | 8 +-
.../disk-mirror-old-active.xml | 6 +-
.../disk-mirror-old-inactive.xml | 6 +-
.../disk-network-gluster.xml | 6 +-
.../qemuxml2xmloutdata/disk-network-iscsi.xml | 10 +-
tests/qemuxml2xmloutdata/disk-network-nbd.xml | 10 +-
tests/qemuxml2xmloutdata/disk-network-rbd.xml | 12 +-
.../disk-network-sheepdog.xml | 2 +-
.../disk-network-source-auth.xml | 6 +-
.../disk-scsi-device-auto.xml | 4 +-
.../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 6 +-
.../disk-scsi-lun-passthrough-sgio.xml | 6 +-
tests/qemuxml2xmloutdata/disk-serial.xml | 2 +-
.../disk-source-pool-mode.xml | 2 +-
tests/qemuxml2xmloutdata/disk-source-pool.xml | 4 +-
tests/qemuxml2xmloutdata/disk-usb-device.xml | 2 +-
tests/qemuxml2xmloutdata/disk-virtio.xml | 4 +-
tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +-
tests/qemuxml2xmloutdata/eoi-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/eoi-enabled.xml | 2 +-
tests/qemuxml2xmloutdata/event_idx.xml | 4 +-
tests/qemuxml2xmloutdata/floppy-drive-fat.xml | 2 +-
.../hostdev-mdev-precreated.xml | 2 +-
.../hostdev-pci-address-unassigned.xml | 8 +-
.../hostdev-pci-address.xml | 2 +-
.../hostdev-pci-multifunction.xml | 16 +-
.../hostdev-scsi-autogen-address.xml | 6 +-
.../hostdev-scsi-large-unit.xml | 4 +-
tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 4 +-
.../qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 4 +-
.../qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 4 +-
.../hostdev-scsi-shareable.xml | 4 +-
.../hostdev-scsi-vhost-scsi-pci.xml | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.xml | 8 +-
.../hostdev-scsi-virtio-scsi.xml | 4 +-
tests/qemuxml2xmloutdata/hostdev-vfio.xml | 4 +-
.../qemuxml2xmloutdata/hugepages-default.xml | 2 +-
tests/qemuxml2xmloutdata/hugepages-shared.xml | 2 +-
tests/qemuxml2xmloutdata/hyperv-off.xml | 2 +-
tests/qemuxml2xmloutdata/interface-driver.xml | 4 +-
tests/qemuxml2xmloutdata/iothreads-disk.xml | 2 +-
tests/qemuxml2xmloutdata/kvm-features-off.xml | 2 +-
tests/qemuxml2xmloutdata/lease.xml | 2 +-
.../qemuxml2xmloutdata/luks-disks-source.xml | 6 +-
.../memory-hotplug-dimm.xml | 2 +-
tests/qemuxml2xmloutdata/memory-hotplug.xml | 2 +-
.../qemuxml2xmloutdata/memorybacking-set.xml | 2 +-
.../memorybacking-unset.xml | 2 +-
.../qemuxml2xmloutdata/memtune-unlimited.xml | 2 +-
tests/qemuxml2xmloutdata/memtune.xml | 2 +-
.../qemuxml2xmloutdata/metadata-duplicate.xml | 2 +-
tests/qemuxml2xmloutdata/metadata.xml | 2 +-
tests/qemuxml2xmloutdata/minimal.xml | 2 +-
tests/qemuxml2xmloutdata/net-coalesce.xml | 8 +-
tests/qemuxml2xmloutdata/net-eth-hostip.xml | 2 +-
tests/qemuxml2xmloutdata/net-eth-ifname.xml | 2 +-
.../net-eth-unmanaged-tap.xml | 2 +-
tests/qemuxml2xmloutdata/net-eth.xml | 2 +-
.../net-hostdev-bootorder.xml | 2 +-
tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 4 +-
tests/qemuxml2xmloutdata/net-hostdev.xml | 4 +-
tests/qemuxml2xmloutdata/net-many-models.xml | 12 +-
tests/qemuxml2xmloutdata/net-midonet.xml | 4 +-
tests/qemuxml2xmloutdata/net-mtu.xml | 6 +-
tests/qemuxml2xmloutdata/net-openvswitch.xml | 4 +-
tests/qemuxml2xmloutdata/net-udp.xml | 4 +-
tests/qemuxml2xmloutdata/net-user.xml | 2 +-
tests/qemuxml2xmloutdata/net-vdpa.xml | 2 +-
tests/qemuxml2xmloutdata/net-vhostuser.xml | 6 +-
.../qemuxml2xmloutdata/net-virtio-device.xml | 4 +-
.../net-virtio-disable-offloads.xml | 4 +-
.../net-virtio-network-portgroup.xml | 8 +-
.../net-virtio-rxtxqueuesize.xml | 4 +-
.../net-virtio-teaming-network.xml | 6 +-
.../qemuxml2xmloutdata/net-virtio-teaming.xml | 10 +-
tests/qemuxml2xmloutdata/net-virtio.xml | 2 +-
.../numad-auto-memory-vcpu-cpuset.xml | 2 +-
...to-memory-vcpu-no-cpuset-and-placement.xml | 2 +-
.../numad-auto-vcpu-no-numatune.xml | 2 +-
.../numad-static-vcpu-no-numatune.xml | 2 +-
.../numatune-auto-prefer.xml | 2 +-
.../qemuxml2xmloutdata/numatune-distances.xml | 2 +-
.../numatune-memnode-no-memory.xml | 2 +-
tests/qemuxml2xmloutdata/numatune-memnode.xml | 2 +-
tests/qemuxml2xmloutdata/panic-isa.xml | 2 +-
tests/qemuxml2xmloutdata/panic-no-address.xml | 2 +-
tests/qemuxml2xmloutdata/panic.xml | 2 +-
.../pci-bridge-many-disks.xml | 216 +++++++++---------
tests/qemuxml2xmloutdata/pci-expander-bus.xml | 68 +++---
.../pci-rom-disabled-invalid.xml | 2 +-
tests/qemuxml2xmloutdata/pci-rom-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/pci-rom.xml | 10 +-
.../pci-serial-dev-chardev.xml | 2 +-
.../pcie-root-port-model-generic.xml | 12 +-
.../pcie-root-port-model-ioh3420.xml | 8 +-
tests/qemuxml2xmloutdata/pcihole64-gib.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64-none.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64.xml | 2 +-
.../pv-spinlock-disabled.xml | 2 +-
.../pv-spinlock-enabled.xml | 2 +-
.../q35-pci-force-address.xml | 4 +-
.../qemuxml2xmloutdata/seclabel-dac-none.xml | 2 +-
.../seclabel-device-multiple.xml | 2 +-
.../seclabel-dynamic-baselabel-inactive.xml | 2 +-
.../seclabel-dynamic-labelskip-inactive.xml | 2 +-
.../seclabel-dynamic-none.xml | 2 +-
.../seclabel-dynamic-override-inactive.xml | 2 +-
.../seclabel-dynamic-relabel-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/seclabel-none.xml | 2 +-
.../seclabel-static-labelskip-active.xml | 2 +-
.../seclabel-static-labelskip-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/seclabel-static.xml | 2 +-
.../serial-spiceport-nospice.xml | 2 +-
.../serial-target-port-auto.xml | 2 +-
.../serial-tcp-tlsx509-chardev.xml | 2 +-
.../shmem-plain-doorbell.xml | 14 +-
tests/qemuxml2xmloutdata/shmem.xml | 14 +-
.../smartcard-controller.xml | 2 +-
.../smartcard-host-certificates-database.xml | 2 +-
.../smartcard-host-certificates.xml | 2 +-
tests/qemuxml2xmloutdata/smartcard-host.xml | 2 +-
.../smartcard-passthrough-spicevmc.xml | 2 +-
.../smartcard-passthrough-tcp.xml | 2 +-
.../smbios-multiple-type2.xml | 2 +-
tests/qemuxml2xmloutdata/smbios.xml | 2 +-
tests/qemuxml2xmloutdata/sound-device.xml | 14 +-
tests/qemuxml2xmloutdata/sound.xml | 4 +-
.../tap-vhost-incorrect.xml | 6 +-
tests/qemuxml2xmloutdata/tap-vhost.xml | 4 +-
.../qemuxml2xmloutdata/tseg-explicit-size.xml | 4 +-
tests/qemuxml2xmloutdata/usb-controller.xml | 2 +-
.../qemuxml2xmloutdata/usb-ich9-ehci-addr.xml | 26 +--
tests/qemuxml2xmloutdata/usb-none.xml | 2 +-
.../usb-piix3-controller.xml | 2 +-
tests/qemuxml2xmloutdata/usb-port-missing.xml | 2 +-
.../usb-redir-filter-version.xml | 2 +-
tests/qemuxml2xmloutdata/usb-redir-filter.xml | 2 +-
tests/qemuxml2xmloutdata/usb-redir.xml | 2 +-
tests/qemuxml2xmloutdata/vhost-vsock-auto.xml | 2 +-
tests/qemuxml2xmloutdata/vhost_queues.xml | 4 +-
.../virtio-input-passthrough.xml | 4 +-
tests/qemuxml2xmloutdata/virtio-input.xml | 6 +-
tests/qemuxml2xmloutdata/virtio-lun.xml | 4 +-
tests/qemuxml2xmloutdata/virtio-rng-egd.xml | 4 +-
.../qemuxml2xmloutdata/virtio-rng-random.xml | 4 +-
tests/qemuxml2xmloutdata/vmcoreinfo.xml | 2 +-
211 files changed, 537 insertions(+), 537 deletions(-)
diff --git a/tests/qemuxml2xmloutdata/autoindex.xml
b/tests/qemuxml2xmloutdata/autoindex.xml
index 3e1c2889cb..8f622d56b2 100644
--- a/tests/qemuxml2xmloutdata/autoindex.xml
+++ b/tests/qemuxml2xmloutdata/autoindex.xml
@@ -32,8 +32,8 @@
</controller>
<controller type='pci' index='3'
model='pcie-root-port'>
<model name='ioh3420'/>
- <target chassis='3' port='0x10'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <target chassis='3' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='4'
model='pcie-switch-upstream-port'>
<model name='x3130-upstream'/>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
index 094ecb38db..4c58641aca 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
index e5ee451722..0a2f718faa 100644
--- a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
+++ b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
@@ -46,7 +46,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/bios-nvram.xml
b/tests/qemuxml2xmloutdata/bios-nvram.xml
index 294e65cd13..17f15fd00b 100644
--- a/tests/qemuxml2xmloutdata/bios-nvram.xml
+++ b/tests/qemuxml2xmloutdata/bios-nvram.xml
@@ -38,7 +38,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml
b/tests/qemuxml2xmloutdata/blkiotune-device.xml
index 46b534d2c7..6ac1464c65 100644
--- a/tests/qemuxml2xmloutdata/blkiotune-device.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune-device.xml
@@ -50,7 +50,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/blkiotune.xml
b/tests/qemuxml2xmloutdata/blkiotune.xml
index 2f4d3f29d3..6eb9df13f3 100644
--- a/tests/qemuxml2xmloutdata/blkiotune.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune.xml
@@ -34,7 +34,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
index 631df4bbb4..82285b3017 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
@@ -33,7 +33,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
index 631df4bbb4..82285b3017 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
@@ -33,7 +33,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
index b6775d3a47..994331ce0f 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
@@ -33,7 +33,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml
b/tests/qemuxml2xmloutdata/boot-multi.xml
index ebcbcb7e62..abb098be58 100644
--- a/tests/qemuxml2xmloutdata/boot-multi.xml
+++ b/tests/qemuxml2xmloutdata/boot-multi.xml
@@ -36,7 +36,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/boot-order.xml
b/tests/qemuxml2xmloutdata/boot-order.xml
index bdd7e1b16f..0d884152dd 100644
--- a/tests/qemuxml2xmloutdata/boot-order.xml
+++ b/tests/qemuxml2xmloutdata/boot-order.xml
@@ -34,7 +34,7 @@
</source>
<target dev='vda' bus='virtio'/>
<boot order='3'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='floppy'>
<driver name='qemu' type='raw'/>
@@ -55,13 +55,13 @@
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<boot order='2'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
index baf99c58cc..acaab47946 100644
--- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
+++ b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
@@ -35,7 +35,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
index 2917ed292a..6ee9de6512 100644
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
@@ -19,7 +19,7 @@
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='virtio-serial' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<channel type='unix'>
<source mode='bind'
path='/tmp/channel/QEMUGuest1.org.qemu.guest_agent.0'/>
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
index c5d219183e..a36a94f9f0 100644
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
@@ -19,7 +19,7 @@
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='virtio-serial' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<channel type='unix'>
<target type='virtio' name='org.qemu.guest_agent.0'/>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
index 94b0eaf34e..ec82bacea5 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
@@ -27,14 +27,14 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
<controller type='virtio-serial' index='0' ports='16'
vectors='4'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='virtio-serial' index='1'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='virtio-serial' index='2'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</controller>
<channel type='pty'>
<target type='virtio' name='org.linux-kvm.port.0'/>
@@ -64,7 +64,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
index 351a99b4c8..ef87c7727c 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
@@ -46,7 +46,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
index 18b799f066..598241d01b 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
@@ -46,7 +46,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio.xml
b/tests/qemuxml2xmloutdata/channel-virtio.xml
index 22e5f01db6..a90679eafe 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio.xml
@@ -38,7 +38,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/chardev-label.xml
b/tests/qemuxml2xmloutdata/chardev-label.xml
index e90f7c2b25..4dc09cfb38 100644
--- a/tests/qemuxml2xmloutdata/chardev-label.xml
+++ b/tests/qemuxml2xmloutdata/chardev-label.xml
@@ -47,13 +47,13 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
<rng model='virtio'>
<backend model='egd' type='pipe'>
<source path='/dev/null'/>
</backend>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</rng>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/clock-catchup.xml
b/tests/qemuxml2xmloutdata/clock-catchup.xml
index 2b7633db12..196e41b4a7 100644
--- a/tests/qemuxml2xmloutdata/clock-catchup.xml
+++ b/tests/qemuxml2xmloutdata/clock-catchup.xml
@@ -41,7 +41,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
index fc2a5efdcb..0f106073a9 100644
--- a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/console-compat-auto.xml
b/tests/qemuxml2xmloutdata/console-compat-auto.xml
index eebef5aa15..37336a15c7 100644
--- a/tests/qemuxml2xmloutdata/console-compat-auto.xml
+++ b/tests/qemuxml2xmloutdata/console-compat-auto.xml
@@ -39,7 +39,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/console-compat2.xml
b/tests/qemuxml2xmloutdata/console-compat2.xml
index b8f710abf6..e943ef6e28 100644
--- a/tests/qemuxml2xmloutdata/console-compat2.xml
+++ b/tests/qemuxml2xmloutdata/console-compat2.xml
@@ -28,7 +28,7 @@
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='virtio-serial' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<serial type='pty'>
<target type='isa-serial' port='0'>
diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.xml
b/tests/qemuxml2xmloutdata/console-virtio-many.xml
index a2d72269b2..5d3e551aa7 100644
--- a/tests/qemuxml2xmloutdata/console-virtio-many.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio-many.xml
@@ -27,7 +27,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
<controller type='virtio-serial' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<serial type='pty'>
@@ -51,7 +51,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/console-virtio.xml
b/tests/qemuxml2xmloutdata/console-virtio.xml
index d540b81a4e..491f00687a 100644
--- a/tests/qemuxml2xmloutdata/console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio.xml
@@ -28,7 +28,7 @@
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='virtio-serial' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<console type='pty'>
<target type='virtio' port='0'/>
@@ -37,7 +37,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/controller-usb-order.xml
b/tests/qemuxml2xmloutdata/controller-usb-order.xml
index cb4d8a1e6e..3a7e7a323a 100644
--- a/tests/qemuxml2xmloutdata/controller-usb-order.xml
+++ b/tests/qemuxml2xmloutdata/controller-usb-order.xml
@@ -33,7 +33,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
index 207bc87cf5..f25ec8ee54 100644
--- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
@@ -48,30 +48,30 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='scsi' index='1' model='virtio-scsi'>
<driver queues='8'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</controller>
<controller type='scsi' index='2' model='virtio-scsi'>
<driver cmd_per_lun='50'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</controller>
<controller type='scsi' index='3' model='virtio-scsi'>
<driver max_sectors='512'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</controller>
<controller type='scsi' index='4' model='virtio-scsi'>
<driver ioeventfd='on'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
index 473fb7e6f1..d2ec332183 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
@@ -23,7 +23,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
index e87bf64416..a7b5932314 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
@@ -25,7 +25,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
index 2856fd4f43..ab1a42929d 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
@@ -23,7 +23,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
index 1423620aa8..98f2fc8fd0 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
@@ -25,7 +25,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-full.xml
b/tests/qemuxml2xmloutdata/cpu-check-full.xml
index a978f70135..11fa1349a2 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-full.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-full.xml
@@ -25,7 +25,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-none.xml
b/tests/qemuxml2xmloutdata/cpu-check-none.xml
index c4ea77cdf9..4bf679692c 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-none.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-none.xml
@@ -25,7 +25,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-partial.xml
b/tests/qemuxml2xmloutdata/cpu-check-partial.xml
index 1423620aa8..98f2fc8fd0 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-partial.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-partial.xml
@@ -25,7 +25,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-empty.xml
b/tests/qemuxml2xmloutdata/cpu-empty.xml
index 394588b8f5..ee700da00d 100644
--- a/tests/qemuxml2xmloutdata/cpu-empty.xml
+++ b/tests/qemuxml2xmloutdata/cpu-empty.xml
@@ -22,7 +22,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
index 176c7c3cbf..7ae2c7034b 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
@@ -30,7 +30,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
index 84cd2106eb..bee4fd0240 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
@@ -30,7 +30,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
index 40148c3686..8de03f032c 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
@@ -25,7 +25,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
index be51410d53..3a61d47abd 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
@@ -35,7 +35,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
index 670c171ebc..482edbeb3d 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
@@ -25,7 +25,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
index cc217f41a1..99f52bed9a 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
@@ -41,7 +41,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
index 090fff2d10..dcc3ccf8d3 100644
--- a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
index 8219c16939..58707b0d11 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
@@ -29,7 +29,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
index dd15201aad..3d57037bf1 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
@@ -30,7 +30,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
index 0c53679827..1883a8368d 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
@@ -29,7 +29,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
index 99269812d9..02c12542c0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
@@ -29,7 +29,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.xml
b/tests/qemuxml2xmloutdata/cpu-numa1.xml
index 99269812d9..02c12542c0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa1.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa1.xml
@@ -29,7 +29,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.xml
b/tests/qemuxml2xmloutdata/cpu-numa2.xml
index 99269812d9..02c12542c0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa2.xml
@@ -29,7 +29,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreads.xml
b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
index cc7b7a112f..36c4b0920f 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreads.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
@@ -42,7 +42,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
index e4491a9eee..b6a79108e3 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
@@ -45,7 +45,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
index da5f10ff64..ca94bc8a38 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
@@ -45,7 +45,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
index ce53f17cc9..557f142445 100644
--- a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
+++ b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
@@ -39,7 +39,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cputune.xml b/tests/qemuxml2xmloutdata/cputune.xml
index 2f4ef68679..0c1ac3d50e 100644
--- a/tests/qemuxml2xmloutdata/cputune.xml
+++ b/tests/qemuxml2xmloutdata/cputune.xml
@@ -43,7 +43,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
b/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
index 756d3967cd..c9f09b2231 100644
--- a/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
+++ b/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
@@ -22,7 +22,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
b/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
index f392bc40ae..9e3cbab7f8 100644
--- a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
+++ b/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
@@ -22,7 +22,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
index 010ab9fce0..c3068c8c93 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
@@ -40,7 +40,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
index 5479e8edfc..e4fcb0c6ce 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
@@ -36,7 +36,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-aio.xml
b/tests/qemuxml2xmloutdata/disk-aio.xml
index 8d6f8b5263..a7fa648c2a 100644
--- a/tests/qemuxml2xmloutdata/disk-aio.xml
+++ b/tests/qemuxml2xmloutdata/disk-aio.xml
@@ -38,7 +38,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
index ba23787ad0..5901aef3d3 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
@@ -24,7 +24,7 @@
<source file='/tmp/missing-backing-store.qcow'/>
</backingStore>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -61,7 +61,7 @@
</backingStore>
</backingStore>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -70,7 +70,7 @@
</source>
<backingStore/>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -88,13 +88,13 @@
<backingStore/>
</backingStore>
<target dev='vdd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2'/>
<source dev='/dev/HostVG/QEMUGuest11'/>
<target dev='vde' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -104,7 +104,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
index e4a8209bf3..1d9adc85ba 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
@@ -24,7 +24,7 @@
<source file='/tmp/missing-backing-store.qcow'/>
</backingStore>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -61,7 +61,7 @@
</backingStore>
</backingStore>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -70,7 +70,7 @@
</source>
<backingStore/>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -88,13 +88,13 @@
<backingStore/>
</backingStore>
<target dev='vdd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2'/>
<source dev='/dev/HostVG/QEMUGuest11'/>
<target dev='vde' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -104,7 +104,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
index e5d0d73999..c25bb7bb1a 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
@@ -24,7 +24,7 @@
<source file='/tmp/missing-backing-store.qcow'/>
</backingStore>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -57,7 +57,7 @@
</backingStore>
</backingStore>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -66,7 +66,7 @@
</source>
<backingStore/>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -84,13 +84,13 @@
<backingStore/>
</backingStore>
<target dev='vdd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2'/>
<source dev='/dev/HostVG/QEMUGuest11' index='13'/>
<target dev='vde' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -141,7 +141,7 @@
</backingStore>
</backingStore>
<target dev='vdf' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -151,7 +151,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
index cc02b15991..4e2da45733 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
@@ -24,7 +24,7 @@
<source file='/tmp/missing-backing-store.qcow'/>
</backingStore>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -57,7 +57,7 @@
</backingStore>
</backingStore>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -66,7 +66,7 @@
</source>
<backingStore/>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -84,13 +84,13 @@
<backingStore/>
</backingStore>
<target dev='vdd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2'/>
<source dev='/dev/HostVG/QEMUGuest11'/>
<target dev='vde' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -141,7 +141,7 @@
</backingStore>
</backingStore>
<target dev='vdf' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -151,7 +151,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
index cc02b15991..4e2da45733 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
@@ -24,7 +24,7 @@
<source file='/tmp/missing-backing-store.qcow'/>
</backingStore>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -57,7 +57,7 @@
</backingStore>
</backingStore>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -66,7 +66,7 @@
</source>
<backingStore/>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -84,13 +84,13 @@
<backingStore/>
</backingStore>
<target dev='vdd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</disk>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2'/>
<source dev='/dev/HostVG/QEMUGuest11'/>
<target dev='vde' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -141,7 +141,7 @@
</backingStore>
</backingStore>
<target dev='vdf' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -151,7 +151,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
index 074d41b72e..b2581450e9 100644
--- a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
+++ b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
@@ -43,13 +43,13 @@
<mac address='52:54:00:e5:48:58'/>
<model type='virtio'/>
<driver name='vhost' txmode='iothread'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
index dca166d7f1..5a02198f97 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
@@ -43,7 +43,7 @@
<backingStore/>
</mirror>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
@@ -59,7 +59,7 @@
</backingStore>
</mirror>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
@@ -75,7 +75,7 @@
<backingStore/>
</mirror>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -88,7 +88,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
index ba47bbad1a..5d2caa5fca 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
@@ -34,21 +34,21 @@
<source file='/tmp/data.img'/>
<backingStore/>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/logs.img'/>
<backingStore/>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/data2.img'/>
<backingStore/>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -61,7 +61,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
index 7e54cae592..34ac337537 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
@@ -42,14 +42,14 @@
<source file='/tmp/copy.img'/>
</mirror>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/logs.img'/>
<backingStore/>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -62,7 +62,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
index 5aec616002..c957f8b45c 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
@@ -34,14 +34,14 @@
<source file='/tmp/data.img'/>
<backingStore/>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/logs.img'/>
<backingStore/>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -54,7 +54,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-gluster.xml
b/tests/qemuxml2xmloutdata/disk-network-gluster.xml
index c4763fa78f..7d8b531b96 100644
--- a/tests/qemuxml2xmloutdata/disk-network-gluster.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-gluster.xml
@@ -20,7 +20,7 @@
<host name='example.org' port='6000'/>
</source>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -28,7 +28,7 @@
<host transport='unix' socket='/path/to/sock'/>
</source>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='qcow2'/>
@@ -38,7 +38,7 @@
<host transport='unix' socket='/path/to/sock'/>
</source>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
index cbf26754cd..a2fdaac5b0 100644
--- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
@@ -20,7 +20,7 @@
<host name='example.org' port='6000'/>
</source>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -28,7 +28,7 @@
<host name='example.org' port='6000'/>
</source>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -39,7 +39,7 @@
<host name='example.org' port='6000'/>
</source>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -50,7 +50,7 @@
<host name='example.org' port='6000'/>
</source>
<target dev='vdd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
<disk type='network' device='lun'>
<driver name='qemu' type='raw'/>
@@ -65,7 +65,7 @@
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml
b/tests/qemuxml2xmloutdata/disk-network-nbd.xml
index db088e0f85..50e9f0b5bb 100644
--- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-nbd.xml
@@ -20,7 +20,7 @@
<host name='example.org' port='6000'/>
</source>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -28,7 +28,7 @@
<host name='example.org' port='6000'/>
</source>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -36,7 +36,7 @@
<host name='::1' port='6000'/>
</source>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -44,7 +44,7 @@
<host name='::1' port='6000'/>
</source>
<target dev='vdd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -52,7 +52,7 @@
<host transport='unix' socket='/var/run/nbdsock'/>
</source>
<target dev='vde' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd.xml
b/tests/qemuxml2xmloutdata/disk-network-rbd.xml
index 01b1d66ece..1ded5fac79 100644
--- a/tests/qemuxml2xmloutdata/disk-network-rbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-rbd.xml
@@ -22,7 +22,7 @@
<host name='mon3.example.org' port='6322'/>
</source>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -30,7 +30,7 @@
<snapshot name='asdf'/>
</source>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -41,7 +41,7 @@
<snapshot name='foo'/>
</source>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -50,7 +50,7 @@
<config file='/blah/test.conf'/>
</source>
<target dev='vdd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -63,7 +63,7 @@
<host name='mon3.example.org' port='6322'/>
</source>
<target dev='vde' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -74,7 +74,7 @@
<host name='2001:db8::ff00:42:8329' port='6322'/>
</source>
<target dev='vdf' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
b/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
index c1862e5a54..1beaa36bc2 100644
--- a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
@@ -26,7 +26,7 @@
<host name='example.org' port='6000'/>
</source>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
b/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
index 59258733bd..3e829497c2 100644
--- a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
@@ -23,7 +23,7 @@
</auth>
</source>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -36,7 +36,7 @@
</auth>
</source>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -49,7 +49,7 @@
</auth>
</source>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
index 41bfcbaaf4..24763b5326 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
@@ -34,13 +34,13 @@
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='scsi' index='0' model='lsilogic'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
index 80fbf927af..2f686d058c 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
@@ -36,17 +36,17 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='scsi' index='1' model='lsilogic'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
index eb0c192d80..2b62595805 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
@@ -27,10 +27,10 @@
<address type='drive' controller='0' bus='0'
target='1' unit='1'/>
</disk>
<controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='scsi' index='1' model='lsilogic'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</controller>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -40,7 +40,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml
b/tests/qemuxml2xmloutdata/disk-serial.xml
index b4092eae24..59fba995cd 100644
--- a/tests/qemuxml2xmloutdata/disk-serial.xml
+++ b/tests/qemuxml2xmloutdata/disk-serial.xml
@@ -44,7 +44,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
index 046665f713..1183171e54 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
@@ -67,7 +67,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml
b/tests/qemuxml2xmloutdata/disk-source-pool.xml
index 3f5aa73e55..ed00ceb16c 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool.xml
@@ -42,14 +42,14 @@
<source pool='pool-disk' volume='dir+vol1'/>
<target dev='vda' bus='virtio'/>
<readonly/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='volume' device='disk'>
<driver name='qemu'/>
<source pool='pool-disk' volume='dir+vol2'/>
<target dev='vdb' bus='virtio'/>
<readonly/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-usb-device.xml
b/tests/qemuxml2xmloutdata/disk-usb-device.xml
index ee19c37d9b..6c6af0457b 100644
--- a/tests/qemuxml2xmloutdata/disk-usb-device.xml
+++ b/tests/qemuxml2xmloutdata/disk-usb-device.xml
@@ -36,7 +36,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio.xml
b/tests/qemuxml2xmloutdata/disk-virtio.xml
index d7abf57e4a..ff72fb5375 100644
--- a/tests/qemuxml2xmloutdata/disk-virtio.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio.xml
@@ -31,13 +31,13 @@
<driver name='qemu' type='raw'/>
<source file='/tmp/data.img'/>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/logs.img'/>
<target dev='vdb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/encrypted-disk.xml
b/tests/qemuxml2xmloutdata/encrypted-disk.xml
index 59cae921fc..06f2c5b47c 100644
--- a/tests/qemuxml2xmloutdata/encrypted-disk.xml
+++ b/tests/qemuxml2xmloutdata/encrypted-disk.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/eoi-disabled.xml
b/tests/qemuxml2xmloutdata/eoi-disabled.xml
index eedab82972..12db838a06 100644
--- a/tests/qemuxml2xmloutdata/eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-disabled.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/eoi-enabled.xml
b/tests/qemuxml2xmloutdata/eoi-enabled.xml
index 3c42a3c1c0..45c1a951bf 100644
--- a/tests/qemuxml2xmloutdata/eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-enabled.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/event_idx.xml
b/tests/qemuxml2xmloutdata/event_idx.xml
index a8990cd639..32a5e9ca7e 100644
--- a/tests/qemuxml2xmloutdata/event_idx.xml
+++ b/tests/qemuxml2xmloutdata/event_idx.xml
@@ -43,13 +43,13 @@
<mac address='52:54:00:e5:48:58'/>
<model type='virtio'/>
<driver name='vhost' event_idx='off'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
index ff489ade6d..f82570b81a 100644
--- a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
+++ b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
@@ -33,7 +33,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
index 42286eeebf..a3a9a0f348 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
@@ -28,7 +28,7 @@
<source>
<address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</hostdev>
<memballoon model='none'/>
</devices>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
index 136481411e..0725857827 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
@@ -29,7 +29,7 @@
<source>
<address domain='0x0005' bus='0x90' slot='0x01'
function='0x0'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<driver name='vfio'/>
@@ -43,17 +43,17 @@
<source>
<address domain='0x0005' bus='0x90' slot='0x01'
function='0x2'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<driver name='vfio'/>
<source>
<address domain='0x0005' bus='0x90' slot='0x01'
function='0x3'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
index 6539069e09..9ba3dfac45 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
@@ -34,7 +34,7 @@
<source>
<address domain='0x0000' bus='0x06' slot='0x12'
function='0x5'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</hostdev>
<memballoon model='none'/>
</devices>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
index 1e5a2ca532..489569b289 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
@@ -29,52 +29,52 @@
<source>
<address domain='0x0005' bus='0x90' slot='0x01'
function='0x0'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<driver name='vfio'/>
<source>
<address domain='0x0001' bus='0x01' slot='0x00'
function='0x1'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<driver name='vfio'/>
<source>
<address domain='0x0001' bus='0x01' slot='0x00'
function='0x0'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<driver name='vfio'/>
<source>
<address domain='0x0005' bus='0x90' slot='0x01'
function='0x2'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<driver name='vfio'/>
<source>
<address domain='0x0005' bus='0x90' slot='0x01'
function='0x3'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<driver name='vfio'/>
<source>
<address domain='0x0000' bus='0x06' slot='0x12'
function='0x1'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<driver name='vfio'/>
<source>
<address domain='0x0000' bus='0x06' slot='0x12'
function='0x2'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
index 474cc88d32..4948b5e8cb 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
@@ -21,7 +21,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -31,7 +31,7 @@
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='scsi' index='1' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
@@ -114,7 +114,7 @@
<address type='drive' controller='1' bus='0'
target='0' unit='2'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
index 575f9e778a..55d31c80ee 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
@@ -21,7 +21,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -41,7 +41,7 @@
<address type='drive' controller='0' bus='0'
target='4' unit='8'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
index 640f7ac9c7..ad6cbb07e1 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
@@ -21,7 +21,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='lsilogic'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -79,7 +79,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='2'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
index d62652a27e..b9f3fc1446 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
@@ -21,7 +21,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -41,7 +41,7 @@
<address type='drive' controller='0' bus='0'
target='4' unit='8'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
index 32790c8f3b..748d5ac543 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
@@ -21,7 +21,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -41,7 +41,7 @@
<address type='drive' controller='0' bus='0'
target='4' unit='8'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
index c1bf0bbc98..0e8e8930f9 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
@@ -21,7 +21,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -42,7 +42,7 @@
<address type='drive' controller='0' bus='0'
target='4' unit='8'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
index 23ec57651e..dbbe51946e 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
@@ -35,7 +35,7 @@
<audio id='1' type='none'/>
<hostdev mode='subsystem' type='scsi_host'
managed='no'>
<source protocol='vhost' wwpn='naa.5123456789abcde0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</hostdev>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
index 98c96605fb..f66562e216 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
@@ -21,13 +21,13 @@
<controller type='pci' index='0' model='pcie-root'/>
<controller type='pci' index='1'
model='pcie-root-port'>
<model name='pcie-root-port'/>
- <target chassis='1' port='0x10'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
+ <target chassis='1' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0' multifunction='on'/>
</controller>
<controller type='pci' index='2'
model='pcie-root-port'>
<model name='pcie-root-port'/>
- <target chassis='2' port='0x11'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
+ <target chassis='2' port='0x9'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
index 95cc6a4b79..97cb504116 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
@@ -21,7 +21,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -91,7 +91,7 @@
<address type='drive' controller='0' bus='0'
target='3' unit='5'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
index d04ad74215..7d0433eb12 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
@@ -35,10 +35,10 @@
<source>
<address domain='0x0000' bus='0x06' slot='0x12'
function='0x1'/>
</source>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hugepages-default.xml
b/tests/qemuxml2xmloutdata/hugepages-default.xml
index 18e6d13a84..e14eb577a8 100644
--- a/tests/qemuxml2xmloutdata/hugepages-default.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-default.xml
@@ -28,7 +28,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.xml
b/tests/qemuxml2xmloutdata/hugepages-shared.xml
index 01ea3f0545..4dcabe06f8 100644
--- a/tests/qemuxml2xmloutdata/hugepages-shared.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-shared.xml
@@ -49,7 +49,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml
b/tests/qemuxml2xmloutdata/hyperv-off.xml
index 46eea5fe2f..20c7f653af 100644
--- a/tests/qemuxml2xmloutdata/hyperv-off.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-off.xml
@@ -41,7 +41,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/interface-driver.xml
b/tests/qemuxml2xmloutdata/interface-driver.xml
index eb5d672ea4..435489e009 100644
--- a/tests/qemuxml2xmloutdata/interface-driver.xml
+++ b/tests/qemuxml2xmloutdata/interface-driver.xml
@@ -44,7 +44,7 @@
<model type='virtio'/>
<driver ioeventfd='on' event_idx='on' queues='5'/>
<link state='up'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<serial type='pty'>
<target type='isa-serial' port='0'>
@@ -58,7 +58,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/iothreads-disk.xml
b/tests/qemuxml2xmloutdata/iothreads-disk.xml
index 0aee306cf2..38074b4c62 100644
--- a/tests/qemuxml2xmloutdata/iothreads-disk.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-disk.xml
@@ -31,7 +31,7 @@
<driver name='qemu' type='raw' iothread='2'/>
<source file='/var/lib/libvirt/images/iothrtest2.img'/>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml
b/tests/qemuxml2xmloutdata/kvm-features-off.xml
index 42afbab369..f2e9407ac9 100644
--- a/tests/qemuxml2xmloutdata/kvm-features-off.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features-off.xml
@@ -30,7 +30,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/lease.xml b/tests/qemuxml2xmloutdata/lease.xml
index 8d6c65e7ac..a8d358d08f 100644
--- a/tests/qemuxml2xmloutdata/lease.xml
+++ b/tests/qemuxml2xmloutdata/lease.xml
@@ -43,7 +43,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/luks-disks-source.xml
b/tests/qemuxml2xmloutdata/luks-disks-source.xml
index fbf01cb52a..5333d4ac6e 100644
--- a/tests/qemuxml2xmloutdata/luks-disks-source.xml
+++ b/tests/qemuxml2xmloutdata/luks-disks-source.xml
@@ -46,7 +46,7 @@
</encryption>
</source>
<target dev='vdc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<disk type='volume' device='disk'>
<driver name='qemu' type='raw'/>
@@ -56,7 +56,7 @@
</encryption>
</source>
<target dev='vdd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
@@ -69,7 +69,7 @@
</encryption>
</source>
<target dev='vde' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
index 41399ff0d0..f886ee2228 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
@@ -42,7 +42,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
<memory model='dimm'>
<target>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml
b/tests/qemuxml2xmloutdata/memory-hotplug.xml
index 660e45205c..9545378508 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml
@@ -38,7 +38,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-set.xml
b/tests/qemuxml2xmloutdata/memorybacking-set.xml
index 1924f75779..7c9ddf31dc 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-set.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-set.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
index 19dfa64f64..2f7e8ac1ce 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
index e65d09eb6c..20eff94533 100644
--- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
+++ b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/memtune.xml b/tests/qemuxml2xmloutdata/memtune.xml
index afe9468d8e..53dae40355 100644
--- a/tests/qemuxml2xmloutdata/memtune.xml
+++ b/tests/qemuxml2xmloutdata/memtune.xml
@@ -36,7 +36,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
index bbd77393e7..12c246f355 100644
--- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
+++ b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
@@ -35,7 +35,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/metadata.xml
b/tests/qemuxml2xmloutdata/metadata.xml
index bbd77393e7..12c246f355 100644
--- a/tests/qemuxml2xmloutdata/metadata.xml
+++ b/tests/qemuxml2xmloutdata/metadata.xml
@@ -35,7 +35,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/minimal.xml b/tests/qemuxml2xmloutdata/minimal.xml
index 86a0656c10..447bfbae2d 100644
--- a/tests/qemuxml2xmloutdata/minimal.xml
+++ b/tests/qemuxml2xmloutdata/minimal.xml
@@ -36,7 +36,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-coalesce.xml
b/tests/qemuxml2xmloutdata/net-coalesce.xml
index 55d08cad1d..9a53b1941a 100644
--- a/tests/qemuxml2xmloutdata/net-coalesce.xml
+++ b/tests/qemuxml2xmloutdata/net-coalesce.xml
@@ -48,19 +48,19 @@
<frames max='7'/>
</rx>
</coalesce>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<interface type='network'>
<mac address='52:54:00:e5:48:59'/>
<source network='default'/>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</interface>
<interface type='network'>
<mac address='52:54:00:e5:48:60'/>
<source network='default'/>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</interface>
<serial type='pty'>
<target type='isa-serial' port='0'>
@@ -74,7 +74,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
index a144b5fc91..f860850ab0 100644
--- a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
@@ -35,7 +35,7 @@
</source>
<script path='/etc/qemu-ifup'/>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
index 51b1679012..d15eb3d27a 100644
--- a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
@@ -32,7 +32,7 @@
<script path='/etc/qemu-ifup'/>
<target dev='nic02'/>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
index de176f851b..419bfaa0e7 100644
--- a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
@@ -31,7 +31,7 @@
<mac address='fe:11:22:33:44:55'/>
<target dev='mytap0' managed='no'/>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-eth.xml b/tests/qemuxml2xmloutdata/net-eth.xml
index 3703834d14..96ce9fdbf5 100644
--- a/tests/qemuxml2xmloutdata/net-eth.xml
+++ b/tests/qemuxml2xmloutdata/net-eth.xml
@@ -31,7 +31,7 @@
<mac address='00:11:22:33:44:55'/>
<script path='/etc/qemu-ifup'/>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
index 7caf0c050b..f92256d8ca 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
@@ -33,7 +33,7 @@
<address type='pci' domain='0x0000' bus='0x03'
slot='0x07' function='0x1'/>
</source>
<boot order='1'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
index 65dd69aae2..0e5e5814ac 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
@@ -40,13 +40,13 @@
<parameters managerid='11' typeid='1193047'
typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
</virtualport>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev.xml
b/tests/qemuxml2xmloutdata/net-hostdev.xml
index 47d35d2d08..a9873e4af5 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev.xml
@@ -39,13 +39,13 @@
<parameters managerid='11' typeid='1193047'
typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
</virtualport>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-many-models.xml
b/tests/qemuxml2xmloutdata/net-many-models.xml
index e3c1e96c7d..156ad0f157 100644
--- a/tests/qemuxml2xmloutdata/net-many-models.xml
+++ b/tests/qemuxml2xmloutdata/net-many-models.xml
@@ -19,32 +19,32 @@
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<model type='idontexist'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<interface type='user'>
<mac address='00:11:22:33:44:56'/>
<model type='vmxnet3'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</interface>
<interface type='user'>
<mac address='00:11:22:33:44:57'/>
<model type='netfront'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</interface>
<interface type='user'>
<mac address='00:11:22:33:44:58'/>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</interface>
<interface type='user'>
<mac address='00:11:22:33:44:58'/>
<model type='ne2k_pci'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</interface>
<interface type='user'>
<mac address='00:11:22:33:44:58'/>
<model type='pcnet'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml
b/tests/qemuxml2xmloutdata/net-midonet.xml
index 9410b98f38..17a1239ac1 100644
--- a/tests/qemuxml2xmloutdata/net-midonet.xml
+++ b/tests/qemuxml2xmloutdata/net-midonet.xml
@@ -34,13 +34,13 @@
<parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
</virtualport>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-mtu.xml b/tests/qemuxml2xmloutdata/net-mtu.xml
index 3fe5da65b4..900548b465 100644
--- a/tests/qemuxml2xmloutdata/net-mtu.xml
+++ b/tests/qemuxml2xmloutdata/net-mtu.xml
@@ -44,14 +44,14 @@
<source network='default'/>
<model type='virtio'/>
<mtu size='1500'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<interface type='network'>
<mac address='52:54:00:e5:48:59'/>
<source network='default'/>
<model type='virtio'/>
<mtu size='9000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</interface>
<serial type='pty'>
<target type='isa-serial' port='0'>
@@ -65,7 +65,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.xml
b/tests/qemuxml2xmloutdata/net-openvswitch.xml
index 0f84b34ce1..d35818435b 100644
--- a/tests/qemuxml2xmloutdata/net-openvswitch.xml
+++ b/tests/qemuxml2xmloutdata/net-openvswitch.xml
@@ -39,13 +39,13 @@
<parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'
profileid='bob'/>
</virtualport>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.xml
index 8a6654831a..ce1eb5460c 100644
--- a/tests/qemuxml2xmloutdata/net-udp.xml
+++ b/tests/qemuxml2xmloutdata/net-udp.xml
@@ -33,13 +33,13 @@
<local address='192.168.10.1' port='5556'/>
</source>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-user.xml
b/tests/qemuxml2xmloutdata/net-user.xml
index 0c52ebf2a4..856a4cea48 100644
--- a/tests/qemuxml2xmloutdata/net-user.xml
+++ b/tests/qemuxml2xmloutdata/net-user.xml
@@ -30,7 +30,7 @@
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-vdpa.xml
b/tests/qemuxml2xmloutdata/net-vdpa.xml
index c9de151a08..b8e9da0020 100644
--- a/tests/qemuxml2xmloutdata/net-vdpa.xml
+++ b/tests/qemuxml2xmloutdata/net-vdpa.xml
@@ -25,7 +25,7 @@
<mac address='52:54:00:95:db:c0'/>
<source dev='/dev/vhost-vdpa-0'/>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser.xml
b/tests/qemuxml2xmloutdata/net-vhostuser.xml
index 637935b641..e2e2c2a34e 100644
--- a/tests/qemuxml2xmloutdata/net-vhostuser.xml
+++ b/tests/qemuxml2xmloutdata/net-vhostuser.xml
@@ -25,19 +25,19 @@
<mac address='52:54:00:ee:96:6b'/>
<source type='unix' path='/tmp/vhost0.sock'
mode='server'/>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<interface type='vhostuser'>
<mac address='52:54:00:ee:96:6c'/>
<source type='unix' path='/tmp/vhost1.sock'
mode='client'/>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</interface>
<interface type='server'>
<mac address='52:54:00:95:db:c0'/>
<source port='2015'/>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml
b/tests/qemuxml2xmloutdata/net-virtio-device.xml
index dd94a8d6d1..9827329be7 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-device.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-device.xml
@@ -31,13 +31,13 @@
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<driver txmode='iothread'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
index 40e57db44a..decf71b86c 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
@@ -34,13 +34,13 @@
<host csum='off' gso='off' tso4='off'
tso6='off' ecn='off' ufo='off' mrg_rxbuf='off'/>
<guest csum='off' tso4='off' tso6='off'
ecn='off' ufo='off'/>
</driver>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
index 334745d8f8..0402ed8aff 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
@@ -37,7 +37,7 @@
<parameters managerid='11' typeid='1193047'
typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
</virtualport>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<interface type='network' trustGuestRxFilters='no'>
<mac address='10:11:22:33:44:55'/>
@@ -46,7 +46,7 @@
<parameters instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'
interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
</virtualport>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</interface>
<interface type='network'>
<mac address='22:11:22:33:44:55'/>
@@ -55,13 +55,13 @@
<parameters profileid='testhis99'/>
</virtualport>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
index a9dffc0062..b0e5fc37b5 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
@@ -31,13 +31,13 @@
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<driver rx_queue_size='512' tx_queue_size='1024'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
index 72791868e0..6359fd54c7 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
@@ -33,20 +33,20 @@
<model type='virtio'/>
<teaming type='persistent'/>
<alias name='ua-backup0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<interface type='network'>
<mac address='00:11:22:33:44:55'/>
<source network='myhostdevpool'/>
<model type='virtio'/>
<teaming type='transient' persistent='ua-backup0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
index 39dd50ade6..35fd3bc82a 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
@@ -32,14 +32,14 @@
<model type='virtio'/>
<teaming type='persistent'/>
<alias name='ua-backup0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<interface type='user'>
<mac address='66:44:33:22:11:00'/>
<model type='virtio'/>
<teaming type='persistent'/>
<alias name='ua-backup1'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</interface>
<interface type='hostdev' managed='yes'>
<mac address='00:11:22:33:44:55'/>
@@ -47,7 +47,7 @@
<address type='pci' domain='0x0000' bus='0x03'
slot='0x07' function='0x1'/>
</source>
<teaming type='transient' persistent='ua-backup0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</interface>
<interface type='hostdev' managed='yes'>
<mac address='66:44:33:22:11:00'/>
@@ -55,13 +55,13 @@
<address type='pci' domain='0x0000' bus='0x03'
slot='0x07' function='0x2'/>
</source>
<teaming type='transient' persistent='ua-backup1'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio.xml
b/tests/qemuxml2xmloutdata/net-virtio.xml
index 5e3d407cb0..862c5bd927 100644
--- a/tests/qemuxml2xmloutdata/net-virtio.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio.xml
@@ -30,7 +30,7 @@
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
index fc9ef86568..fa81660b34 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
@@ -37,7 +37,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
index 724112b3a2..19855ba207 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
@@ -37,7 +37,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
index b054099f0a..114a5ed2db 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
@@ -37,7 +37,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
index d0dfb88682..5fbebbde7f 100644
--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
@@ -34,7 +34,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
b/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
index c289664f93..cef9f8c5e6 100644
--- a/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
+++ b/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
@@ -30,7 +30,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-distances.xml
b/tests/qemuxml2xmloutdata/numatune-distances.xml
index ee2d956d7e..4f038931c3 100644
--- a/tests/qemuxml2xmloutdata/numatune-distances.xml
+++ b/tests/qemuxml2xmloutdata/numatune-distances.xml
@@ -91,7 +91,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
index 880d8e2947..78a643ec2d 100644
--- a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
+++ b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode.xml
b/tests/qemuxml2xmloutdata/numatune-memnode.xml
index 297ad6b9c8..104d2e6d4c 100644
--- a/tests/qemuxml2xmloutdata/numatune-memnode.xml
+++ b/tests/qemuxml2xmloutdata/numatune-memnode.xml
@@ -34,7 +34,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/panic-isa.xml
b/tests/qemuxml2xmloutdata/panic-isa.xml
index 2efcc47df8..e71386a886 100644
--- a/tests/qemuxml2xmloutdata/panic-isa.xml
+++ b/tests/qemuxml2xmloutdata/panic-isa.xml
@@ -32,7 +32,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
<panic model='isa'>
<address type='isa' iobase='0x505'/>
diff --git a/tests/qemuxml2xmloutdata/panic-no-address.xml
b/tests/qemuxml2xmloutdata/panic-no-address.xml
index 8093ac85f3..b117b6cbeb 100644
--- a/tests/qemuxml2xmloutdata/panic-no-address.xml
+++ b/tests/qemuxml2xmloutdata/panic-no-address.xml
@@ -32,7 +32,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
<panic model='isa'/>
</devices>
diff --git a/tests/qemuxml2xmloutdata/panic.xml b/tests/qemuxml2xmloutdata/panic.xml
index 2efcc47df8..e71386a886 100644
--- a/tests/qemuxml2xmloutdata/panic.xml
+++ b/tests/qemuxml2xmloutdata/panic.xml
@@ -32,7 +32,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
<panic model='isa'>
<address type='isa' iobase='0x505'/>
diff --git a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
index 8e31e4e83b..08969c773d 100644
--- a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
+++ b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
@@ -26,631 +26,631 @@
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/test.img'/>
<target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-a-a.img'/>
<target dev='vdaa' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-a-b.img'/>
<target dev='vdab' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-a-c.img'/>
<target dev='vdac' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-a-d.img'/>
<target dev='vdad' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-b-a.img'/>
<target dev='vdba' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0b' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-b-b.img'/>
<target dev='vdbb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0c' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0b' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-b-c.img'/>
<target dev='vdbc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0d' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0c' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-b-d.img'/>
<target dev='vdbd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0e' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0d' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-c-a.img'/>
<target dev='vdca' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0f' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0e' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-c-b.img'/>
<target dev='vdcb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x10' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0f' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-c-c.img'/>
<target dev='vdcc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x11' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x10' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-c-d.img'/>
<target dev='vdcd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x12' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x11' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-d-a.img'/>
<target dev='vdda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x13' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x12' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-d-b.img'/>
<target dev='vddb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x14' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x13' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-d-c.img'/>
<target dev='vddc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x15' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x14' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-d-d.img'/>
<target dev='vddd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x16' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x15' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-e-a.img'/>
<target dev='vdea' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x17' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x16' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-e-b.img'/>
<target dev='vdeb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x18' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x17' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-e-c.img'/>
<target dev='vdec' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x19' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x18' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-e-d.img'/>
<target dev='vded' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x19' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-f-a.img'/>
<target dev='vdfa' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1b' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1a' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-f-b.img'/>
<target dev='vdfb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1c' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1b' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-f-c.img'/>
<target dev='vdfc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1c' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-f-d.img'/>
<target dev='vdfd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1e' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-g-a.img'/>
<target dev='vdga' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1e' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-g-b.img'/>
<target dev='vdgb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x01' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-g-c.img'/>
<target dev='vdgc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x02' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x01' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-g-d.img'/>
<target dev='vdgd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x02' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-h-a.img'/>
<target dev='vdha' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-h-b.img'/>
<target dev='vdhb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x04' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-h-c.img'/>
<target dev='vdhc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x05' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-h-d.img'/>
<target dev='vdhd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x06' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-i-a.img'/>
<target dev='vdia' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x07' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-i-b.img'/>
<target dev='vdib' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x08' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-i-c.img'/>
<target dev='vdic' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x0a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x09' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-i-d.img'/>
<target dev='vdid' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x0b' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x0a' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-j-a.img'/>
<target dev='vdja' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x0c' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x0b' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-j-b.img'/>
<target dev='vdjb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x0d' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x0c' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-j-c.img'/>
<target dev='vdjc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x0e' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x0d' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-j-d.img'/>
<target dev='vdjd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x0f' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x0e' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-k-a.img'/>
<target dev='vdka' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x10' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x0f' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-k-b.img'/>
<target dev='vdkb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x11' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x10' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-k-c.img'/>
<target dev='vdkc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x12' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x11' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-k-d.img'/>
<target dev='vdkd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x13' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x12' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-l-a.img'/>
<target dev='vdla' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x14' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x13' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-l-b.img'/>
<target dev='vdlb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x15' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x14' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-l-c.img'/>
<target dev='vdlc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x16' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x15' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-l-d.img'/>
<target dev='vdld' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x17' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x16' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-m-a.img'/>
<target dev='vdma' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x18' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x17' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-m-b.img'/>
<target dev='vdmb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x19' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x18' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-m-c.img'/>
<target dev='vdmc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x1a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x19' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-m-d.img'/>
<target dev='vdmd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x1b' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x1a' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-n-a.img'/>
<target dev='vdna' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x1c' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x1b' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-n-b.img'/>
<target dev='vdnb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x1d' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x1c' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-n-c.img'/>
<target dev='vdnc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x1e' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x1d' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-n-d.img'/>
<target dev='vdnd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x1f' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x1e' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-o-a.img'/>
<target dev='vdoa' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x01' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x1f' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-o-b.img'/>
<target dev='vdob' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x02' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x01' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-o-c.img'/>
<target dev='vdoc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x02' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-o-d.img'/>
<target dev='vdod' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-p-a.img'/>
<target dev='vdpa' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x04' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-p-b.img'/>
<target dev='vdpb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x05' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-p-c.img'/>
<target dev='vdpc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x06' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-p-d.img'/>
<target dev='vdpd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x07' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-q-a.img'/>
<target dev='vdqa' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x08' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-q-b.img'/>
<target dev='vdqb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x0a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x09' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-q-c.img'/>
<target dev='vdqc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x0b' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x0a' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-q-d.img'/>
<target dev='vdqd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x0c' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x0b' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-r-a.img'/>
<target dev='vdra' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x0d' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x0c' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-r-b.img'/>
<target dev='vdrb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x0e' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x0d' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-r-c.img'/>
<target dev='vdrc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x0f' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x0e' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-r-d.img'/>
<target dev='vdrd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x10' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x0f' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-s-a.img'/>
<target dev='vdsa' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x11' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x10' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-s-b.img'/>
<target dev='vdsb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x12' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x11' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-s-c.img'/>
<target dev='vdsc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x13' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x12' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-s-d.img'/>
<target dev='vdsd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x14' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x13' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-t-a.img'/>
<target dev='vdta' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x15' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x14' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-t-b.img'/>
<target dev='vdtb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x16' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x15' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-t-c.img'/>
<target dev='vdtc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x17' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x16' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-t-d.img'/>
<target dev='vdtd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x18' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x17' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-u-a.img'/>
<target dev='vdua' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x19' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x18' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-u-b.img'/>
<target dev='vdub' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x1a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x19' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-u-c.img'/>
<target dev='vduc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x1b' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x1a' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-u-d.img'/>
<target dev='vdud' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x1c' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x1b' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-v-a.img'/>
<target dev='vdva' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x1d' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x1c' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-v-b.img'/>
<target dev='vdvb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x1e' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x1d' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-v-c.img'/>
<target dev='vdvc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x1f' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x1e' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-v-d.img'/>
<target dev='vdvd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x01' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x1f' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-w-a.img'/>
<target dev='vdwa' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x02' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x01' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-w-b.img'/>
<target dev='vdwb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x02' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-w-c.img'/>
<target dev='vdwc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-w-d.img'/>
<target dev='vdwd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x04' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-x-a.img'/>
<target dev='vdxa' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x05' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-x-b.img'/>
<target dev='vdxb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x06' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-x-c.img'/>
<target dev='vdxc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x07' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-x-d.img'/>
<target dev='vdxd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x08' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-y-a.img'/>
<target dev='vdya' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x0a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x09' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-y-b.img'/>
<target dev='vdyb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x0b' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x0a' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-y-c.img'/>
<target dev='vdyc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x0c' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x0b' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-y-d.img'/>
<target dev='vdyd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x0d' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x0c' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-z-a.img'/>
<target dev='vdza' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x0e' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x0d' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-z-b.img'/>
<target dev='vdzb' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x0f' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x0e' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-z-c.img'/>
<target dev='vdzc' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x10' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x0f' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/var/lib/libvirt/images/disk-z-d.img'/>
<target dev='vdzd' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x03'
slot='0x11' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x10' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -659,17 +659,17 @@
<controller type='pci' index='1' model='pci-bridge'>
<model name='pci-bridge'/>
<target chassisNr='1'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='pci' index='2' model='pci-bridge'>
<model name='pci-bridge'/>
<target chassisNr='2'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</controller>
<controller type='pci' index='3' model='pci-bridge'>
<model name='pci-bridge'/>
<target chassisNr='3'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
index 80dc73edc2..dbabf55f74 100644
--- a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
@@ -31,172 +31,172 @@
<target busNr='254'>
<node>1</node>
</target>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='pci' index='2'
model='pci-expander-bus'>
<model name='pxb'/>
<target busNr='252'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</controller>
<interface type='user'>
<mac address='52:54:00:f1:95:51'/>
<model type='rtl8139'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:5c:c6:1a'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:39:97:ac'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:45:28:cb'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:ee:b9:a8'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:a9:f7:17'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0b' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:df:2b:f3'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0c' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0b' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:78:94:b4'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0d' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0c' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:6b:9b:06'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0e' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0d' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:17:df:bc'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0f' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0e' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:3b:d0:51'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x10' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x0f' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:8d:2d:17'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x11' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x10' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:a7:66:af'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x12' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x11' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:54:ab:d7'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x13' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x12' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:1f:99:90'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x14' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x13' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:c8:43:87'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x15' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x14' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:df:22:b2'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x16' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x15' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:d2:9a:47'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x17' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x16' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:86:05:e2'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x18' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x17' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:8c:1c:c2'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x19' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x18' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:48:58:92'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x19' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:99:e5:bf'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1b' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1a' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:b1:8c:25'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1c' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1b' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:60:e0:d0'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1c' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:37:00:6a'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1e' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:c7:c8:ad'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1e' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:4e:a7:cf'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:00:79:69'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x01' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:47:00:6f'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x02' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x01' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:2a:8c:8b'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x02' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:ec:d5:e3'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x03' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:7e:6e:c8'/>
<model type='e1000'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x04' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
b/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
index b26016ecb6..a59d837cc6 100644
--- a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
@@ -20,7 +20,7 @@
<mac address='52:54:00:24:a5:9f'/>
<model type='virtio'/>
<rom file=''/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
b/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
index cba9199f3f..e693145163 100644
--- a/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
@@ -20,7 +20,7 @@
<mac address='52:54:00:24:a5:9f'/>
<model type='virtio'/>
<rom enabled='no'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.xml
index 198c2e6ce0..3056c2827f 100644
--- a/tests/qemuxml2xmloutdata/pci-rom.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom.xml
@@ -31,13 +31,13 @@
<mac address='52:54:00:24:a5:9f'/>
<model type='virtio'/>
<rom bar='on'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<interface type='user'>
<mac address='52:54:00:24:a5:9e'/>
<model type='virtio'/>
<rom file='/etc/fake/bootrom.bin'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
@@ -47,17 +47,17 @@
<address domain='0x0000' bus='0x06' slot='0x12'
function='0x5'/>
</source>
<rom bar='off'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<source>
<address domain='0x0000' bus='0x06' slot='0x12'
function='0x6'/>
</source>
<rom bar='on' file='/etc/fake/bootrom.bin'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</hostdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
index 1a1b4f2b70..65d8f8d000 100644
--- a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
+++ b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
@@ -43,7 +43,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
index 6560d6a84f..1e787378d1 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
@@ -17,18 +17,18 @@
<controller type='pci' index='0' model='pcie-root'/>
<controller type='pci' index='1'
model='pcie-root-port'>
<model name='pcie-root-port'/>
- <target chassis='1' port='0x10'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
+ <target chassis='1' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0' multifunction='on'/>
</controller>
<controller type='pci' index='2'
model='pcie-root-port'>
<model name='pcie-root-port'/>
- <target chassis='2' port='0x11'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
+ <target chassis='2' port='0x9'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
<controller type='pci' index='3'
model='pcie-root-port'>
<model name='ioh3420'/>
- <target chassis='3' port='0x12'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x2'/>
+ <target chassis='3' port='0xa'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='sata' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
index 303107514f..9382155e71 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
@@ -17,13 +17,13 @@
<controller type='pci' index='0' model='pcie-root'/>
<controller type='pci' index='1'
model='pcie-root-port'>
<model name='ioh3420'/>
- <target chassis='1' port='0x10'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
+ <target chassis='1' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0' multifunction='on'/>
</controller>
<controller type='pci' index='2'
model='pcie-root-port'>
<model name='ioh3420'/>
- <target chassis='2' port='0x11'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
+ <target chassis='2' port='0x9'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
<controller type='sata' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-gib.xml
b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
index 239e9e693f..d9b821bfe2 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-gib.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
@@ -24,7 +24,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-none.xml
b/tests/qemuxml2xmloutdata/pcihole64-none.xml
index 62b6ef9040..f4941bc67b 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-none.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-none.xml
@@ -24,7 +24,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/pcihole64.xml
b/tests/qemuxml2xmloutdata/pcihole64.xml
index be70336738..52d61603aa 100644
--- a/tests/qemuxml2xmloutdata/pcihole64.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64.xml
@@ -24,7 +24,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
index a95825e57c..9a40b0b0b4 100644
--- a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
index 02e4bf2ccb..df14a1e1b0 100644
--- a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
b/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
index 425c7dfedd..45df55365e 100644
--- a/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
+++ b/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
@@ -26,8 +26,8 @@
</controller>
<controller type='pci' index='3'
model='pcie-root-port'>
<model name='ioh3420'/>
- <target chassis='3' port='0x10'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <target chassis='3' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
</controller>
<controller type='usb' index='0' model='none'/>
<controller type='sata' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
index 1e19106341..7fc1c0f027 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
<seclabel type='none' model='dac'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
index 81413fe58f..63a5e1f9d8 100644
--- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
@@ -36,7 +36,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
index 23e59182f6..892438f4c9 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
<seclabel type='dynamic' model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
index 23e59182f6..892438f4c9 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
<seclabel type='dynamic' model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
index b1e477ebe5..2e97312d91 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
index b074e4f6ca..11e5fbe489 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
@@ -43,7 +43,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
<seclabel type='dynamic' model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
index b1e477ebe5..2e97312d91 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-none.xml
b/tests/qemuxml2xmloutdata/seclabel-none.xml
index b1e477ebe5..2e97312d91 100644
--- a/tests/qemuxml2xmloutdata/seclabel-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-none.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
index 853ec24ba9..4773d23725 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
@@ -34,7 +34,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
<seclabel type='static' model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
index fb17c41c1d..cdf0461180 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
@@ -32,7 +32,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
<seclabel type='static' model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static.xml
b/tests/qemuxml2xmloutdata/seclabel-static.xml
index a9af42aa3b..415f28e6fe 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static.xml
@@ -31,7 +31,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
<seclabel type='static' model='selinux' relabel='no'>
diff --git a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
index 76a40b7fa7..bee743c23a 100644
--- a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
@@ -41,7 +41,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
index 5cd283838a..937fcfe6f5 100644
--- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
@@ -49,7 +49,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
index 97e793382f..7fde19f283 100644
--- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
+++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
@@ -50,7 +50,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
index f244533f4d..c3b3e1bd8f 100644
--- a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
+++ b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
@@ -25,12 +25,12 @@
<shmem name='shmem0'>
<model type='ivshmem-plain'/>
<size unit='M'>4</size>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</shmem>
<shmem name='shmem1' role='peer'>
<model type='ivshmem-plain'/>
<size unit='M'>128</size>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</shmem>
<shmem name='shmem2' role='master'>
<model type='ivshmem-plain'/>
@@ -41,31 +41,31 @@
<model type='ivshmem-doorbell'/>
<server/>
<msi ioeventfd='on'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</shmem>
<shmem name='shmem4'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem4-sock'/>
<msi ioeventfd='on'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</shmem>
<shmem name='shmem5'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem5-sock'/>
<msi ioeventfd='off'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</shmem>
<shmem name='shmem6'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem6-sock'/>
<msi vectors='16' ioeventfd='on'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
</shmem>
<shmem name='shmem7'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem7-sock'/>
<msi vectors='32' ioeventfd='on'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
</shmem>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/shmem.xml b/tests/qemuxml2xmloutdata/shmem.xml
index d7b02ffa4d..b4bcc666d2 100644
--- a/tests/qemuxml2xmloutdata/shmem.xml
+++ b/tests/qemuxml2xmloutdata/shmem.xml
@@ -25,12 +25,12 @@
<shmem name='shmem0'>
<model type='ivshmem'/>
<size unit='M'>4</size>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</shmem>
<shmem name='shmem1'>
<model type='ivshmem'/>
<size unit='M'>128</size>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</shmem>
<shmem name='shmem2'>
<model type='ivshmem'/>
@@ -41,34 +41,34 @@
<model type='ivshmem'/>
<size unit='M'>512</size>
<server/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</shmem>
<shmem name='shmem4'>
<model type='ivshmem'/>
<size unit='M'>1024</size>
<server path='/tmp/shmem4-sock'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</shmem>
<shmem name='shmem5'>
<model type='ivshmem'/>
<size unit='M'>2048</size>
<server path='/tmp/shmem5-sock'/>
<msi ioeventfd='off'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</shmem>
<shmem name='shmem6'>
<model type='ivshmem'/>
<size unit='M'>4096</size>
<server path='/tmp/shmem6-sock'/>
<msi vectors='16'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
</shmem>
<shmem name='shmem7'>
<model type='ivshmem'/>
<size unit='M'>8192</size>
<server path='/tmp/shmem7-sock'/>
<msi vectors='32' ioeventfd='on'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
</shmem>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-controller.xml
b/tests/qemuxml2xmloutdata/smartcard-controller.xml
index 2094f3ea7a..55c4751853 100644
--- a/tests/qemuxml2xmloutdata/smartcard-controller.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-controller.xml
@@ -26,7 +26,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
index c798a3e6a1..f14f64bfa0 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
@@ -30,7 +30,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
index 3e7bc87d5d..47e7302a1b 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
@@ -29,7 +29,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host.xml
b/tests/qemuxml2xmloutdata/smartcard-host.xml
index 088aa4c07b..f8ce1a0185 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host.xml
@@ -26,7 +26,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
index 73cf4733ee..9263d1741b 100644
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
@@ -26,7 +26,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
index d6f07fafdb..ecd671c9cc 100644
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
@@ -28,7 +28,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
index 2ddc55eced..b1daa12c44 100644
--- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
@@ -62,7 +62,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/smbios.xml b/tests/qemuxml2xmloutdata/smbios.xml
index 9e50b5a70e..786bcb02a5 100644
--- a/tests/qemuxml2xmloutdata/smbios.xml
+++ b/tests/qemuxml2xmloutdata/smbios.xml
@@ -67,7 +67,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/sound-device.xml
b/tests/qemuxml2xmloutdata/sound-device.xml
index 598c7711ba..87d9a5524c 100644
--- a/tests/qemuxml2xmloutdata/sound-device.xml
+++ b/tests/qemuxml2xmloutdata/sound-device.xml
@@ -31,34 +31,34 @@
<input type='keyboard' bus='ps2'/>
<sound model='pcspk'/>
<sound model='es1370'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</sound>
<sound model='sb16'/>
<sound model='ac97'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</sound>
<sound model='ich6'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</sound>
<sound model='ich6'>
<codec type='micro'/>
<codec type='duplex'/>
<codec type='output'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</sound>
<sound model='ich9'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</sound>
<sound model='ich9'>
<codec type='micro'/>
<codec type='duplex'/>
<codec type='output'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</sound>
<sound model='usb'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/sound.xml b/tests/qemuxml2xmloutdata/sound.xml
index 3f20a0fd24..1ffa7412d6 100644
--- a/tests/qemuxml2xmloutdata/sound.xml
+++ b/tests/qemuxml2xmloutdata/sound.xml
@@ -31,11 +31,11 @@
<input type='keyboard' bus='ps2'/>
<sound model='pcspk'/>
<sound model='es1370'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</sound>
<sound model='sb16'/>
<sound model='ac97'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</sound>
<audio id='1' type='none'/>
<memballoon model='none'/>
diff --git a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
index 76289dfb74..1235588810 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
@@ -31,7 +31,7 @@
<source network='default'/>
<model type='e1000'/>
<backend tap='/dev/null'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<interface type='network'>
<mac address='52:54:00:e5:48:59'/>
@@ -39,7 +39,7 @@
<model type='virtio'/>
<driver name='vhost'/>
<backend tap='/dev/null' vhost='/dev/zero'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</interface>
<serial type='pty'>
<target type='isa-serial' port='0'>
@@ -53,7 +53,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/tap-vhost.xml
b/tests/qemuxml2xmloutdata/tap-vhost.xml
index 6746736443..7f5b192f86 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost.xml
@@ -45,7 +45,7 @@
<model type='virtio'/>
<driver name='vhost' queues='5'/>
<backend tap='/dev/null' vhost='/dev/zero'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<serial type='pty'>
<target type='isa-serial' port='0'>
@@ -59,7 +59,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
b/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
index 6c6abcd33b..791b34f864 100644
--- a/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
+++ b/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
@@ -34,8 +34,8 @@
</controller>
<controller type='pci' index='3'
model='pcie-root-port'>
<model name='ioh3420'/>
- <target chassis='3' port='0x10'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <target chassis='3' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/usb-controller.xml
b/tests/qemuxml2xmloutdata/usb-controller.xml
index 192d885210..b088bd16d7 100644
--- a/tests/qemuxml2xmloutdata/usb-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller.xml
@@ -22,7 +22,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
index 6ce966f1d4..26b341b058 100644
--- a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
+++ b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
@@ -15,56 +15,56 @@
<devices>
<emulator>/usr/bin/qemu-system-i386</emulator>
<controller type='usb' index='0' model='ich9-ehci1'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x7'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x7'/>
</controller>
<controller type='usb' index='0' model='ich9-uhci1'>
<master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0' multifunction='on'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
</controller>
<controller type='usb' index='0' model='ich9-uhci3'>
<master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x2'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x2'/>
</controller>
<controller type='usb' index='0' model='ich9-uhci2'>
<master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x1'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
</controller>
<controller type='usb' index='1' model='ich9-ehci1'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x7'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x7'/>
</controller>
<controller type='usb' index='1' model='ich9-uhci1'>
<master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0' multifunction='on'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0' multifunction='on'/>
</controller>
<controller type='usb' index='1' model='ich9-uhci3'>
<master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x2'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x2'/>
</controller>
<controller type='usb' index='1' model='ich9-uhci2'>
<master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x1'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x1'/>
</controller>
<controller type='usb' index='2' model='ich9-ehci1'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x7'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x7'/>
</controller>
<controller type='usb' index='2' model='ich9-uhci1'>
<master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0' multifunction='on'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0' multifunction='on'/>
</controller>
<controller type='usb' index='2' model='ich9-uhci3'>
<master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x2'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x2'/>
</controller>
<controller type='usb' index='2' model='ich9-uhci2'>
<master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x1'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x1'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-none.xml
b/tests/qemuxml2xmloutdata/usb-none.xml
index c3a985cb46..9ec7d39b87 100644
--- a/tests/qemuxml2xmloutdata/usb-none.xml
+++ b/tests/qemuxml2xmloutdata/usb-none.xml
@@ -20,7 +20,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
index 8ae380770f..a13c7346cd 100644
--- a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
@@ -22,7 +22,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-port-missing.xml
b/tests/qemuxml2xmloutdata/usb-port-missing.xml
index 1621779c03..ce6b0b394e 100644
--- a/tests/qemuxml2xmloutdata/usb-port-missing.xml
+++ b/tests/qemuxml2xmloutdata/usb-port-missing.xml
@@ -31,7 +31,7 @@
<address type='usb' bus='0'/>
</hub>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
index e0a424d3be..19561a1c02 100644
--- a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
@@ -33,7 +33,7 @@
<usbdev allow='no'/>
</redirfilter>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter.xml
b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
index 37a192ded0..ac5a1c5091 100644
--- a/tests/qemuxml2xmloutdata/usb-redir-filter.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
@@ -44,7 +44,7 @@
<usbdev allow='no'/>
</redirfilter>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-redir.xml
b/tests/qemuxml2xmloutdata/usb-redir.xml
index e40969cb58..c57ccc8d47 100644
--- a/tests/qemuxml2xmloutdata/usb-redir.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir.xml
@@ -41,7 +41,7 @@
<address type='usb' bus='0' port='4'/>
</redirdev>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
b/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
index bd0602b7fa..c1b787cdc4 100644
--- a/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
+++ b/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
@@ -31,7 +31,7 @@
<memballoon model='none'/>
<vsock model='virtio'>
<cid auto='yes'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</vsock>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/vhost_queues.xml
b/tests/qemuxml2xmloutdata/vhost_queues.xml
index b940f05dee..46428b59e2 100644
--- a/tests/qemuxml2xmloutdata/vhost_queues.xml
+++ b/tests/qemuxml2xmloutdata/vhost_queues.xml
@@ -43,7 +43,7 @@
<mac address='52:54:00:e5:48:58'/>
<model type='virtio'/>
<driver name='vhost' queues='5'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<serial type='pty'>
<target type='isa-serial' port='0'>
@@ -57,7 +57,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
index b94b0c8aac..2ff6af9832 100644
--- a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
@@ -20,13 +20,13 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='passthrough' bus='virtio'>
<source evdev='/dev/input/event1234'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</input>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-input.xml
b/tests/qemuxml2xmloutdata/virtio-input.xml
index 9d8db57981..313920e911 100644
--- a/tests/qemuxml2xmloutdata/virtio-input.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input.xml
@@ -19,19 +19,19 @@
</controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</input>
<input type='keyboard' bus='virtio'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
</input>
<input type='tablet' bus='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</input>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-lun.xml
b/tests/qemuxml2xmloutdata/virtio-lun.xml
index e1e28c33b9..cdb804e9a0 100644
--- a/tests/qemuxml2xmloutdata/virtio-lun.xml
+++ b/tests/qemuxml2xmloutdata/virtio-lun.xml
@@ -42,13 +42,13 @@
<mac address='52:54:00:e5:48:58'/>
<model type='virtio'/>
<driver name='vhost' event_idx='off'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
index 2658bf8ecc..a903ada842 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
@@ -22,14 +22,14 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
<rng model='virtio'>
<backend model='egd' type='tcp'>
<source mode='connect' host='1.2.3.4'
service='1234'/>
<protocol type='raw'/>
</backend>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</rng>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-random.xml
b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
index 4ba8aa522f..f7faa2fc4e 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-random.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
@@ -22,12 +22,12 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
<rng model='virtio'>
<rate bytes='123' period='1234'/>
<backend model='random'>/dev/urandom</backend>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</rng>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
index 6be4d36325..fa60ede67e 100644
--- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
+++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
@@ -34,7 +34,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 30/43] qemuxml2(argv|xml)test: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY from tests
All tests now get that capability via virQEMUCapsInitQMPBasicArch.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 70 +++++++++-------------------------------
tests/qemuxml2xmltest.c | 30 +++--------------
2 files changed, 20 insertions(+), 80 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index df7fbe3360..b89a476e87 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1682,7 +1682,6 @@ mymain(void)
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_CHARDEV_LOGFILE);
DO_TEST("serial-spiceport",
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_ISA_SERIAL);
@@ -2454,68 +2453,54 @@ mymain(void)
DO_TEST("video-device-pciaddr-default",
QEMU_CAPS_KVM,
QEMU_CAPS_VNC,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-vga-device", QEMU_CAPS_DEVICE_VGA,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ DO_TEST("video-vga-device", QEMU_CAPS_DEVICE_VGA);
DO_TEST("video-vga-device-vgamem", QEMU_CAPS_DEVICE_VGA,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_VGAMEM);
+ QEMU_CAPS_VGA_VGAMEM);
DO_TEST("video-qxl-device",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_DEVICE_QXL);
DO_TEST("video-qxl-device-vgamem",
QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_QXL_VGAMEM);
DO_TEST_CAPS_LATEST("video-qxl-device-vram64");
DO_TEST("video-qxl-sec-device",
- QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_DEVICE_QXL);
DO_TEST("video-qxl-sec-device-vgamem",
QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_QXL_VGAMEM);
DO_TEST_CAPS_LATEST("video-qxl-sec-device-vram64");
DO_TEST("video-qxl-heads",
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_QXL_MAX_OUTPUTS);
DO_TEST("video-vga-qxl-heads",
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_QXL_MAX_OUTPUTS);
DO_TEST("video-qxl-noheads",
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_QXL_MAX_OUTPUTS);
DO_TEST("video-qxl-resolution",
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_QXL_VGAMEM);
DO_TEST("video-virtio-gpu-device",
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_DEVICE_VIRTIO_GPU);
DO_TEST("video-virtio-gpu-virgl",
QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_VIRTIO_GPU_VIRGL);
DO_TEST("video-virtio-gpu-spice-gl",
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_VIRTIO_GPU_VIRGL,
QEMU_CAPS_SPICE,
QEMU_CAPS_SPICE_GL,
- QEMU_CAPS_SPICE_RENDERNODE,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_SPICE_RENDERNODE);
DO_TEST("video-virtio-gpu-sdl-gl",
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_SDL_GL,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_SDL_GL);
DO_TEST("video-virtio-gpu-secondary",
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_DEVICE_VIRTIO_GPU);
DO_TEST("video-virtio-vga",
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_DEVICE_VIRTIO_VGA,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS);
DO_TEST_CAPS_LATEST("video-bochs-display-device");
DO_TEST_CAPS_LATEST("video-ramfb-display-device");
@@ -2532,8 +2517,7 @@ mymain(void)
DO_TEST_PARSE_ERROR("video-multiple-primaries",
QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_DEVICE_VGA,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_DEVICE_VGA);
DO_TEST("virtio-rng-default",
QEMU_CAPS_DEVICE_VIRTIO_RNG,
@@ -2635,7 +2619,6 @@ mymain(void)
DO_TEST("pcie-root",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("q35",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -2643,7 +2626,6 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST_PARSE_ERROR("q35-dmi-bad-address1",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -2670,7 +2652,6 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("q35-usb2-multi",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -2678,7 +2659,6 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("q35-usb2-reorder",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -2686,7 +2666,6 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
/* verify that devices with pcie capability are assigned to a pcie slot */
DO_TEST("q35-pcie",
@@ -2706,8 +2685,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_NEC_USB_XHCI);
/* same XML as q35-pcie, but don't set
* QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, so virtio devices should
* be assigned to legacy pci slots
@@ -2728,8 +2706,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_NEC_USB_XHCI);
/* same as q35-pcie, but all PCI controllers are added automatically */
DO_TEST("q35-pcie-autoadd",
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
@@ -2748,8 +2725,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("q35-default-devices-only",
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
QEMU_CAPS_DEVICE_VIRTIO_RNG,
@@ -2767,8 +2743,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("q35-multifunction",
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
QEMU_CAPS_DEVICE_VIRTIO_RNG,
@@ -2786,8 +2761,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("q35-virt-manager-basic",
QEMU_CAPS_KVM,
QEMU_CAPS_MACHINE_VMPORT_OPT,
@@ -2811,7 +2785,6 @@ mymain(void)
QEMU_CAPS_ICH9_USB_EHCI1,
QEMU_CAPS_NEC_USB_XHCI,
QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_HDA_DUPLEX,
@@ -2822,7 +2795,6 @@ mymain(void)
DO_TEST("pcie-root-port",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
/* Make sure the default model for PCIe Root Ports is picked correctly
@@ -2856,7 +2828,6 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST_PARSE_ERROR("440fx-wrong-root", NONE);
DO_TEST_PARSE_ERROR("440fx-ide-address-conflict", NONE);
@@ -2864,21 +2835,18 @@ mymain(void)
DO_TEST_PARSE_ERROR("pcie-root-port-too-many",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("pcie-switch-upstream-port",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_DEVICE_X3130_UPSTREAM,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("pcie-switch-downstream-port",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_DEVICE_X3130_UPSTREAM,
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("pci-expander-bus",
@@ -2940,7 +2908,6 @@ mymain(void)
DO_TEST("pcihole64-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
@@ -2991,12 +2958,10 @@ mymain(void)
DO_TEST("aarch64-video-virtio-gpu-pci",
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_VIRTIO_GPU);
DO_TEST("aarch64-video-default",
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_VNC);
DO_TEST("aarch64-aavmf-virtio-mmio",
@@ -3365,7 +3330,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_GPU_VIRGL,
QEMU_CAPS_SPICE_GL,
QEMU_CAPS_SPICE_RENDERNODE,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_CHARDEV_FILE_APPEND,
QEMU_CAPS_CCID_EMULATED,
@@ -3430,7 +3394,6 @@ mymain(void)
DO_TEST_PARSE_ERROR("virtio-options-video-iommu",
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_VHOST_USER_GPU);
DO_TEST_PARSE_ERROR("virtio-options-controller-ats",
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST_PARSE_ERROR("virtio-options-disk-ats", NONE);
@@ -3444,7 +3407,6 @@ mymain(void)
DO_TEST_PARSE_ERROR("virtio-options-video-ats",
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_VHOST_USER_GPU);
DO_TEST_PARSE_ERROR("virtio-options-controller-packed",
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST_PARSE_ERROR("virtio-options-disk-packed", NONE);
@@ -3459,7 +3421,6 @@ mymain(void)
DO_TEST_PARSE_ERROR("virtio-options-video-packed",
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_VHOST_USER_GPU);
DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
@@ -3516,7 +3477,6 @@ mymain(void)
DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_CCW,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index f0030966a8..c26721d1d3 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -811,7 +811,6 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("q35-usb2",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -819,7 +818,6 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("q35-usb2-multi",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -827,7 +825,6 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("q35-usb2-reorder",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -835,7 +832,6 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("q35-pcie",
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
@@ -854,8 +850,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_NEC_USB_XHCI);
/* same XML as q35-pcie, but don't set
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY */
DO_TEST("q35-virtio-pci",
@@ -874,8 +869,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_NEC_USB_XHCI);
/* same as q35-pcie, but all PCI controllers are added automatically */
DO_TEST("q35-pcie-autoadd",
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
@@ -894,8 +888,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("q35-default-devices-only",
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
QEMU_CAPS_DEVICE_VIRTIO_RNG,
@@ -913,8 +906,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("q35-multifunction",
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
QEMU_CAPS_DEVICE_VIRTIO_RNG,
@@ -932,8 +924,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("q35-virt-manager-basic",
QEMU_CAPS_KVM,
QEMU_CAPS_ICH9_DISABLE_S3,
@@ -956,7 +947,6 @@ mymain(void)
QEMU_CAPS_ICH9_USB_EHCI1,
QEMU_CAPS_NEC_USB_XHCI,
QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_HDA_DUPLEX,
@@ -965,14 +955,12 @@ mymain(void)
DO_TEST("pcie-root",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
/* Test automatic and manual setting of pcie-root-port attributes */
DO_TEST("pcie-root-port",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
/* Make sure the default model for PCIe Root Ports is picked correctly
@@ -988,14 +976,12 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_DEVICE_X3130_UPSTREAM,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("pcie-switch-downstream-port",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_DEVICE_X3130_UPSTREAM,
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("pci-expander-bus",
QEMU_CAPS_DEVICE_PXB);
@@ -1088,7 +1074,6 @@ mymain(void)
DO_TEST("pcihole64-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
@@ -1162,7 +1147,6 @@ mymain(void)
DO_TEST("aarch64-video-virtio-gpu-pci",
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_VIRTIO_GPU);
DO_TEST("aarch64-pci-serial",
QEMU_CAPS_DEVICE_PCI_SERIAL,
@@ -1182,7 +1166,6 @@ mymain(void)
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_VNC);
@@ -1339,7 +1322,6 @@ mymain(void)
DO_TEST("video-device-pciaddr-default",
QEMU_CAPS_KVM,
QEMU_CAPS_VNC,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("video-qxl-heads", QEMU_CAPS_DEVICE_QXL);
DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_QXL);
@@ -1348,14 +1330,12 @@ mymain(void)
DO_TEST("video-virtio-gpu-ccw",
QEMU_CAPS_CCW,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);
DO_TEST("video-virtio-gpu-ccw-auto",
QEMU_CAPS_CCW,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 31/43] qemu: capabilities: Move rest of always present caps to virQEMUCapsInitQMPArch
These conveniently don't have any test fallout.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 36836cad3d..af0bb398e4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5049,6 +5049,13 @@ virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
{
/* Following caps were asserted by a version check for pre 2.11 qemus */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
switch (qemuCaps->arch) {
case VIR_ARCH_I686:
@@ -5125,15 +5132,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
static void
virQEMUCapsInitQMPVersionCaps(virQEMUCapsPtr qemuCaps)
{
- /* Following caps were asserted by a version check for pre 2.11 qemus */
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL);
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT);
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
-
/* -enable-fips is deprecated in QEMU 5.2.0, and QEMU
* should be built with gcrypt to achieve FIPS compliance
* automatically / implicitly
--
2.30.2
7:32 a.m.
New subject: [RFC PATCH 31/43] qemu: capabilities: Move rest of always present caps to virQEMUCapsInitQMPArch
On Fri, Apr 09, 2021 at 04:57:07PM +0200, Peter Krempa wrote:
These conveniently don't have any test fallout.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 36836cad3d..af0bb398e4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5049,6 +5049,13 @@ virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
{
/* Following caps were asserted by a version check for pre 2.11 qemus */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
I guess eventually we should retire all of these capabilities. This
patch series does that only for QEMU_CAPS_DEVICE_VIDEO_PRIMARY.
That can be done as a followup series.
Pavel
9:57 a.m.
New subject: [RFC PATCH 32/43] qemuhotplugtest: Add also always-present capabilities
Use virQEMUCapsInitQMPBasicArch in qemuHotplugCreateObjects so that we
also add the always-present capabilities to the set of capabilities used
for the hotplug test and fix fallout.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuhotplugtest.c | 5 +++++
.../qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml | 2 +-
.../qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml | 2 +-
.../ppc64-modern-individual-result-conf.xml | 2 +-
.../ppc64-modern-individual-result-live.xml | 2 +-
tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml | 2 +-
tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml | 2 +-
.../x86-modern-individual-add-result-conf.xml | 2 +-
.../x86-modern-individual-add-result-live.xml | 2 +-
tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml | 2 +-
tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml | 2 +-
.../qemuhotplug-ivshmem-doorbell-detach.xml | 2 +-
.../qemuhotplug-ivshmem-plain-detach.xml | 2 +-
.../qemuhotplugtestdevices/qemuhotplug-watchdog-full.xml | 2 +-
.../qemuhotplug-watchdog-user-alias-full.xml | 2 +-
.../qemuhotplug-base-live+disk-virtio.xml | 2 +-
.../qemuhotplug-base-live+hostdev-pci.xml | 2 +-
.../qemuhotplug-base-live+interface-vdpa.xml | 2 +-
.../qemuhotplug-base-live+ivshmem-doorbell.xml | 4 ++--
.../qemuhotplug-base-live+ivshmem-plain.xml | 2 +-
.../qemuhotplug-base-live+watchdog-user-alias.xml | 2 +-
.../qemuhotplug-base-live+watchdog.xml | 2 +-
.../qemuhotplug-base-with-scsi-controller-live.xml | 8 ++++----
...plug-base-without-scsi-controller-live+disk-scsi-2.xml | 8 ++++----
24 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index df5c9c9059..3b2e5f6c39 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -32,6 +32,9 @@
#include "virthread.h"
#include "virfile.h"
+#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
+#include "qemu/qemu_capspriv.h"
+
#define VIR_FROM_THIS VIR_FROM_NONE
static virQEMUDriver driver;
@@ -71,6 +74,8 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
if (!(priv->qemuCaps = virQEMUCapsNew()))
return -1;
+ virQEMUCapsInitQMPBasicArch(priv->qemuCaps);
+
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_CCW);
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
index 690c85cf85..a7ada18bf3 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
@@ -59,7 +59,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
index 58e156203f..3932fd9b55 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
@@ -67,7 +67,7 @@
<audio id='1' type='none'/>
<memballoon model='virtio'>
<alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
index d1e6329812..f3a1efeede 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
@@ -59,7 +59,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
index a119ae44d5..6d64ead3d0 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
@@ -67,7 +67,7 @@
<audio id='1' type='none'/>
<memballoon model='virtio'>
<alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
index a0358df432..87eb19ebd8 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
@@ -35,7 +35,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
index a6c6c33a4b..251634e266 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
@@ -43,7 +43,7 @@
<audio id='1' type='none'/>
<memballoon model='virtio'>
<alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
index d16832b116..140892aaf8 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
@@ -35,7 +35,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
index 5edb601297..45196ba1d1 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
@@ -43,7 +43,7 @@
<audio id='1' type='none'/>
<memballoon model='virtio'>
<alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
index 0c675c3db9..a3ca61ce76 100644
--- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
@@ -25,7 +25,7 @@
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
index 5aca6ea5c5..96dd8b5873 100644
--- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
@@ -33,7 +33,7 @@
<audio id='1' type='none'/>
<memballoon model='virtio'>
<alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell-detach.xml
b/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell-detach.xml
index 7c066964d7..02cd0dd07d 100644
--- a/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell-detach.xml
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell-detach.xml
@@ -3,5 +3,5 @@
<server path='/var/lib/libvirt/shmem-shmem1-sock'/>
<msi ioeventfd='on'/>
<alias name='shmem1'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</shmem>
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml
b/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml
index 338017aa28..10025bdefc 100644
--- a/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml
@@ -2,5 +2,5 @@
<model type='ivshmem-plain'/>
<size unit='M'>4</size>
<alias name='shmem0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</shmem>
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-full.xml
b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-full.xml
index 68bbfa87c7..ca9425e640 100644
--- a/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-full.xml
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-full.xml
@@ -1,4 +1,4 @@
<watchdog model='i6300esb' action='poweroff'>
<alias name='watchdog0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</watchdog>
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml
b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml
index d34f245546..e2ec85637b 100644
--- a/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml
@@ -1,4 +1,4 @@
<watchdog model='i6300esb' action='poweroff'>
<alias name='ua-UserWatchdog'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</watchdog>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
index 5b573f1915..af68d7fc6e 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
@@ -27,7 +27,7 @@
<readonly/>
<shareable/>
<alias name='virtio-disk4'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<alias name='usb'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml
index 62366bee05..d8b0c80feb 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml
@@ -51,7 +51,7 @@
<address domain='0x0000' bus='0x06' slot='0x12'
function='0x2'/>
</source>
<alias name='hostdev0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</hostdev>
<memballoon model='none'/>
</devices>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-vdpa.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-vdpa.xml
index 54e5dabdfa..f80dc42ac5 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-vdpa.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-vdpa.xml
@@ -43,7 +43,7 @@
<source dev='/dev/vhost-vdpa-0'/>
<model type='virtio'/>
<alias name='net0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
<input type='mouse' bus='ps2'>
<alias name='input0'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
index 86b6ebe19a..b0898a968b 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
@@ -50,14 +50,14 @@
<model type='ivshmem-plain'/>
<size unit='M'>4</size>
<alias name='shmem0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</shmem>
<shmem name='shmem1'>
<model type='ivshmem-doorbell'/>
<server path='/var/lib/libvirt/shmem-shmem1-sock'/>
<msi ioeventfd='on'/>
<alias name='shmem1'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</shmem>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
index 3a208a8244..db21d2b5ba 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
@@ -50,7 +50,7 @@
<model type='ivshmem-plain'/>
<size unit='M'>4</size>
<alias name='shmem0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</shmem>
</devices>
<seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
index 31bafb0814..f54c7a4599 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
@@ -47,7 +47,7 @@
<audio id='1' type='none'/>
<watchdog model='i6300esb' action='poweroff'>
<alias name='ua-UserWatchdog'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</watchdog>
<memballoon model='none'/>
</devices>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
index c9a2e90433..bd85c56ce6 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
@@ -47,7 +47,7 @@
<audio id='1' type='none'/>
<watchdog model='i6300esb' action='poweroff'>
<alias name='watchdog0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</watchdog>
<memballoon model='none'/>
</devices>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
index 0a04e2ac04..a61a68f561 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
@@ -28,19 +28,19 @@
</controller>
<controller type='scsi' index='0' model='virtio-scsi'>
<alias name='scsi0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='scsi' index='1' model='virtio-scsi'>
<alias name='scsi1'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</controller>
<controller type='scsi' index='2' model='virtio-scsi'>
<alias name='scsi2'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</controller>
<controller type='scsi' index='3' model='virtio-scsi'>
<alias name='scsi3'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</controller>
<input type='mouse' bus='ps2'>
<alias name='input0'/>
diff --git
a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
index f553229a31..ddc57cbb16 100644
---
a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
+++
b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
@@ -38,19 +38,19 @@
</controller>
<controller type='scsi' index='0' model='virtio-scsi'>
<alias name='scsi0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
<controller type='scsi' index='1' model='virtio-scsi'>
<alias name='scsi1'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</controller>
<controller type='scsi' index='2' model='virtio-scsi'>
<alias name='scsi2'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</controller>
<controller type='scsi' index='3' model='virtio-scsi'>
<alias name='scsi3'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</controller>
<input type='mouse' bus='ps2'>
<alias name='input0'/>
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 33/43] qemu: command: Remove legacy '-vga' commandline formatter
All supported qemus now support using '-device' for adding a graphics
device.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 115 +++-------------------------------------
1 file changed, 6 insertions(+), 109 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a0e489fb59..60607c0f68 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4361,90 +4361,6 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
}
-static int
-qemuBuildVgaVideoCommand(virCommandPtr cmd,
- virDomainVideoDefPtr video,
- virQEMUCapsPtr qemuCaps)
-{
- const char *dev;
- const char *vgastr = qemuVideoTypeToString(video->type);
-
- if (!vgastr || STREQ(vgastr, "")) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("invalid model for video type '%s'"),
- virDomainVideoTypeToString(video->type));
- return -1;
- }
-
- virCommandAddArgList(cmd, "-vga", vgastr, NULL);
-
- /* If we cannot use --device option to specify the video device
- * in QEMU we will fallback to the old --vga option. To get the
- * correct device name for the --vga option the 'qemuVideo' is
- * used, but to set some device attributes we need to use the
- * --global option and for that we need to specify the device
- * name the same as for --device option and for that we need to
- * use 'qemuDeviceVideo'.
- *
- * See 'Graphics Devices' section in docs/qdev-device-use.txt in
- * QEMU repository.
- */
- dev = qemuDeviceVideoTypeToString(video->type);
-
- if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL &&
- (video->vram || video->ram)) {
- unsigned int ram = video->ram;
- unsigned int vram = video->vram;
- unsigned int vram64 = video->vram64;
- unsigned int vgamem = video->vgamem;
- unsigned int heads = video->heads;
-
- if (ram) {
- virCommandAddArg(cmd, "-global");
- virCommandAddArgFormat(cmd, "%s.ram_size=%u",
- dev, ram * 1024);
- }
- if (vram) {
- virCommandAddArg(cmd, "-global");
- virCommandAddArgFormat(cmd, "%s.vram_size=%u",
- dev, vram * 1024);
- }
- if (vram64 &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VRAM64)) {
- virCommandAddArg(cmd, "-global");
- virCommandAddArgFormat(cmd, "%s.vram64_size_mb=%u",
- dev, vram64 / 1024);
- }
- if (vgamem &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGAMEM)) {
- virCommandAddArg(cmd, "-global");
- virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u",
- dev, vgamem / 1024);
- }
- if (heads &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS)) {
- virCommandAddArg(cmd, "-global");
- virCommandAddArgFormat(cmd, "%s.max_outputs=%u",
- dev, heads);
- }
- }
-
- if (video->vram &&
- ((video->type == VIR_DOMAIN_VIDEO_TYPE_VGA &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) ||
- (video->type == VIR_DOMAIN_VIDEO_TYPE_VMVGA &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_VMWARE_SVGA_VGAMEM)))) {
- unsigned int vram = video->vram;
-
- virCommandAddArg(cmd, "-global");
- virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u",
- dev, vram / 1024);
- }
-
- return 0;
-}
-
-
static char *
qemuBuildVhostUserChardevStr(const char *alias,
int *fd,
@@ -4496,34 +4412,15 @@ qemuBuildVideoCommandLine(virCommandPtr cmd,
if (video->type == VIR_DOMAIN_VIDEO_TYPE_NONE)
continue;
- if (video->primary) {
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY)) {
-
- if (qemuCommandAddExtDevice(cmd,
- &def->videos[i]->info) < 0)
- return -1;
-
- virCommandAddArg(cmd, "-device");
-
- if (!(str = qemuBuildDeviceVideoStr(def, video, qemuCaps)))
- return -1;
-
- virCommandAddArg(cmd, str);
- } else {
- if (qemuBuildVgaVideoCommand(cmd, video, qemuCaps) < 0)
- return -1;
- }
- } else {
- if (qemuCommandAddExtDevice(cmd, &def->videos[i]->info) < 0)
- return -1;
+ if (qemuCommandAddExtDevice(cmd, &def->videos[i]->info) < 0)
+ return -1;
- virCommandAddArg(cmd, "-device");
+ virCommandAddArg(cmd, "-device");
- if (!(str = qemuBuildDeviceVideoStr(def, video, qemuCaps)))
- return -1;
+ if (!(str = qemuBuildDeviceVideoStr(def, video, qemuCaps)))
+ return -1;
- virCommandAddArg(cmd, str);
- }
+ virCommandAddArg(cmd, str);
}
return 0;
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 34/43] qemu_domain_address: Drop compatibility with pre-device vga specification for i440fx
Remove the slot reservation for the vga card which doesn't make sense
with supported qemus any more for the i440fx machine type.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain_address.c | 37 +++-------------------------------
1 file changed, 3 insertions(+), 34 deletions(-)
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 0dbf203cd0..85a6136325 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -1731,12 +1731,10 @@ qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
static int
qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
- virQEMUCapsPtr qemuCaps,
virDomainPCIAddressSetPtr addrs)
{
size_t i;
virPCIDeviceAddress tmp_addr;
- bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
g_autofree char *addrStr = NULL;
virDomainPCIConnectFlags flags = (VIR_PCI_CONNECT_AUTOASSIGN
| VIR_PCI_CONNECT_TYPE_PCI_DEVICE);
@@ -1813,8 +1811,6 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
* at slot 2.
*/
virDomainVideoDefPtr primaryVideo = def->videos[0];
- virPCIDeviceAddress primaryCardAddr = {.domain = 0, .bus = 0,
- .slot = 2, .function = 0};
if (virDeviceInfoPCIAddressIsWanted(&primaryVideo->info)) {
memset(&tmp_addr, 0, sizeof(tmp_addr));
@@ -1827,15 +1823,8 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
return -1;
if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
- if (qemuDeviceVideoUsable) {
- if (qemuDomainPCIAddressReserveNextAddr(addrs,
- &primaryVideo->info)
< 0) {
- return -1;
- }
- } else {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("PCI address 0:0:2.0 is in use, "
- "QEMU needs it for primary video"));
+ if (qemuDomainPCIAddressReserveNextAddr(addrs,
+ &primaryVideo->info) <
0) {
return -1;
}
} else {
@@ -1844,26 +1833,6 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
primaryVideo->info.addr.pci = tmp_addr;
primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
}
- } else if (!qemuDeviceVideoUsable) {
- if (!virPCIDeviceAddressEqual(&primaryVideo->info.addr.pci,
- &primaryCardAddr)) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Primary video card must have PCI address
0:0:2.0"));
- return -1;
- }
- /* If TYPE == PCI, then qemuDomainCollectPCIAddress() function
- * has already reserved the address, so we must skip */
- }
- } else if (addrs->nbuses && !qemuDeviceVideoUsable) {
- memset(&tmp_addr, 0, sizeof(tmp_addr));
- tmp_addr.slot = 2;
-
- if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
- VIR_DEBUG("PCI address 0:0:2.0 in use, future addition of a video"
- " device will not be possible without manual"
- " intervention");
- } else if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0)
{
- return -1;
}
}
return 0;
@@ -2087,7 +2056,7 @@ qemuDomainValidateDevicePCISlotsChipsets(virDomainDefPtr def,
virDomainPCIAddressSetPtr addrs)
{
if (qemuDomainIsI440FX(def) &&
- qemuDomainValidateDevicePCISlotsPIIX3(def, qemuCaps, addrs) < 0) {
+ qemuDomainValidateDevicePCISlotsPIIX3(def, addrs) < 0) {
return -1;
}
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 35/43] qemu_domain_address: Drop compatibility with pre-device vga specification for q35
Remove the slot reservation for the vga card which doesn't make sense
with supported qemus any more for the q35 machine type.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain_address.c | 40 ++++------------------------------
1 file changed, 4 insertions(+), 36 deletions(-)
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 85a6136325..308b23676d 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -1841,12 +1841,10 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
static int
qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
- virQEMUCapsPtr qemuCaps,
virDomainPCIAddressSetPtr addrs)
{
size_t i;
virPCIDeviceAddress tmp_addr;
- bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
g_autofree char *addrStr = NULL;
virDomainPCIConnectFlags flags = VIR_PCI_CONNECT_TYPE_PCIE_DEVICE;
@@ -1979,45 +1977,15 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
return -1;
if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
- if (qemuDeviceVideoUsable) {
- if (qemuDomainPCIAddressReserveNextAddr(addrs,
- &primaryVideo->info)
< 0)
- return -1;
- } else {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("PCI address 0:0:1.0 is in use, "
- "QEMU needs it for primary video"));
+ if (qemuDomainPCIAddressReserveNextAddr(addrs,
+ &primaryVideo->info) <
0)
return -1;
- }
} else {
if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) <
0)
return -1;
primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
primaryVideo->info.addr.pci = tmp_addr;
}
- } else if (!qemuDeviceVideoUsable) {
- if (primaryVideo->info.addr.pci.domain != 0 ||
- primaryVideo->info.addr.pci.bus != 0 ||
- primaryVideo->info.addr.pci.slot != 1 ||
- primaryVideo->info.addr.pci.function != 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Primary video card must have PCI address
0:0:1.0"));
- return -1;
- }
- /* If TYPE == PCI, then qemuDomainCollectPCIAddress() function
- * has already reserved the address, so we must skip */
- }
- } else if (addrs->nbuses && !qemuDeviceVideoUsable) {
- memset(&tmp_addr, 0, sizeof(tmp_addr));
- tmp_addr.slot = 1;
-
- if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
- VIR_DEBUG("PCI address 0:0:1.0 in use, future addition of a video"
- " device will not be possible without manual"
- " intervention");
- virResetLastError();
- } else if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0)
{
- return -1;
}
}
@@ -2052,7 +2020,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
static int
qemuDomainValidateDevicePCISlotsChipsets(virDomainDefPtr def,
- virQEMUCapsPtr qemuCaps,
+ virQEMUCapsPtr qemuCaps G_GNUC_UNUSED,
virDomainPCIAddressSetPtr addrs)
{
if (qemuDomainIsI440FX(def) &&
@@ -2061,7 +2029,7 @@ qemuDomainValidateDevicePCISlotsChipsets(virDomainDefPtr def,
}
if (qemuDomainIsQ35(def) &&
- qemuDomainValidateDevicePCISlotsQ35(def, qemuCaps, addrs) < 0) {
+ qemuDomainValidateDevicePCISlotsQ35(def, addrs) < 0) {
return -1;
}
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 36/43] qemuDomainValidateDevicePCISlotsChipsets: Remove unused @qemuCaps
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain_address.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 308b23676d..291878931a 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -2020,7 +2020,6 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
static int
qemuDomainValidateDevicePCISlotsChipsets(virDomainDefPtr def,
- virQEMUCapsPtr qemuCaps G_GNUC_UNUSED,
virDomainPCIAddressSetPtr addrs)
{
if (qemuDomainIsI440FX(def) &&
@@ -2602,8 +2601,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
if (!(addrs = qemuDomainPCIAddressSetCreate(def, qemuCaps, nbuses, true)))
goto cleanup;
- if (qemuDomainValidateDevicePCISlotsChipsets(def, qemuCaps,
- addrs) < 0)
+ if (qemuDomainValidateDevicePCISlotsChipsets(def, addrs) < 0)
goto cleanup;
/* For domains that have pci-root, reserve 1 extra slot for a
@@ -2738,8 +2736,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
goto cleanup;
if (qemuDomainSupportsPCI(def, qemuCaps)) {
- if (qemuDomainValidateDevicePCISlotsChipsets(def, qemuCaps,
- addrs) < 0)
+ if (qemuDomainValidateDevicePCISlotsChipsets(def, addrs) < 0)
goto cleanup;
if (qemuDomainAssignDevicePCISlots(def, qemuCaps, addrs) < 0)
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 37/43] qemu: capabilities: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
38 files changed, 1 insertion(+), 38 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index af0bb398e4..1372ce5d13 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5048,7 +5048,6 @@ void
virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
{
/* Following caps were asserted by a version check for pre 2.11 qemus */
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b521383f7b..68ff607da2 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -215,7 +215,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 120 */
QEMU_CAPS_DEVICE_VMWARE_SVGA, /* -device vmware-svga */
- QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video device */
+ X_QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video device */
QEMU_CAPS_DEVICE_SCLPCONSOLE, /* -device sclpconsole */
QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */
X_QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 5424d9e10d..8fb24b58f4 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -18,7 +18,6 @@
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
- <flag name='device-video-primary'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 53da19ab37..1e8b7b950f 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index f9d85560b6..bfbd1eccba 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -33,7 +33,6 @@
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index adda67292e..f41264d274 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -32,7 +32,6 @@
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 348c4a0137..0de8c91d51 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -18,7 +18,6 @@
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
- <flag name='device-video-primary'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index fa6f941ef1..d8d9f84654 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 58c9bf5911..382067ba05 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -32,7 +32,6 @@
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 7cf5783af7..69a78550ac 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -11,7 +11,6 @@
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
- <flag name='device-video-primary'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index b5f6ce92cb..1f2fa2a141 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -11,7 +11,6 @@
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
- <flag name='device-video-primary'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index c9dc855dda..c00d3304ae 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -20,7 +20,6 @@
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
- <flag name='device-video-primary'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 7bc384aa47..d93e0eb17b 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index fc47a03ec5..7416a4d589 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -33,7 +33,6 @@
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 162b7d01d3..1c95e13119 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 8f8d09eda0..d78db3a291 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -35,7 +35,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index cff1446571..b1773a0244 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -34,7 +34,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index fe66c3d8d2..3fc54c3855 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -38,7 +38,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 38cc9c4de3..797ce0d9c4 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -38,7 +38,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 69b2106043..99e152a719 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -20,7 +20,6 @@
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
- <flag name='device-video-primary'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 8df0bf7192..0a8c2fcd55 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 13a7053940..6633170f4b 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index eeeb27797b..8b0decc29d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -35,7 +35,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index ddbd2c7433..d50f1fb3db 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -34,7 +34,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 5be3113789..727977a845 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -20,7 +20,6 @@
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
- <flag name='device-video-primary'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 436cfe952b..dd8ad40665 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 68ccaf6219..0064270519 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -35,7 +35,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 9388de40d0..97b3b72d9f 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -34,7 +34,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 8df6622737..9ccd64d3bf 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -38,7 +38,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index b8a9ecf025..36f97a15d2 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 8f5d9a7565..3d0441e5f2 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -13,7 +13,6 @@
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
- <flag name='device-video-primary'/>
<flag name='nbd-server'/>
<flag name='rng-random'/>
<flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 86b87647a9..728c792a4d 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index d88f7c989a..7780b6757c 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -35,7 +35,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index c8978d8e23..2dd00e77b3 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -34,7 +34,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 1a903d830e..f7011ab79b 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -38,7 +38,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 675967ebbc..255cd99e26 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -20,7 +20,6 @@
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
- <flag name='device-video-primary'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 92c8688f31..80d9fa7598 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 754319fa48..7428f90592 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -44,7 +44,6 @@
<flag name='VGA'/>
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
- <flag name='device-video-primary'/>
<flag name='usb-serial'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 38/43] qemu: capabilities: Always assume QEMU_CAPS_QUERY_QMP_SCHEMA
All supported qemu versions have 'query-qmp-schema' so we can remove the
check whether it exists and all logic conntected to it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 36 -------------------
src/qemu/qemu_capabilities.h | 2 +-
.../caps_2.11.0.s390x.xml | 1 -
.../caps_2.11.0.x86_64.xml | 1 -
.../caps_2.12.0.aarch64.xml | 1 -
.../caps_2.12.0.ppc64.xml | 1 -
.../caps_2.12.0.s390x.xml | 1 -
.../caps_2.12.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
.../caps_3.0.0.riscv32.xml | 1 -
.../caps_3.0.0.riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 -
.../caps_3.0.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 -
.../caps_3.1.0.x86_64.xml | 1 -
.../caps_4.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 -
.../caps_4.0.0.riscv32.xml | 1 -
.../caps_4.0.0.riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 -
.../caps_4.0.0.x86_64.xml | 1 -
.../caps_4.1.0.x86_64.xml | 1 -
.../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 -
38 files changed, 1 insertion(+), 73 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 1372ce5d13..f1da65abd6 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1166,7 +1166,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
{ "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION },
{ "migrate-incoming", QEMU_CAPS_INCOMING_DEFER },
{ "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
- { "query-qmp-schema", QEMU_CAPS_QUERY_QMP_SCHEMA },
{ "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION },
{ "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS },
{ "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES },
@@ -2563,36 +2562,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
ncommands, commands);
virStringListFreeCount(commands, ncommands);
- /* Probe for active commit of qemu 2.1. We don't need to query directly
- * if we have QMP schema support */
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA) &&
- qemuMonitorSupportsActiveCommit(mon))
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_ACTIVE_COMMIT);
-
- return 0;
-}
-
-
-static int
-virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps,
- qemuMonitorPtr mon)
-{
- char **events = NULL;
- int nevents;
-
- /* we can probe events also from the QMP schema so we can skip this here */
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA))
- return 0;
-
- if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0)
- return -1;
-
- virQEMUCapsProcessStringFlags(qemuCaps,
- G_N_ELEMENTS(virQEMUCapsEvents),
- virQEMUCapsEvents,
- nevents, events);
- virStringListFreeCount(events, nevents);
-
return 0;
}
@@ -5239,9 +5208,6 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCapsPtr qemuCaps,
GHashTable *schema = NULL;
size_t i;
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA))
- return 0;
-
if (!(schemareply = qemuMonitorQueryQMPSchema(mon)))
return -1;
@@ -5333,8 +5299,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
type = virQEMUCapsGetVirtType(qemuCaps);
accel = virQEMUCapsGetAccel(qemuCaps, type);
- if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0)
- return -1;
if (virQEMUCapsProbeQMPObjectTypes(qemuCaps, mon) < 0)
return -1;
if (virQEMUCapsProbeQMPDeviceProperties(qemuCaps, mon) < 0)
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 68ff607da2..567c2842e4 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -380,7 +380,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH, /* -drive bps_max_length = and friends */
QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, /* -device ivshmem-plain */
QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL, /* -device ivshmem-doorbell */
- QEMU_CAPS_QUERY_QMP_SCHEMA, /* query-qmp-schema command */
+ X_QEMU_CAPS_QUERY_QMP_SCHEMA, /* query-qmp-schema command */
/* 240 */
QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level={0..9} */
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 8fb24b58f4..50414bb386 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -68,7 +68,6 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='drive-iotune-max-length'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 1e8b7b950f..12dfd4b259 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -135,7 +135,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index bfbd1eccba..f5a3916038 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -104,7 +104,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index f41264d274..dbc7fcf988 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -99,7 +99,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 0de8c91d51..da0c1222b0 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -68,7 +68,6 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='drive-iotune-max-length'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index d8d9f84654..5206d893a8 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -133,7 +133,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 382067ba05..77bac22242 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -98,7 +98,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 69a78550ac..35236caddf 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -55,7 +55,6 @@
<flag name='smm'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='drive-iotune-max-length'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 1f2fa2a141..9aad89f4f6 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -55,7 +55,6 @@
<flag name='smm'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='drive-iotune-max-length'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index c00d3304ae..dd2803141f 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -70,7 +70,6 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='drive-iotune-max-length'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index d93e0eb17b..52b1a11230 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -134,7 +134,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 7416a4d589..a963c2cf1c 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -99,7 +99,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 1c95e13119..18199e517e 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -134,7 +134,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index d78db3a291..2ca509eae7 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -106,7 +106,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index b1773a0244..2f68794682 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -104,7 +104,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 3fc54c3855..b2f2df4d1d 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -111,7 +111,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 797ce0d9c4..18effd78d6 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -111,7 +111,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 99e152a719..04ee80166f 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -70,7 +70,6 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='drive-iotune-max-length'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 0a8c2fcd55..e89d55428a 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -133,7 +133,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 6633170f4b..bd8ca8a368 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -133,7 +133,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 8b0decc29d..54c704339b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -107,7 +107,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index d50f1fb3db..fa58c603b8 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -104,7 +104,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 727977a845..948a0b3fd9 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -70,7 +70,6 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='drive-iotune-max-length'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index dd8ad40665..774ffdf975 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -134,7 +134,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 0064270519..08fbd75e1a 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -109,7 +109,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 97b3b72d9f..335c0378b7 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -105,7 +105,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 9ccd64d3bf..2a6538545d 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -111,7 +111,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 36f97a15d2..b368406433 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -134,7 +134,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 3d0441e5f2..468f7e3397 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -50,7 +50,6 @@
<flag name='smm'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='drive-iotune-max-length'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='drive-iotune-group'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 728c792a4d..f6b028c3b5 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -134,7 +134,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 7780b6757c..3ec786cb88 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -108,7 +108,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 2dd00e77b3..03f4eb7ae7 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -104,7 +104,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index f7011ab79b..45e34d9c31 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -110,7 +110,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 255cd99e26..ad33b50796 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -69,7 +69,6 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='drive-iotune-max-length'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 80d9fa7598..2534ede341 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -134,7 +134,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 7428f90592..e8e74917bf 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -133,7 +133,6 @@
<flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
- <flag name='query-qmp-schema'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 39/43] qemu: monitor: Remove qemuMonitorGetEvents
Modern code uses QMP schema to query for supported event types.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor.c | 12 --------
src/qemu/qemu_monitor.h | 2 --
src/qemu/qemu_monitor_json.c | 57 ------------------------------------
src/qemu/qemu_monitor_json.h | 3 --
4 files changed, 74 deletions(-)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index fede34210d..f337f20140 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3830,18 +3830,6 @@ qemuMonitorGetCommands(qemuMonitorPtr mon,
}
-int
-qemuMonitorGetEvents(qemuMonitorPtr mon,
- char ***events)
-{
- VIR_DEBUG("events=%p", events);
-
- QEMU_CHECK_MONITOR(mon);
-
- return qemuMonitorJSONGetEvents(mon, events);
-}
-
-
GHashTable *
qemuMonitorGetCommandLineOptions(qemuMonitorPtr mon)
{
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 9106f966da..310635881d 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1274,8 +1274,6 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModelInfo *orig);
int qemuMonitorGetCommands(qemuMonitorPtr mon,
char ***commands);
-int qemuMonitorGetEvents(qemuMonitorPtr mon,
- char ***events);
GHashTable *qemuMonitorGetCommandLineOptions(qemuMonitorPtr mon);
int qemuMonitorGetKVMState(qemuMonitorPtr mon,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 0602d8e0dd..f7a84f86e6 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6274,63 +6274,6 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon,
}
-int qemuMonitorJSONGetEvents(qemuMonitorPtr mon,
- char ***events)
-{
- int ret = -1;
- virJSONValuePtr cmd;
- virJSONValuePtr reply = NULL;
- virJSONValuePtr data;
- char **eventlist = NULL;
- size_t n = 0;
- size_t i;
-
- *events = NULL;
-
- if (!(cmd = qemuMonitorJSONMakeCommand("query-events", NULL)))
- return -1;
-
- if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
- goto cleanup;
-
- if (qemuMonitorJSONHasError(reply, "CommandNotFound")) {
- ret = 0;
- goto cleanup;
- }
-
- if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0)
- goto cleanup;
-
- data = virJSONValueObjectGetArray(reply, "return");
- n = virJSONValueArraySize(data);
-
- /* null-terminated list */
- eventlist = g_new0(char *, n + 1);
-
- for (i = 0; i < n; i++) {
- virJSONValuePtr child = virJSONValueArrayGet(data, i);
- const char *tmp;
-
- if (!(tmp = virJSONValueObjectGetString(child, "name"))) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("query-events reply data was missing
'name'"));
- goto cleanup;
- }
-
- eventlist[i] = g_strdup(tmp);
- }
-
- ret = n;
- *events = g_steal_pointer(&eventlist);
-
- cleanup:
- g_strfreev(eventlist);
- virJSONValueFree(cmd);
- virJSONValueFree(reply);
- return ret;
-}
-
-
static int
qemuMonitorJSONGetCommandLineOptionsWorker(size_t pos G_GNUC_UNUSED,
virJSONValuePtr item,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 8d4232f67b..9e046df9fe 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -420,9 +420,6 @@ int qemuMonitorJSONGetCPUModelComparison(qemuMonitorPtr mon,
int qemuMonitorJSONGetCommands(qemuMonitorPtr mon,
char ***commands)
ATTRIBUTE_NONNULL(2);
-int qemuMonitorJSONGetEvents(qemuMonitorPtr mon,
- char ***events)
- ATTRIBUTE_NONNULL(2);
GHashTable *qemuMonitorJSONGetCommandLineOptions(qemuMonitorPtr mon);
int qemuMonitorJSONGetKVMState(qemuMonitorPtr mon,
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 40/43] qemu: monitor: Remove qemuMonitorSupportsActiveCommit
Modern code uses QMP schema to query for active commit support.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor.c | 11 ---------
src/qemu/qemu_monitor.h | 1 -
src/qemu/qemu_monitor_json.c | 33 ---------------------------
src/qemu/qemu_monitor_json.h | 3 ---
tests/qemumonitorjsontest.c | 44 ------------------------------------
5 files changed, 92 deletions(-)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index f337f20140..375c56ca9f 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3280,17 +3280,6 @@ qemuMonitorBlockCommit(qemuMonitorPtr mon,
}
-/* Probe whether active commits are supported by a given qemu binary. */
-bool
-qemuMonitorSupportsActiveCommit(qemuMonitorPtr mon)
-{
- if (!mon)
- return false;
-
- return qemuMonitorJSONSupportsActiveCommit(mon);
-}
-
-
/* Determine the name that qemu is using for tracking the backing
* element TARGET within the chain starting at TOP. */
char *
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 310635881d..6cb04d6f76 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1067,7 +1067,6 @@ int qemuMonitorBlockCommit(qemuMonitorPtr mon,
const char *backingName,
unsigned long long bandwidth)
ATTRIBUTE_NONNULL(2);
-bool qemuMonitorSupportsActiveCommit(qemuMonitorPtr mon);
char *qemuMonitorDiskNameLookup(qemuMonitorPtr mon,
const char *device,
virStorageSourcePtr top,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index f7a84f86e6..0732e2dc1e 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4726,39 +4726,6 @@ qemuMonitorJSONTransaction(qemuMonitorPtr mon, virJSONValuePtr
*actions)
return ret;
}
-/* Probe if active commit is supported: pass in a bogus device and NULL top
- * and base. The probe return is true if active commit is detected or false
- * if not supported or on any error */
-bool
-qemuMonitorJSONSupportsActiveCommit(qemuMonitorPtr mon)
-{
- bool ret = false;
- virJSONValuePtr cmd;
- virJSONValuePtr reply = NULL;
-
- if (!(cmd = qemuMonitorJSONMakeCommand("block-commit",
"s:device",
- "bogus", NULL)))
- return false;
-
- if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
- goto cleanup;
-
- if (qemuMonitorJSONHasError(reply, "DeviceNotFound")) {
- VIR_DEBUG("block-commit supports active commit");
- ret = true;
- goto cleanup;
- }
-
- /* This is a false negative for qemu 2.0; but probably not
- * worth the additional complexity to worry about it */
- VIR_DEBUG("block-commit requires 'top' parameter, "
- "assuming it lacks active commit");
- cleanup:
- virJSONValueFree(cmd);
- virJSONValueFree(reply);
- return ret;
-}
-
/* speed is in bytes/sec. Returns 0 on success, -1 with error message
* emitted on failure. */
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 9e046df9fe..91a8ef9878 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -276,9 +276,6 @@ int qemuMonitorJSONDrivePivot(qemuMonitorPtr mon,
const char *jobname)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-bool qemuMonitorJSONSupportsActiveCommit(qemuMonitorPtr mon)
- ATTRIBUTE_NONNULL(1);
-
int qemuMonitorJSONBlockCommit(qemuMonitorPtr mon,
const char *device,
const char *jobname,
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 48b41c908a..184c608e5c 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2146,49 +2146,6 @@ testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime(const void
*opaque)
return 0;
}
-static int
-testQemuMonitorJSONqemuMonitorSupportsActiveCommit(const void *opaque)
-{
- const testGenericData *data = opaque;
- virDomainXMLOptionPtr xmlopt = data->xmlopt;
- const char *error1 =
- "{"
- " \"error\": {"
- " \"class\": \"DeviceNotFound\","
- " \"desc\": \"Device 'bogus' not
found\""
- " }"
- "}";
- const char *error2 =
- "{"
- " \"error\": {"
- " \"class\": \"GenericError\","
- " \"desc\": \"Parameter 'top' is
missing\""
- " }"
- "}";
- g_autoptr(qemuMonitorTest) test = NULL;
-
- if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
- return -1;
-
- if (qemuMonitorTestAddItemParams(test, "block-commit", error1,
- "device",
"\"bogus\"",
- NULL, NULL) < 0)
- return -1;
-
- if (!qemuMonitorSupportsActiveCommit(qemuMonitorTestGetMonitor(test)))
- return -1;
-
- if (qemuMonitorTestAddItemParams(test, "block-commit", error2,
- "device",
"\"bogus\"",
- NULL, NULL) < 0)
- return -1;
-
- if (qemuMonitorSupportsActiveCommit(qemuMonitorTestGetMonitor(test)))
- return -1;
-
- return 0;
-}
-
static int
testQemuMonitorJSONqemuMonitorJSONGetDumpGuestMemoryCapability(const void *opaque)
{
@@ -3137,7 +3094,6 @@ mymain(void)
DO_TEST(qemuMonitorJSONSendKey);
DO_TEST(qemuMonitorJSONGetDumpGuestMemoryCapability);
DO_TEST(qemuMonitorJSONSendKeyHoldtime);
- DO_TEST(qemuMonitorSupportsActiveCommit);
DO_TEST(qemuMonitorJSONNBDServerStart);
DO_TEST_CPU_DATA("host");
--
2.30.2
9:57 a.m.
New subject: [RFC PATCH 41/43] tests: qemucapabilitiesdata: Fix formatting of manually added hunk
Commit 66c5674e797 added a query for the device properties of 'usb-host'
but the command header isn't formated the same way as if it were
autogenerated. Reformat all the files.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies | 10 +++++-----
.../qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 11 +++++------
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies | 10 +++++-----
29 files changed, 145 insertions(+), 146 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index 44af322589..42846d9169 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -3539,11 +3539,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-29"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-29"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
index 3cd255584e..ecd76ee2f6 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@@ -4585,11 +4585,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-36"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-36"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index 9a6bc9465f..3e7ccb2deb 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -5362,11 +5362,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-30"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-30"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index 2cce753407..d2bfae379d 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -5266,11 +5266,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-30"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-30"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 1a043d80c3..b9b6b7be37 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -3626,11 +3626,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-29"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-29"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 94dba58d95..9bdf1b43b1 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -4752,11 +4752,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-36"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-36"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
index 01e4dc6acf..7f4c8ec4ef 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@@ -5350,11 +5350,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-30"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-30"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
index ce4ca95602..d14be523a9 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
@@ -1540,11 +1540,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-25"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-25"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
index fa04d448d4..50077adaec 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
@@ -1540,11 +1540,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-25"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-25"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
index 4fb761a90c..2c595faa31 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
@@ -3784,11 +3784,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-30"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-30"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index e42971ceeb..07a77aadac 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -4775,7 +4775,6 @@
"id": "libvirt-34"
}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -4887,11 +4886,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-36"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-36"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
index 2c50759c4d..ea06af79af 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
@@ -5404,11 +5404,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-30"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-30"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
index 5688c7bb09..daabae257a 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
@@ -4929,11 +4929,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-36"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-36"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
index 3ecddb8b5a..92e3b2c7b2 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
@@ -5829,11 +5829,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-31"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-31"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
index d11d901976..9cef964a34 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
@@ -5884,11 +5884,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-32"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-32"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
index 58550d12c1..08442da7d9 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
@@ -4003,11 +4003,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-32"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-32"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
index f16901c5b7..489463b6de 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
@@ -4003,11 +4003,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-32"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-32"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
index b3c900cde9..22abe0a334 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
@@ -4058,11 +4058,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-30"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-30"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
index f944924bf9..2c28d39d1d 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
@@ -5154,11 +5154,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-36"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-36"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
index c2a9ecde7b..6e02eb5dd5 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
@@ -5447,11 +5447,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-36"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-36"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index e488270c0c..8ef2825b63 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -6201,11 +6201,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-31"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-31"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
index b3db60a972..dede84fc20 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
@@ -6006,11 +6006,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-32"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-32"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
index 94d2659f9d..eedce1151c 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
@@ -4320,11 +4320,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-30"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-30"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
index 550c5f06b5..38ead16084 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
@@ -5687,11 +5687,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-36"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-36"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
index 529a95167d..e14ca08d19 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
@@ -6690,11 +6690,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-31"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-31"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
index 91bd0e9002..7962e216cd 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
@@ -6687,11 +6687,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-33"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-33"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
index 2c21e057bd..8a67d2a20d 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
@@ -4666,11 +4666,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-32"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-32"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
index d5aa3ee2cc..f75ecb51b5 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
@@ -6175,11 +6175,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-36"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-36"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
index 2d602e67b1..3843be273d 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
@@ -6288,11 +6288,11 @@
}
{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-36"
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "usb-host"
+ },
+ "id": "libvirt-36"
}
{
--
2.30.2
10:44 a.m.
New subject: [RFC PATCH 41/43] tests: qemucapabilitiesdata: Fix formatting of manually added hunk
On a Friday in 2021, Peter Krempa wrote:
Commit 66c5674e797 added a query for the device properties of
'usb-host'
but the command header isn't formated the same way as if it were
autogenerated. Reformat all the files.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies | 10 +++++-----
.../qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 11 +++++------
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies | 10 +++++-----
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies | 10 +++++-----
29 files changed, 145 insertions(+), 146 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Push-before: 2021 May 7
Jano
9:57 a.m.
New subject: [RFC PATCH 42/43] tests: qemucapabilitiesdata: Fix wrong command identifier in caps_4.0.0.riscv64.replies
Commit cbd4ab4cc69 added a hunk with a broken reply ID.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
index 489463b6de..e3c5dea531 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
@@ -3999,7 +3999,7 @@
"type": "size"
}
],
- "id": "libvirt-31a"
+ "id": "libvirt-31"
}
{
--
2.30.2
10:45 a.m.
New subject: [RFC PATCH 42/43] tests: qemucapabilitiesdata: Fix wrong command identifier in caps_4.0.0.riscv64.replies
On a Friday in 2021, Peter Krempa wrote:
Commit cbd4ab4cc69 added a hunk with a broken reply ID.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Push-before: 2021 May 7
Jano
9:57 a.m.
New subject: [RFC PATCH 43/43] qemu: capabilities: Probe QMP schema before probing commands
All supported QEMU versions now support query-qmp-schema. In the future
it will be possible to use the output of query-qmp-schema to also detect
commands reliably.
Since we are at the point where we have the least amount of .replies
files needing changing for a long time, move the 'query-qmp-schema' bits
before 'query-commands' to prepare for the future.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 4 +-
.../caps_2.11.0.s390x.replies | 24402 ++++----
.../caps_2.11.0.x86_64.replies | 25714 ++++-----
.../caps_2.12.0.aarch64.replies | 29184 +++++-----
.../caps_2.12.0.ppc64.replies | 31498 +++++------
.../caps_2.12.0.s390x.replies | 27150 ++++-----
.../caps_2.12.0.x86_64.replies | 30348 +++++-----
.../caps_3.0.0.ppc64.replies | 32840 +++++------
.../caps_3.0.0.riscv32.replies | 21708 ++++----
.../caps_3.0.0.riscv64.replies | 21708 ++++----
.../caps_3.0.0.s390x.replies | 28078 +++++-----
.../caps_3.0.0.x86_64.replies | 31462 +++++------
.../caps_3.1.0.ppc64.replies | 32540 +++++------
.../caps_3.1.0.x86_64.replies | 32302 +++++------
.../caps_4.0.0.aarch64.replies | 31300 +++++------
.../caps_4.0.0.ppc64.replies | 33522 +++++------
.../caps_4.0.0.riscv32.replies | 29066 +++++-----
.../caps_4.0.0.riscv64.replies | 29066 +++++-----
.../caps_4.0.0.s390x.replies | 29544 +++++-----
.../caps_4.0.0.x86_64.replies | 32926 +++++------
.../caps_4.1.0.x86_64.replies | 34448 ++++++------
.../caps_4.2.0.aarch64.replies | 33728 ++++++------
.../caps_4.2.0.ppc64.replies | 34230 ++++++------
.../caps_4.2.0.s390x.replies | 31044 +++++------
.../caps_4.2.0.x86_64.replies | 37040 ++++++-------
.../caps_5.0.0.aarch64.replies | 36328 ++++++------
.../caps_5.0.0.ppc64.replies | 37728 ++++++-------
.../caps_5.0.0.riscv64.replies | 32792 +++++------
.../caps_5.0.0.x86_64.replies | 39754 +++++++-------
.../caps_5.1.0.sparc.replies | 25244 ++++-----
.../caps_5.1.0.x86_64.replies | 41046 +++++++-------
.../caps_5.2.0.aarch64.replies | 38490 ++++++-------
.../caps_5.2.0.ppc64.replies | 40514 +++++++-------
.../caps_5.2.0.riscv64.replies | 34452 ++++++------
.../caps_5.2.0.s390x.replies | 35480 ++++++------
.../caps_5.2.0.x86_64.replies | 42432 +++++++-------
.../caps_6.0.0.x86_64.replies | 45838 ++++++++--------
37 files changed, 587475 insertions(+), 587475 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f1da65abd6..8b4c24b6ed 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5289,6 +5289,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
/* initiate all capabilities based on qemu version */
virQEMUCapsInitQMPVersionCaps(qemuCaps);
+ if (virQEMUCapsProbeQMPSchemaCapabilities(qemuCaps, mon) < 0)
+ return -1;
if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0)
return -1;
@@ -5317,8 +5319,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
return -1;
if (virQEMUCapsProbeQMPMigrationCapabilities(qemuCaps, mon) < 0)
return -1;
- if (virQEMUCapsProbeQMPSchemaCapabilities(qemuCaps, mon) < 0)
- return -1;
if (virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0)
return -1;
if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0)
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index 42846d9169..5eeeb42d19 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -39,15284 +39,15284 @@
}
{
- "execute": "query-commands",
+ "execute": "query-qmp-schema",
"id": "libvirt-4"
}
[truncated - original patch was 27MiB]
7:35 a.m.
On Fri, Apr 09, 2021 at 04:56:36PM +0200, Peter Krempa wrote:
May 7, 2021 is the 2nd anniversary of release of rhel-8, which means
we
no longer have to support qemu-1.5.
Remove the capabilities and test data for the versions we no longer care
about and clean up some capabilities related stuff:
- remove code for QEMU_CAPS_DEVICE_VIDEO_PRIMARY
- remove checking for QEMU_CAPS_QUERY_QMP_SCHEMA since all versions now
support it
This is also a good opportunity to clean up few things regarding the
capabilties test data, namely call 'query-qmp-schema' before
'query-commands' to prepare to retire query-commands.
This series is heavily truncated since there were massive (27MiB)
patches resulting from some of the mechanical (and generated) changes
and also depends on my previous command line wrapping cleanup.
Fetch the full version at:
git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-deprec-2
The cleanups in patches 41, 42, and the massive move of commands in
patch 43 was done using a tool based on pieces of our code which I've
uploaded to:
https://gitlab.com/pipo.sk/libvirt/-/commits/qemu-capabilities-tool
The tool may come in handy for other things too in the future as it
allows programatic modification of the capability replies files.
Peter Krempa (43):
docs/platforms: Drop separate link to qemu-kvm on repology.org
qemuxml2xmltest: testInfoSetPaths: Remove return value
qemuxml2(argv|xml)test: Don't exit early when testQemuInfoSetArgs
fails
qemu: Formally deprecate support for qemu < 2.11
NEWS: Mention that minimum supported qemu version was bumped to 2.11
qemuxml2argvtest: Remove versioned tests for qemu < 2.11
[fixup] qemuxml2argvdata: Remove unused output files
qemuxml2xmltest: Remove versioned tests for qemu < 2.11
[fixup] qemuxml2xmldata: Remove unused output files
qemucapabilitiesdata: Drop capability test data for qemu < 2.11
virQEMUCapsHasPCIMultiBus: Remove logic for PPC multibus support check
qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument
qemuBuildDeviceAddressStr: Remove unused 'qemuCaps'
virQEMUCapsInitProcessCaps: Remove obsolete version checks
virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks
virQEMUCapsInitQMPBasicArch: Use switch for arch-based decisions
qemuxml2argvtest: Rewrite parsing of XMLs to provide earlier parsing
qemuxml2argvtest: Parse 'arch' from XML early
qemuxml2xmltest: Always include basic set of capabilities
qemu: capabilities: Move setting of QEMU_CAPS_CPU_AARCH64_OFF to
virQEMUCapsInitQMPBasicArch
qemuxml2argvtest: Remove negative test case
'pseries-features-htp-resize'
qemu: capabilities: Move setting of PPC specific flags to
virQEMUCapsInitQMPBasicArch
qemuxml2argvtest: Remove negative test for gic v3/host
qemu: capabilities: Move setting of QEMU_CAPS_MACH_VIRT_GIC_VERSION to
virQEMUCapsInitQMPBasicArch
qemuxml2argvtest: Remove negative test case for 'net-vhostuser-multiq'
qemuxml2argvtest: Remove tests for absence of
QEMU_CAPS_DEVICE_VIDEO_PRIMARY
qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to
virQEMUCapsInitQMPBasicArch
[fixup] Fix test fallout in tests/qemuxml2argvdata
[fixup] Fix test fallout in tests/qemuxml2xmloutdata
qemuxml2(argv|xml)test: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY from
tests
qemu: capabilities: Move rest of always present caps to
virQEMUCapsInitQMPArch
qemuhotplugtest: Add also always-present capabilities
qemu: command: Remove legacy '-vga' commandline formatter
qemu_domain_address: Drop compatibility with pre-device vga
specification for i440fx
qemu_domain_address: Drop compatibility with pre-device vga
specification for q35
qemuDomainValidateDevicePCISlotsChipsets: Remove unused @qemuCaps
qemu: capabilities: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY
qemu: capabilities: Always assume QEMU_CAPS_QUERY_QMP_SCHEMA
qemu: monitor: Remove qemuMonitorGetEvents
qemu: monitor: Remove qemuMonitorSupportsActiveCommit
tests: qemucapabilitiesdata: Fix formatting of manually added hunk
tests: qemucapabilitiesdata: Fix wrong command identifier in
caps_4.0.0.riscv64.replies
qemu: capabilities: Probe QMP schema before probing commands
Some of the patches can be pushed now as they are not removing support
for any older QEMUs.
The QEMU deprecation patches looks good as well. With all the fixup
squashed to the respective patches:
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
9:42 a.m.
On Fri, Apr 9, 2021 at 11:00 AM Peter Krempa <pkrempa(a)redhat.com> wrote:
May 7, 2021 is the 2nd anniversary of release of rhel-8, which means we
no longer have to support qemu-1.5.
Remove the capabilities and test data for the versions we no longer care
about and clean up some capabilities related stuff:
- remove code for QEMU_CAPS_DEVICE_VIDEO_PRIMARY
- remove checking for QEMU_CAPS_QUERY_QMP_SCHEMA since all versions now
support it
This is also a good opportunity to clean up few things regarding the
capabilties test data, namely call 'query-qmp-schema' before
'query-commands' to prepare to retire query-commands.
This series is heavily truncated since there were massive (27MiB)
patches resulting from some of the mechanical (and generated) changes
and also depends on my previous command line wrapping cleanup.
Fetch the full version at:
git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-deprec-2
The cleanups in patches 41, 42, and the massive move of commands in
patch 43 was done using a tool based on pieces of our code which I've
uploaded to:
https://gitlab.com/pipo.sk/libvirt/-/commits/qemu-capabilities-tool
The tool may come in handy for other things too in the future as it
allows programatic modification of the capability replies files.
Peter Krempa (43):
docs/platforms: Drop separate link to qemu-kvm on repology.org
qemuxml2xmltest: testInfoSetPaths: Remove return value
qemuxml2(argv|xml)test: Don't exit early when testQemuInfoSetArgs
fails
qemu: Formally deprecate support for qemu < 2.11
NEWS: Mention that minimum supported qemu version was bumped to 2.11
qemuxml2argvtest: Remove versioned tests for qemu < 2.11
[fixup] qemuxml2argvdata: Remove unused output files
qemuxml2xmltest: Remove versioned tests for qemu < 2.11
[fixup] qemuxml2xmldata: Remove unused output files
qemucapabilitiesdata: Drop capability test data for qemu < 2.11
virQEMUCapsHasPCIMultiBus: Remove logic for PPC multibus support check
qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument
qemuBuildDeviceAddressStr: Remove unused 'qemuCaps'
virQEMUCapsInitProcessCaps: Remove obsolete version checks
virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks
virQEMUCapsInitQMPBasicArch: Use switch for arch-based decisions
qemuxml2argvtest: Rewrite parsing of XMLs to provide earlier parsing
qemuxml2argvtest: Parse 'arch' from XML early
qemuxml2xmltest: Always include basic set of capabilities
qemu: capabilities: Move setting of QEMU_CAPS_CPU_AARCH64_OFF to
virQEMUCapsInitQMPBasicArch
qemuxml2argvtest: Remove negative test case
'pseries-features-htp-resize'
qemu: capabilities: Move setting of PPC specific flags to
virQEMUCapsInitQMPBasicArch
qemuxml2argvtest: Remove negative test for gic v3/host
qemu: capabilities: Move setting of QEMU_CAPS_MACH_VIRT_GIC_VERSION to
virQEMUCapsInitQMPBasicArch
qemuxml2argvtest: Remove negative test case for 'net-vhostuser-multiq'
qemuxml2argvtest: Remove tests for absence of
QEMU_CAPS_DEVICE_VIDEO_PRIMARY
qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to
virQEMUCapsInitQMPBasicArch
[fixup] Fix test fallout in tests/qemuxml2argvdata
[fixup] Fix test fallout in tests/qemuxml2xmloutdata
qemuxml2(argv|xml)test: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY from
tests
qemu: capabilities: Move rest of always present caps to
virQEMUCapsInitQMPArch
qemuhotplugtest: Add also always-present capabilities
qemu: command: Remove legacy '-vga' commandline formatter
qemu_domain_address: Drop compatibility with pre-device vga
specification for i440fx
qemu_domain_address: Drop compatibility with pre-device vga
specification for q35
qemuDomainValidateDevicePCISlotsChipsets: Remove unused @qemuCaps
qemu: capabilities: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY
qemu: capabilities: Always assume QEMU_CAPS_QUERY_QMP_SCHEMA
qemu: monitor: Remove qemuMonitorGetEvents
qemu: monitor: Remove qemuMonitorSupportsActiveCommit
tests: qemucapabilitiesdata: Fix formatting of manually added hunk
tests: qemucapabilitiesdata: Fix wrong command identifier in
caps_4.0.0.riscv64.replies
qemu: capabilities: Probe QMP schema before probing commands
NEWS.rst | 7 +
docs/drvqemu.rst | 2 +-
docs/platforms.rst | 2 -
src/qemu/qemu_alias.c | 5 +-
src/qemu/qemu_alias.h | 1 -
src/qemu/qemu_capabilities.c | 237 +-
src/qemu/qemu_capabilities.h | 7 +-
src/qemu/qemu_command.c | 190 +-
src/qemu/qemu_domain_address.c | 82 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_monitor.c | 23 -
src/qemu/qemu_monitor.h | 3 -
src/qemu/qemu_monitor_json.c | 90 -
src/qemu/qemu_monitor_json.h | 6 -
.../caps_1.5.3.x86_64.replies | 3327 --
.../caps_1.5.3.x86_64.xml | 176 -
.../caps_1.6.0.x86_64.replies | 3298 --
.../caps_1.6.0.x86_64.xml | 185 -
.../caps_1.7.0.x86_64.replies | 3521 --
.../caps_1.7.0.x86_64.xml | 191 -
.../caps_2.1.1.x86_64.replies | 4041 --
.../caps_2.1.1.x86_64.xml | 217 -
.../caps_2.10.0.aarch64.replies | 16975 ------
.../caps_2.10.0.aarch64.xml | 325 -
.../caps_2.10.0.ppc64.replies | 20756 -------
.../caps_2.10.0.ppc64.xml | 1067 -
.../caps_2.10.0.s390x.replies | 16608 ------
.../caps_2.10.0.s390x.xml | 1277 -
.../caps_2.10.0.x86_64.replies | 19329 -------
.../caps_2.10.0.x86_64.xml | 997 -
.../caps_2.11.0.s390x.replies | 24392 ++++----
.../caps_2.11.0.s390x.xml | 3 -
.../caps_2.11.0.x86_64.replies | 25712 ++++-----
.../caps_2.11.0.x86_64.xml | 3 -
.../caps_2.12.0.aarch64.replies | 29188 +++++-----
.../caps_2.12.0.aarch64.xml | 2 -
.../caps_2.12.0.ppc64.replies | 31502 +++++------
.../caps_2.12.0.ppc64.xml | 3 -
.../caps_2.12.0.s390x.replies | 27224 ++++-----
.../caps_2.12.0.s390x.xml | 3 -
.../caps_2.12.0.x86_64.replies | 30352 +++++-----
.../caps_2.12.0.x86_64.xml | 3 -
.../caps_2.4.0.x86_64.replies | 4868 --
.../caps_2.4.0.x86_64.xml | 263 -
.../caps_2.5.0.x86_64.replies | 12506 -----
.../caps_2.5.0.x86_64.xml | 273 -
.../caps_2.6.0.aarch64.replies | 13317 -----
.../caps_2.6.0.aarch64.xml | 283 -
.../caps_2.6.0.ppc64.replies | 15692 ------
.../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1026 -
.../caps_2.6.0.x86_64.replies | 13061 -----
.../caps_2.6.0.x86_64.xml | 273 -
.../caps_2.7.0.s390x.replies | 12137 ----
.../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 113 -
.../caps_2.7.0.x86_64.replies | 13680 -----
.../caps_2.7.0.x86_64.xml | 284 -
.../caps_2.8.0.s390x.replies | 13553 -----
.../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 265 -
.../caps_2.8.0.x86_64.replies | 14594 -----
.../caps_2.8.0.x86_64.xml | 419 -
.../caps_2.9.0.ppc64.replies | 19514 -------
.../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1056 -
.../caps_2.9.0.s390x.replies | 14607 -----
.../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 273 -
.../caps_2.9.0.x86_64.replies | 18290 ------
.../caps_2.9.0.x86_64.xml | 910 -
.../caps_3.0.0.ppc64.replies | 32872 +++++------
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 -
.../caps_3.0.0.riscv32.replies | 21760 ++++----
.../caps_3.0.0.riscv32.xml | 3 -
.../caps_3.0.0.riscv64.replies | 21760 ++++----
.../caps_3.0.0.riscv64.xml | 3 -
.../caps_3.0.0.s390x.replies | 28066 +++++-----
.../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 3 -
.../caps_3.0.0.x86_64.replies | 31463 ++++++-----
.../caps_3.0.0.x86_64.xml | 3 -
.../caps_3.1.0.ppc64.replies | 32440 +++++------
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 3 -
.../caps_3.1.0.x86_64.replies | 32304 +++++------
.../caps_3.1.0.x86_64.xml | 3 -
.../caps_4.0.0.aarch64.replies | 31294 +++++------
.../caps_4.0.0.aarch64.xml | 2 -
.../caps_4.0.0.ppc64.replies | 33422 +++++------
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 3 -
.../caps_4.0.0.riscv32.replies | 29062 +++++-----
.../caps_4.0.0.riscv32.xml | 3 -
.../caps_4.0.0.riscv64.replies | 29062 +++++-----
.../caps_4.0.0.riscv64.xml | 3 -
.../caps_4.0.0.s390x.replies | 29542 +++++-----
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 3 -
.../caps_4.0.0.x86_64.replies | 32932 +++++------
.../caps_4.0.0.x86_64.xml | 3 -
.../caps_4.1.0.x86_64.replies | 34454 ++++++------
.../caps_4.1.0.x86_64.xml | 3 -
.../caps_4.2.0.aarch64.replies | 33732 ++++++------
.../caps_4.2.0.aarch64.xml | 2 -
.../caps_4.2.0.ppc64.replies | 34230 ++++++------
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 3 -
.../caps_4.2.0.s390x.replies | 31044 +++++------
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 3 -
.../caps_4.2.0.x86_64.replies | 36818 ++++++-------
.../caps_4.2.0.x86_64.xml | 3 -
.../caps_5.0.0.aarch64.replies | 36336 ++++++------
.../caps_5.0.0.aarch64.xml | 2 -
.../caps_5.0.0.ppc64.replies | 37738 ++++++-------
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 3 -
.../caps_5.0.0.riscv64.replies | 32784 +++++------
.../caps_5.0.0.riscv64.xml | 3 -
.../caps_5.0.0.x86_64.replies | 39726 ++++++-------
.../caps_5.0.0.x86_64.xml | 3 -
.../caps_5.1.0.sparc.replies | 25244 ++++-----
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 3 -
.../caps_5.1.0.x86_64.replies | 41066 +++++++-------
.../caps_5.1.0.x86_64.xml | 3 -
.../caps_5.2.0.aarch64.replies | 38490 ++++++-------
.../caps_5.2.0.aarch64.xml | 2 -
.../caps_5.2.0.ppc64.replies | 40514 +++++++-------
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 3 -
.../caps_5.2.0.riscv64.replies | 34452 ++++++------
.../caps_5.2.0.riscv64.xml | 3 -
.../caps_5.2.0.s390x.replies | 35480 ++++++------
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 3 -
.../caps_5.2.0.x86_64.replies | 42432 +++++++-------
.../caps_5.2.0.x86_64.xml | 3 -
.../caps_6.0.0.x86_64.replies | 45838 ++++++++--------
.../caps_6.0.0.x86_64.xml | 3 -
tests/qemuhotplugtest.c | 5 +
.../ppc64-modern-bulk-result-conf.xml | 2 +-
.../ppc64-modern-bulk-result-live.xml | 2 +-
.../ppc64-modern-individual-result-conf.xml | 2 +-
.../ppc64-modern-individual-result-live.xml | 2 +-
.../x86-modern-bulk-result-conf.xml | 2 +-
.../x86-modern-bulk-result-live.xml | 2 +-
.../x86-modern-individual-add-result-conf.xml | 2 +-
.../x86-modern-individual-add-result-live.xml | 2 +-
.../x86-old-bulk-result-conf.xml | 2 +-
.../x86-old-bulk-result-live.xml | 2 +-
.../qemuhotplug-ivshmem-doorbell-detach.xml | 2 +-
.../qemuhotplug-ivshmem-plain-detach.xml | 2 +-
.../qemuhotplug-watchdog-full.xml | 2 +-
.../qemuhotplug-watchdog-user-alias-full.xml | 2 +-
.../qemuhotplug-base-live+disk-virtio.xml | 2 +-
.../qemuhotplug-base-live+hostdev-pci.xml | 2 +-
.../qemuhotplug-base-live+interface-vdpa.xml | 2 +-
...qemuhotplug-base-live+ivshmem-doorbell.xml | 4 +-
.../qemuhotplug-base-live+ivshmem-plain.xml | 2 +-
...uhotplug-base-live+watchdog-user-alias.xml | 2 +-
.../qemuhotplug-base-live+watchdog.xml | 2 +-
...hotplug-base-with-scsi-controller-live.xml | 8 +-
...thout-scsi-controller-live+disk-scsi-2.xml | 8 +-
tests/qemumonitorjsontest.c | 44 -
.../aarch64-aavmf-virtio-mmio.args | 2 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +-
.../aarch64-cpu-passthrough.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-host.err | 1 -
tests/qemuxml2argvdata/aarch64-gic-v3.err | 1 -
.../aarch64-noacpi-nouefi.args | 2 +-
.../qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +-
.../qemuxml2argvdata/aarch64-pci-serial.args | 2 +-
.../aarch64-traditional-pci.args | 2 +-
.../aarch64-usb-controller-nec-xhci.args | 2 +-
.../aarch64-usb-controller-qemu-xhci.args | 2 +-
.../aarch64-video-default.args | 2 +-
.../aarch64-video-virtio-gpu-pci.args | 2 +-
.../aarch64-virt-2.6-virtio-pci-default.args | 2 +-
.../aarch64-virt-default-nic.args | 2 +-
.../qemuxml2argvdata/aarch64-virt-virtio.args | 2 +-
.../aarch64-virtio-pci-default.args | 2 +-
.../aarch64-virtio-pci-manual-addresses.args | 2 +-
tests/qemuxml2argvdata/audio-default-sdl.args | 2 +-
.../qemuxml2argvdata/audio-default-spice.args | 2 +-
tests/qemuxml2argvdata/audio-default-vnc.args | 2 +-
tests/qemuxml2argvdata/autoindex.args | 2 +-
.../qemuxml2argvdata/balloon-device-auto.args | 2 +-
.../balloon-mmio-deflate.args | 2 +-
tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +-
tests/qemuxml2argvdata/bios-nvram.args | 2 +-
tests/qemuxml2argvdata/bios.args | 2 +-
tests/qemuxml2argvdata/blkiotune-device.args | 2 +-
tests/qemuxml2argvdata/blkiotune.args | 2 +-
tests/qemuxml2argvdata/boot-complex.args | 8 +-
.../boot-menu-disable-drive.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable.args | 2 +-
.../boot-menu-enable-with-timeout.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable.args | 2 +-
tests/qemuxml2argvdata/boot-multi.args | 2 +-
tests/qemuxml2argvdata/boot-order.args | 6 +-
tests/qemuxml2argvdata/boot-strict.args | 8 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 2 +-
.../channel-unix-guestfwd.x86_64-2.5.0.args | 33 -
.../qemuxml2argvdata/channel-virtio-auto.args | 6 +-
.../channel-virtio-autoadd.args | 6 +-
.../channel-virtio-autoassign.args | 4 +-
.../channel-virtio-default.args | 4 +-
.../channel-virtio-state.args | 2 +-
.../qemuxml2argvdata/channel-virtio-unix.args | 2 +-
tests/qemuxml2argvdata/channel-virtio.args | 2 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 4 +-
tests/qemuxml2argvdata/clock-catchup.args | 2 +-
tests/qemuxml2argvdata/clock-france.args | 2 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 2 +-
.../clock-localtime-basis-localtime.args | 2 +-
.../clock-timer-hyperv-rtc.args | 2 +-
tests/qemuxml2argvdata/clock-variable.args | 2 +-
.../qemuxml2argvdata/console-compat-auto.args | 2 +-
.../console-compat-chardev.args | 2 +-
.../qemuxml2argvdata/console-virtio-many.args | 4 +-
.../console-virtio-unix.x86_64-2.5.0.args | 34 -
tests/qemuxml2argvdata/console-virtio.args | 4 +-
tests/qemuxml2argvdata/controller-order.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable2.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable3.args | 2 +-
.../cpu-cache-emulate-l3.args | 2 +-
.../cpu-cache-passthrough.args | 2 +-
.../cpu-cache-passthrough2.args | 2 +-
.../cpu-check-default-none.args | 2 +-
.../cpu-check-default-none2.args | 2 +-
.../cpu-check-default-partial.args | 2 +-
.../cpu-check-default-partial2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-none.args | 2 +-
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +-
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +-
tests/qemuxml2argvdata/cpu-exact1.args | 2 +-
.../cpu-exact2-nofallback.args | 2 +-
tests/qemuxml2argvdata/cpu-exact2.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.args | 2 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +-
.../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +-
.../cpu-host-model-fallback.args | 2 +-
.../cpu-host-model-vendor.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.args | 2 +-
.../cpu-host-passthrough-features.args | 2 +-
.../cpu-host-passthrough.args | 2 +-
.../qemuxml2argvdata/cpu-hotplug-startup.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum2.args | 2 +-
.../cpu-no-removed-features.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +-
.../qemuxml2argvdata/cpu-numa-memshared.args | 2 +-
.../cpu-numa-no-memory-element.args | 2 +-
tests/qemuxml2argvdata/cpu-numa1.args | 2 +-
tests/qemuxml2argvdata/cpu-numa2.args | 2 +-
tests/qemuxml2argvdata/cpu-strict1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology2.args | 2 +-
tests/qemuxml2argvdata/cpu-topology3.args | 2 +-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +-
.../qemuxml2argvdata/cputune-zero-shares.args | 2 +-
tests/qemuxml2argvdata/cputune.args | 2 +-
tests/qemuxml2argvdata/debug-threads.args | 2 +-
.../default-kvm-host-arch.args | 2 +-
.../default-qemu-host-arch.args | 2 +-
tests/qemuxml2argvdata/disk-aio.args | 2 +-
tests/qemuxml2argvdata/disk-blockio.args | 2 +-
.../disk-cache.x86_64-1.5.3.args | 38 -
.../disk-cache.x86_64-2.6.0.args | 40 -
.../disk-cache.x86_64-2.7.0.args | 40 -
.../qemuxml2argvdata/disk-cdrom-network.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +-
tests/qemuxml2argvdata/disk-copy_on_read.args | 4 +-
tests/qemuxml2argvdata/disk-floppy-tray.args | 2 +-
tests/qemuxml2argvdata/disk-geometry.args | 2 +-
tests/qemuxml2argvdata/disk-ide-split.args | 2 +-
tests/qemuxml2argvdata/disk-ide-wwn.args | 2 +-
tests/qemuxml2argvdata/disk-ioeventfd.args | 4 +-
.../disk-network-gluster.args | 6 +-
.../disk-network-iscsi-modern.args | 10 +-
.../qemuxml2argvdata/disk-network-iscsi.args | 10 +-
tests/qemuxml2argvdata/disk-network-nbd.args | 10 +-
.../disk-network-rbd.x86_64-2.5.0.args | 40 -
.../disk-network-sheepdog.args | 2 +-
.../disk-network-source-auth.args | 6 +-
tests/qemuxml2argvdata/disk-order.args | 6 +-
.../qemuxml2argvdata/disk-readonly-disk.args | 2 +-
tests/qemuxml2argvdata/disk-sata-device.args | 4 +-
.../disk-scsi-device-auto.x86_64-1.5.3.args | 33 -
.../disk-scsi-disk-split.args | 10 +-
.../qemuxml2argvdata/disk-scsi-disk-vpd.args | 6 +-
.../qemuxml2argvdata/disk-scsi-disk-wwn.args | 6 +-
.../disk-scsi-lun-passthrough.args | 6 +-
tests/qemuxml2argvdata/disk-serial.args | 2 +-
tests/qemuxml2argvdata/disk-snapshot.args | 2 +-
.../disk-source-pool-mode.args | 2 +-
tests/qemuxml2argvdata/disk-source-pool.args | 4 +-
.../disk-usb-device-removable.args | 2 +-
tests/qemuxml2argvdata/disk-usb-device.args | 2 +-
tests/qemuxml2argvdata/disk-virtio.args | 4 +-
tests/qemuxml2argvdata/encrypted-disk.args | 2 +-
.../eoi-disabled.x86_64-2.7.0.args | 30 -
.../eoi-enabled.x86_64-2.7.0.args | 30 -
tests/qemuxml2argvdata/event_idx.args | 4 +-
tests/qemuxml2argvdata/floppy-drive-fat.args | 2 +-
tests/qemuxml2argvdata/fs9p.args | 6 +-
.../graphics-egl-headless.args | 2 +-
.../graphics-sdl-fullscreen.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl.args | 2 +-
.../graphics-spice-agent-file-xfer.args | 4 +-
.../graphics-spice-agentmouse.args | 2 +-
.../graphics-spice-auto-socket-cfg.args | 2 +-
.../graphics-spice-auto-socket.args | 2 +-
.../graphics-spice-compression.args | 4 +-
.../graphics-spice-egl-headless.args | 4 +-
.../graphics-spice-no-args.args | 2 +-
.../graphics-spice-qxl-vga.args | 4 +-
.../qemuxml2argvdata/graphics-spice-sasl.args | 4 +-
.../graphics-spice-socket.args | 2 +-
.../graphics-spice-timeout.args | 2 +-
.../graphics-spice-usb-redir.args | 2 +-
tests/qemuxml2argvdata/graphics-spice.args | 4 +-
.../graphics-vnc-auto-socket-cfg.args | 2 +-
.../graphics-vnc-auto-socket.args | 2 +-
.../graphics-vnc-egl-headless.args | 2 +-
.../graphics-vnc-no-listen-attr.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-none.args | 2 +-
.../qemuxml2argvdata/graphics-vnc-policy.args | 2 +-
.../graphics-vnc-remove-generated-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 2 +-
.../graphics-vnc-socket-new-cmdline.args | 2 +-
.../qemuxml2argvdata/graphics-vnc-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 +-
.../graphics-vnc-tls.x86_64-2.4.0.args | 30 -
.../graphics-vnc-websocket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc.args | 2 +-
.../hostdev-mdev-precreated.args | 2 +-
.../hostdev-pci-address-device.args | 4 +-
.../hostdev-pci-address-unassigned.args | 8 +-
.../qemuxml2argvdata/hostdev-pci-address.args | 2 +-
.../hostdev-pci-multifunction.args | 16 +-
.../hostdev-scsi-lsi.x86_64-2.8.0.args | 45 -
.../hostdev-scsi-vhost-scsi-pci.args | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.args | 4 +-
...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 47 -
.../hostdev-usb-address-device-boot.args | 2 +-
.../hostdev-usb-address-device.args | 2 +-
.../hostdev-vfio-multidomain.args | 4 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 4 +-
tests/qemuxml2argvdata/hugepages-default.args | 2 +-
tests/qemuxml2argvdata/hugepages-shared.args | 2 +-
.../qemuxml2argvdata/input-usbmouse-addr.args | 2 +-
.../intel-iommu.x86_64-2.6.0.args | 29 -
tests/qemuxml2argvdata/iothreads-disk.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +-
.../kvmclock+eoi-disabled.x86_64-2.7.0.args | 30 -
.../luks-disks-source-qcow2.args | 8 +-
tests/qemuxml2argvdata/luks-disks-source.args | 6 +-
.../mach-virt-console-virtio.args | 2 +-
.../mach-virt-serial-native.args | 2 +-
.../mach-virt-serial-pci.args | 2 +-
.../mach-virt-serial-usb.args | 2 +-
tests/qemuxml2argvdata/machine-aliases1.args | 2 +-
tests/qemuxml2argvdata/machine-aliases2.args | 2 +-
tests/qemuxml2argvdata/machine-smm-opt.args | 2 +-
.../qemuxml2argvdata/machine-vmport-opt.args | 2 +-
.../memory-hotplug-dimm-addr.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug.args | 2 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 2 +-
tests/qemuxml2argvdata/memtune.args | 2 +-
.../migrate-numa-unaligned.args | 2 +-
.../minimal-msg-timestamp.args | 2 +-
tests/qemuxml2argvdata/minimal-sandbox.args | 2 +-
tests/qemuxml2argvdata/minimal.args | 2 +-
tests/qemuxml2argvdata/monitor-json.args | 2 +-
.../multifunction-pci-device.args | 2 +-
tests/qemuxml2argvdata/net-client.args | 4 +-
tests/qemuxml2argvdata/net-eth-hostip.args | 2 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 2 +-
tests/qemuxml2argvdata/net-eth-names.args | 6 +-
.../net-eth-unmanaged-tap.args | 2 +-
tests/qemuxml2argvdata/net-eth.args | 2 +-
.../net-hostdev-bootorder.args | 2 +-
.../net-hostdev-multidomain.args | 4 +-
.../net-hostdev-vfio-multidomain.args | 4 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 4 +-
tests/qemuxml2argvdata/net-hostdev.args | 4 +-
tests/qemuxml2argvdata/net-many-models.args | 12 +-
tests/qemuxml2argvdata/net-mcast.args | 4 +-
tests/qemuxml2argvdata/net-server.args | 4 +-
tests/qemuxml2argvdata/net-udp.args | 4 +-
tests/qemuxml2argvdata/net-user.args | 2 +-
.../net-vhostuser-multiq.args | 10 +-
.../qemuxml2argvdata/net-vhostuser-multiq.err | 1 -
tests/qemuxml2argvdata/net-vhostuser.args | 6 +-
.../net-vhostuser.x86_64-2.5.0.args | 36 -
tests/qemuxml2argvdata/net-virtio-device.args | 4 +-
.../net-virtio-disable-offloads.args | 4 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 4 +-
.../net-virtio-rxtxqueuesize.args | 4 +-
.../qemuxml2argvdata/net-virtio-teaming.args | 10 +-
tests/qemuxml2argvdata/net-virtio.args | 2 +-
.../numad-auto-memory-vcpu-cpuset.args | 2 +-
...o-memory-vcpu-no-cpuset-and-placement.args | 2 +-
.../numad-auto-vcpu-static-numatune.args | 2 +-
.../numad-static-memory-auto-vcpu.args | 2 +-
tests/qemuxml2argvdata/numad.args | 2 +-
.../numatune-auto-nodeset-invalid.args | 2 +-
.../numatune-auto-prefer.args | 2 +-
.../qemuxml2argvdata/numatune-distances.args | 2 +-
.../numatune-memnode-no-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-memnode.args | 2 +-
tests/qemuxml2argvdata/numatune-memory.args | 2 +-
tests/qemuxml2argvdata/panic-no-address.args | 2 +-
tests/qemuxml2argvdata/panic.args | 2 +-
.../parallel-parport-chardev.args | 2 +-
.../parallel-tcp-chardev.args | 2 +-
.../parallel-unix-chardev.x86_64-2.5.0.args | 33 -
tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +-
.../pci-bridge-many-disks.args | 216 +-
tests/qemuxml2argvdata/pci-bridge.args | 2 +-
tests/qemuxml2argvdata/pci-expander-bus.args | 68 +-
tests/qemuxml2argvdata/pci-many.args | 2 +-
tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +-
tests/qemuxml2argvdata/pci-rom.args | 10 +-
.../pci-serial-dev-chardev.args | 2 +-
.../pcie-root-port-model-generic.args | 6 +-
.../pcie-root-port-model-ioh3420.args | 4 +-
tests/qemuxml2argvdata/pcihole64.args | 2 +-
.../pseries-cpu-compat-power9.args | 4 +-
.../qemuxml2argvdata/pseries-cpu-compat.args | 4 +-
.../pseries-features-htp-resize.err | 1 -
.../pseries-features-htp-resize.xml | 1 -
.../pv-spinlock-disabled.x86_64-2.7.0.args | 30 -
.../pv-spinlock-enabled.x86_64-2.7.0.args | 30 -
.../q35-pci-force-address.args | 2 +-
.../q35-pm-disable-fallback.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +-
.../qemu-ns-commandline-ns0.args | 2 +-
.../qemu-ns-commandline-ns1.args | 2 +-
.../qemuxml2argvdata/qemu-ns-commandline.args | 2 +-
.../qemu-ns-domain-commandline-ns0.args | 2 +-
.../qemu-ns-domain-commandline.args | 2 +-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +-
.../seclabel-dynamic-baselabel.args | 2 +-
.../seclabel-dynamic-labelskip.args | 2 +-
.../seclabel-dynamic-override.args | 2 +-
.../seclabel-dynamic-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +-
tests/qemuxml2argvdata/seclabel-none.args | 2 +-
.../seclabel-static-labelskip.args | 2 +-
.../seclabel-static-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-static.args | 2 +-
.../serial-dev-chardev-iobase.args | 2 +-
.../qemuxml2argvdata/serial-dev-chardev.args | 2 +-
.../qemuxml2argvdata/serial-file-chardev.args | 2 +-
.../qemuxml2argvdata/serial-many-chardev.args | 2 +-
.../qemuxml2argvdata/serial-pty-chardev.args | 2 +-
.../serial-spiceport-nospice.args | 2 +-
.../qemuxml2argvdata/serial-tcp-chardev.args | 2 +-
.../serial-tcp-telnet-chardev.args | 2 +-
.../serial-tcp-tlsx509-chardev-verify.args | 2 +-
.../serial-tcp-tlsx509-chardev.args | 2 +-
.../qemuxml2argvdata/serial-udp-chardev.args | 2 +-
.../qemuxml2argvdata/serial-unix-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +-
.../shmem-plain-doorbell.args | 14 +-
tests/qemuxml2argvdata/shmem.args | 14 +-
.../smartcard-controller.args | 2 +-
.../smartcard-host-certificates-database.args | 2 +-
.../smartcard-host-certificates.args | 2 +-
tests/qemuxml2argvdata/smartcard-host.args | 2 +-
.../smartcard-passthrough-spicevmc.args | 2 +-
.../smartcard-passthrough-tcp.args | 2 +-
...artcard-passthrough-unix.x86_64-2.5.0.args | 32 -
tests/qemuxml2argvdata/smbios.args | 2 +-
tests/qemuxml2argvdata/sound-device.args | 14 +-
tests/qemuxml2argvdata/sound.args | 4 +-
.../usb-controller-qemu-xhci.args | 2 +-
.../qemuxml2argvdata/usb-controller-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller.args | 2 +-
.../usb-hub-autoadd-deluxe.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +-
tests/qemuxml2argvdata/usb-hub.args | 2 +-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +-
.../qemuxml2argvdata/usb-ich9-companion.args | 2 +-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 26 +-
.../qemuxml2argvdata/usb-long-port-path.args | 2 +-
tests/qemuxml2argvdata/usb-none.args | 2 +-
.../usb-piix3-controller.args | 2 +-
.../qemuxml2argvdata/usb-port-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-port-missing.args | 2 +-
tests/qemuxml2argvdata/usb-ports.args | 2 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 2 +-
.../usb-redir-filter-version.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 2 +-
.../usb-redir-unix.x86_64-2.5.0.args | 36 -
tests/qemuxml2argvdata/usb-redir.args | 2 +-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb1-usb2.args | 2 +-
tests/qemuxml2argvdata/user-aliases-usb.args | 2 +-
tests/qemuxml2argvdata/user-aliases.args | 2 +-
.../qemuxml2argvdata/video-qxl-nodevice.args | 32 -
tests/qemuxml2argvdata/video-qxl-nodevice.xml | 29 -
.../qemuxml2argvdata/video-vga-nodevice.args | 30 -
tests/qemuxml2argvdata/video-vga-nodevice.xml | 29 -
.../qemuxml2argvdata/video-vga-qxl-heads.args | 5 +-
.../virtio-input-passthrough.args | 4 +-
tests/qemuxml2argvdata/virtio-input.args | 6 +-
tests/qemuxml2argvdata/virtio-lun.args | 4 +-
.../qemuxml2argvdata/virtio-rng-default.args | 2 +-
.../virtio-rng-egd-unix.x86_64-2.5.0.args | 32 -
tests/qemuxml2argvdata/virtio-rng-egd.args | 4 +-
.../qemuxml2argvdata/virtio-rng-multiple.args | 4 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 4 +-
tests/qemuxml2argvdata/vmcoreinfo.args | 2 +-
tests/qemuxml2argvdata/watchdog-device.args | 2 +-
tests/qemuxml2argvdata/watchdog-dump.args | 2 +-
.../qemuxml2argvdata/watchdog-injectnmi.args | 2 +-
tests/qemuxml2argvtest.c | 155 +-
tests/qemuxml2xmloutdata/autoindex.xml | 4 +-
.../balloon-device-auto.xml | 2 +-
.../bios-nvram-os-interleave.xml | 2 +-
tests/qemuxml2xmloutdata/bios-nvram.xml | 2 +-
tests/qemuxml2xmloutdata/blkiotune-device.xml | 2 +-
tests/qemuxml2xmloutdata/blkiotune.xml | 2 +-
.../boot-menu-disable-with-timeout.xml | 2 +-
.../qemuxml2xmloutdata/boot-menu-disable.xml | 2 +-
.../boot-menu-enable-with-timeout.xml | 2 +-
tests/qemuxml2xmloutdata/boot-multi.xml | 2 +-
tests/qemuxml2xmloutdata/boot-order.xml | 6 +-
tests/qemuxml2xmloutdata/channel-guestfwd.xml | 2 +-
.../channel-unix-source-path-active.xml | 2 +-
.../channel-unix-source-path-inactive.xml | 2 +-
.../channel-virtio-auto.xml | 6 +-
.../channel-virtio-state-active.xml | 2 +-
.../channel-virtio-state-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/channel-virtio.xml | 2 +-
tests/qemuxml2xmloutdata/chardev-label.xml | 4 +-
tests/qemuxml2xmloutdata/clock-catchup.xml | 2 +-
.../clock-timer-hyperv-rtc.xml | 2 +-
.../console-compat-auto.xml | 2 +-
tests/qemuxml2xmloutdata/console-compat2.xml | 2 +-
.../console-virtio-many.xml | 4 +-
tests/qemuxml2xmloutdata/console-virtio.xml | 4 +-
.../controller-usb-order.xml | 2 +-
.../controller-virtio-scsi.xml | 12 +-
.../cpu-check-default-none.xml | 2 +-
.../cpu-check-default-none2.xml | 2 +-
.../cpu-check-default-partial.xml | 2 +-
.../cpu-check-default-partial2.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-check-full.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-check-none.xml | 2 +-
.../qemuxml2xmloutdata/cpu-check-partial.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-empty.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 2 +-
.../qemuxml2xmloutdata/cpu-host-kvmclock.xml | 2 +-
.../cpu-host-model-features.xml | 2 +-
.../cpu-host-model-vendor.xml | 2 +-
.../cpu-host-passthrough-features.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-kvmclock.xml | 2 +-
.../qemuxml2xmloutdata/cpu-numa-disjoint.xml | 2 +-
.../cpu-numa-disordered.xml | 2 +-
.../qemuxml2xmloutdata/cpu-numa-memshared.xml | 2 +-
.../cpu-numa-no-memory-element.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-numa1.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-numa2.xml | 2 +-
.../qemuxml2xmloutdata/cputune-iothreads.xml | 2 +-
.../cputune-iothreadsched-zeropriority.xml | 2 +-
.../cputune-iothreadsched.xml | 2 +-
.../cputune-zero-shares.xml | 2 +-
tests/qemuxml2xmloutdata/cputune.xml | 2 +-
.../default-kvm-host-arch.xml | 2 +-
.../default-qemu-host-arch.xml | 2 +-
.../disk-active-commit-active.xml | 2 +-
.../disk-active-commit-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/disk-aio.xml | 2 +-
.../disk-backing-chains-active.xml | 12 +-
.../disk-backing-chains-inactive.xml | 12 +-
.../disk-backing-chains-index-active.xml | 14 +-
.../disk-backing-chains-index-inactive.xml | 14 +-
.../disk-backing-chains-noindex.xml | 14 +-
.../disk-cache.x86_64-1.5.3.xml | 61 -
.../disk-cache.x86_64-2.6.0.xml | 61 -
.../disk-cache.x86_64-2.7.0.xml | 61 -
.../qemuxml2xmloutdata/disk-copy_on_read.xml | 4 +-
.../qemuxml2xmloutdata/disk-mirror-active.xml | 8 +-
.../disk-mirror-inactive.xml | 8 +-
.../disk-mirror-old-active.xml | 6 +-
.../disk-mirror-old-inactive.xml | 6 +-
.../disk-network-gluster.xml | 6 +-
.../qemuxml2xmloutdata/disk-network-iscsi.xml | 10 +-
tests/qemuxml2xmloutdata/disk-network-nbd.xml | 10 +-
tests/qemuxml2xmloutdata/disk-network-rbd.xml | 12 +-
.../disk-network-sheepdog.xml | 2 +-
.../disk-network-source-auth.xml | 6 +-
.../disk-scsi-device-auto.xml | 4 +-
.../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 6 +-
.../disk-scsi-lun-passthrough-sgio.xml | 6 +-
tests/qemuxml2xmloutdata/disk-serial.xml | 2 +-
.../disk-source-pool-mode.xml | 2 +-
tests/qemuxml2xmloutdata/disk-source-pool.xml | 4 +-
tests/qemuxml2xmloutdata/disk-usb-device.xml | 2 +-
tests/qemuxml2xmloutdata/disk-virtio.xml | 4 +-
tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +-
tests/qemuxml2xmloutdata/eoi-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/eoi-enabled.xml | 2 +-
tests/qemuxml2xmloutdata/event_idx.xml | 4 +-
tests/qemuxml2xmloutdata/floppy-drive-fat.xml | 2 +-
.../hostdev-mdev-precreated.xml | 2 +-
.../hostdev-pci-address-unassigned.xml | 8 +-
.../hostdev-pci-address.xml | 2 +-
.../hostdev-pci-multifunction.xml | 16 +-
.../hostdev-scsi-autogen-address.xml | 6 +-
.../hostdev-scsi-large-unit.xml | 4 +-
tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 4 +-
.../qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 4 +-
.../qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 4 +-
.../hostdev-scsi-shareable.xml | 4 +-
.../hostdev-scsi-vhost-scsi-pci.xml | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.xml | 8 +-
.../hostdev-scsi-virtio-scsi.xml | 4 +-
tests/qemuxml2xmloutdata/hostdev-vfio.xml | 4 +-
.../qemuxml2xmloutdata/hugepages-default.xml | 2 +-
tests/qemuxml2xmloutdata/hugepages-shared.xml | 2 +-
tests/qemuxml2xmloutdata/hyperv-off.xml | 2 +-
.../intel-iommu.x86_64-2.6.0.xml | 31 -
tests/qemuxml2xmloutdata/interface-driver.xml | 4 +-
tests/qemuxml2xmloutdata/iothreads-disk.xml | 2 +-
tests/qemuxml2xmloutdata/kvm-features-off.xml | 2 +-
tests/qemuxml2xmloutdata/lease.xml | 2 +-
.../qemuxml2xmloutdata/luks-disks-source.xml | 6 +-
.../memory-hotplug-dimm.xml | 2 +-
tests/qemuxml2xmloutdata/memory-hotplug.xml | 2 +-
.../qemuxml2xmloutdata/memorybacking-set.xml | 2 +-
.../memorybacking-unset.xml | 2 +-
.../qemuxml2xmloutdata/memtune-unlimited.xml | 2 +-
tests/qemuxml2xmloutdata/memtune.xml | 2 +-
.../qemuxml2xmloutdata/metadata-duplicate.xml | 2 +-
tests/qemuxml2xmloutdata/metadata.xml | 2 +-
tests/qemuxml2xmloutdata/minimal.xml | 2 +-
tests/qemuxml2xmloutdata/net-coalesce.xml | 8 +-
tests/qemuxml2xmloutdata/net-eth-hostip.xml | 2 +-
tests/qemuxml2xmloutdata/net-eth-ifname.xml | 2 +-
.../net-eth-unmanaged-tap.xml | 2 +-
tests/qemuxml2xmloutdata/net-eth.xml | 2 +-
.../net-hostdev-bootorder.xml | 2 +-
tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 4 +-
tests/qemuxml2xmloutdata/net-hostdev.xml | 4 +-
tests/qemuxml2xmloutdata/net-many-models.xml | 12 +-
tests/qemuxml2xmloutdata/net-midonet.xml | 4 +-
tests/qemuxml2xmloutdata/net-mtu.xml | 6 +-
tests/qemuxml2xmloutdata/net-openvswitch.xml | 4 +-
tests/qemuxml2xmloutdata/net-udp.xml | 4 +-
tests/qemuxml2xmloutdata/net-user.xml | 2 +-
tests/qemuxml2xmloutdata/net-vdpa.xml | 2 +-
tests/qemuxml2xmloutdata/net-vhostuser.xml | 6 +-
.../qemuxml2xmloutdata/net-virtio-device.xml | 4 +-
.../net-virtio-disable-offloads.xml | 4 +-
.../net-virtio-network-portgroup.xml | 8 +-
.../net-virtio-rxtxqueuesize.xml | 4 +-
.../net-virtio-teaming-network.xml | 6 +-
.../qemuxml2xmloutdata/net-virtio-teaming.xml | 10 +-
tests/qemuxml2xmloutdata/net-virtio.xml | 2 +-
.../numad-auto-memory-vcpu-cpuset.xml | 2 +-
...to-memory-vcpu-no-cpuset-and-placement.xml | 2 +-
.../numad-auto-vcpu-no-numatune.xml | 2 +-
.../numad-static-vcpu-no-numatune.xml | 2 +-
.../numatune-auto-prefer.xml | 2 +-
.../qemuxml2xmloutdata/numatune-distances.xml | 2 +-
.../numatune-memnode-no-memory.xml | 2 +-
tests/qemuxml2xmloutdata/numatune-memnode.xml | 2 +-
tests/qemuxml2xmloutdata/panic-isa.xml | 2 +-
tests/qemuxml2xmloutdata/panic-no-address.xml | 2 +-
tests/qemuxml2xmloutdata/panic.xml | 2 +-
.../pci-bridge-many-disks.xml | 216 +-
tests/qemuxml2xmloutdata/pci-expander-bus.xml | 68 +-
.../pci-rom-disabled-invalid.xml | 2 +-
tests/qemuxml2xmloutdata/pci-rom-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/pci-rom.xml | 10 +-
.../pci-serial-dev-chardev.xml | 2 +-
.../pcie-root-port-model-generic.xml | 12 +-
.../pcie-root-port-model-ioh3420.xml | 8 +-
tests/qemuxml2xmloutdata/pcihole64-gib.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64-none.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64.xml | 2 +-
.../pv-spinlock-disabled.xml | 2 +-
.../pv-spinlock-enabled.xml | 2 +-
.../q35-pci-force-address.xml | 4 +-
.../qemuxml2xmloutdata/seclabel-dac-none.xml | 2 +-
.../seclabel-device-multiple.xml | 2 +-
.../seclabel-dynamic-baselabel-inactive.xml | 2 +-
.../seclabel-dynamic-labelskip-inactive.xml | 2 +-
.../seclabel-dynamic-none.xml | 2 +-
.../seclabel-dynamic-override-inactive.xml | 2 +-
.../seclabel-dynamic-relabel-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/seclabel-none.xml | 2 +-
.../seclabel-static-labelskip-active.xml | 2 +-
.../seclabel-static-labelskip-inactive.xml | 2 +-
tests/qemuxml2xmloutdata/seclabel-static.xml | 2 +-
.../serial-spiceport-nospice.xml | 2 +-
.../serial-target-port-auto.xml | 2 +-
.../serial-tcp-tlsx509-chardev.xml | 2 +-
.../shmem-plain-doorbell.xml | 14 +-
tests/qemuxml2xmloutdata/shmem.xml | 14 +-
.../smartcard-controller.xml | 2 +-
.../smartcard-host-certificates-database.xml | 2 +-
.../smartcard-host-certificates.xml | 2 +-
tests/qemuxml2xmloutdata/smartcard-host.xml | 2 +-
.../smartcard-passthrough-spicevmc.xml | 2 +-
.../smartcard-passthrough-tcp.xml | 2 +-
.../smbios-multiple-type2.xml | 2 +-
tests/qemuxml2xmloutdata/smbios.xml | 2 +-
tests/qemuxml2xmloutdata/sound-device.xml | 14 +-
tests/qemuxml2xmloutdata/sound.xml | 4 +-
.../tap-vhost-incorrect.xml | 6 +-
tests/qemuxml2xmloutdata/tap-vhost.xml | 4 +-
.../qemuxml2xmloutdata/tseg-explicit-size.xml | 4 +-
tests/qemuxml2xmloutdata/usb-controller.xml | 2 +-
.../qemuxml2xmloutdata/usb-ich9-ehci-addr.xml | 26 +-
tests/qemuxml2xmloutdata/usb-none.xml | 2 +-
.../usb-piix3-controller.xml | 2 +-
tests/qemuxml2xmloutdata/usb-port-missing.xml | 2 +-
.../usb-redir-filter-version.xml | 2 +-
tests/qemuxml2xmloutdata/usb-redir-filter.xml | 2 +-
tests/qemuxml2xmloutdata/usb-redir.xml | 2 +-
tests/qemuxml2xmloutdata/vhost-vsock-auto.xml | 2 +-
tests/qemuxml2xmloutdata/vhost_queues.xml | 4 +-
.../virtio-input-passthrough.xml | 4 +-
tests/qemuxml2xmloutdata/virtio-input.xml | 6 +-
tests/qemuxml2xmloutdata/virtio-lun.xml | 4 +-
tests/qemuxml2xmloutdata/virtio-rng-egd.xml | 4 +-
.../qemuxml2xmloutdata/virtio-rng-random.xml | 4 +-
tests/qemuxml2xmloutdata/vmcoreinfo.xml | 2 +-
tests/qemuxml2xmltest.c | 72 +-
tests/testutilsqemu.c | 2 +-
739 files changed, 588789 insertions(+), 853995 deletions(-)
delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-host.err
delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-v3.err
delete mode 100644 tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
delete mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
delete mode 100644 tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.err
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/pseries-features-htp-resize.err
delete mode 120000 tests/qemuxml2argvdata/pseries-features-htp-resize.xml
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
delete mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.xml
delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.args
delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.xml
delete mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
delete mode 100644 tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
--
2.30.2
LGTM.
Reviewed-by: Neal Gompa <ngompa13(a)gmail.com>
--
真実はいつも一つ！/ Always, there's only one truth!
1320
days inactive
1323
days old
65 comments
4 participants
participants (4)
-
Ján Tomko -
Neal Gompa -
Pavel Hrdina -
Peter Krempa