[PATCH 00/51] Finish conversion of all test cases in qemuxml2argvtest to real capabilities

This series converts all outstanding test cases to use real capabilities. In the process few cases of pointless tests or features which are supported by every version of qemu were identified and addressed. To simplify the bulk of the conversion I've opted to simply set the most common capabilities in DO_TEST and DO_TEST_NOCAPS in addition to what the test asked for. This is done in a handful of patches and allows then a bulk conversion of many tests with no changes in the output files. I've payed special attention to CPU tests were I've ensured that they are semantically testing what they were before. Peter Krempa (51): qemu: Always assume support for QEMU_CAPS_PIIX_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S* qemu: capabilities: Retire QEMU_CAPS_ICH9_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S* capabilities qemu: capabilities: Preserve location of the default machine type when stripping aliases for tests qemuxml2argvtest: Clean up host CPU if overriden qemuxml2argvtest: testAddCPUModels: Remove non-x86_64 fake cpu models qemuxml2argvtest: Drop 'monitor-json' case qemu: Always assume support for QEMU_CAPS_CPU_CACHE qemu: capabilities: Retire QEMU_CAPS_CPU_CACHE qemu: Always assume support for QEMU_CAPS_DEVICE_VFIO_PCI qemu_capabilities: Retire QEMU_CAPS_DEVICE_VFIO_PCI qemuxml2argvtest: Add missing versioned test cases for 'cpu-host-model' qemuxml2argvtest: Remove old chardev tests qemuxml2argvtest: Simplify invocation of GIC tests qemuxml2argvtest: Remove duplicated test invocations qemuxml2argvtest: Remove fake-caps invocations of tests which also real caps version qemuxml2argvtest: Use proper version in negative 'virtio-options-memballoon-freepage-reporting' case qemuxml2argvtest: Use real caps for 'cpu-host-model-fallback' test case qemuxml2argvtest: Use real caps for 'cpu-host-model-nofallback' test case qemuxml2argvtest: Remove FLAG_SKIP_LEGACY_CPUS qemuxml2argvtest: Enable JSON syntax for -device, -object, and -netdev for all fake-caps tests virQEMUCapsAddCPUDefinitions: Fill in cpu type in data and node it's used only in tests qemuxml2argvtest: Modernize negative testing for hugepages qemuxml2argvtest: Modernize 'numatune' tests testutilsqemu: Always populate default ram id, default cpu, ACPI support for fake machines qemuxml2argvtest: Enable 'seccomp' sandbox in all fake caps tests qemuxml2argvtest: Consolidate tests for usb controllers qemuxml2argvtest: Add tests for auto-added USB controllers qemuxml2argvtest: Improve default usb controller testing qemuxml2argvtest: Consolidate testing of 'xhci' controllers qemuxml2argvtest: Assume QEMU_CAPS_PIIX3_USB_UHCI for all fake-caps tests qemuxml2argvtest: Assume QEMU_CAPS_DEVICE_PCIE_ROOT_PORT for fake-caps tests qemuxml2argvtest: Assume QEMU_CAPS_CPU_MIGRATABLE and QEMU_CAPS_SMP_DIES for fake-caps tests qemuxml2argvtest: Assume QEMU_CAPS_USB_HOST_HOSTDEVICE and QEMU_CAPS_DEVICE_QEMU_XHCI for fake-caps tests qemuxml2argvtest: Assume QEMU_CAPS_QXL_VRAM64, QEMU_CAPS_(QXL|VGA)_VGAMEM for fake-caps tests qemuxml2argvtest: Properly modernize 'clock-hpet-off' test case qemuxml2argvtest: Modernize migration/restore tests qemuxml2argvtest: Consolidate and modernize CPU topology testing qemuxml2argvtest: Modernize test cases using 'host-model' CPU qemuxml2argvtest: Modernize 'cpu-Haswell' test cases qemuxml2argvtest: Modernize 'cpu-minimum' cases qemuxml2argvtest: Modernize 'cpu-strict' case qemuxml2argvtest: Modernize 'cpu-(no)fallback' test qemuxml2argvtest: Modernize 'cpu-exact' cases qemuxml2argvtest: Modernize rest of the test cases testutilsqemu: Drop fake machine capability data for 'x86_64' qemustatusxml2xmltest: Remove capabilities infrastructure testutilsqemu: Drop infrastructure for fake-caps testing testutilsqemu: Unexport 'testQemuCapsInit' qemu: capabilities: Unexport 'virQEMUCapsAddMachine' qemuxml2argvtest: Remove cpu model faking for fake-caps tests qemu: capabilities: Remove 'virQEMUCapsAddCPUDefinitions' src/qemu/qemu_capabilities.c | 81 +- src/qemu/qemu_capabilities.h | 17 +- src/qemu/qemu_capspriv.h | 14 - src/qemu/qemu_command.c | 46 +- src/qemu/qemu_domain.c | 11 +- src/qemu/qemu_validate.c | 43 +- .../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 | 6 - .../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 | 6 - .../caps_5.1.0_x86_64.xml | 6 - .../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 | 6 - .../caps_6.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - .../caps_6.0.0_x86_64.xml | 6 - .../caps_6.1.0_x86_64.xml | 6 - .../caps_6.2.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 3 - .../caps_6.2.0_x86_64.xml | 6 - .../caps_7.0.0_aarch64+hvf.xml | 1 - .../caps_7.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 3 - .../caps_7.0.0_x86_64.xml | 6 - .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 3 - .../caps_7.1.0_x86_64.xml | 6 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 3 - .../caps_7.2.0_x86_64+hvf.xml | 6 - .../caps_7.2.0_x86_64.xml | 6 - .../caps_8.0.0_riscv64.xml | 1 - .../caps_8.0.0_x86_64.xml | 6 - .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - .../caps_8.1.0_x86_64.xml | 6 - tests/qemustatusxml2xmltest.c | 17 +- ...fx-ide-address-conflict.x86_64-latest.err} | 0 ...err => 440fx-wrong-root.x86_64-latest.err} | 0 ...ch64-gic-default-both.aarch64-latest.args} | 0 ...arch64-gic-default-v2.aarch64-latest.args} | 0 ...arch64-gic-default-v3.aarch64-latest.args} | 0 ...s => aarch64-gic-host.aarch64-latest.args} | 0 ...aarch64-gic-none-both.aarch64-latest.args} | 0 ... aarch64-gic-none-tcg.aarch64-latest.args} | 0 ...> aarch64-gic-none-v2.aarch64-latest.args} | 0 ...> aarch64-gic-none-v3.aarch64-latest.args} | 0 ...rgs => aarch64-gic-v2.aarch64-latest.args} | 0 ...rgs => aarch64-gic-v3.aarch64-latest.args} | 0 ...off.args => acpi-table.x86_64-latest.args} | 14 +- tests/qemuxml2argvdata/autoindex.args | 63 - .../autoindex.x86_64-latest.args | 65 + .../balloon-device-auto.x86_64-latest.args | 36 + ...loon-device-deflate-off.x86_64-latest.args | 36 + .../balloon-device-deflate.x86_64-latest.args | 36 + .../balloon-device-period.x86_64-latest.args | 36 + .../balloon-device.x86_64-latest.args | 36 + tests/qemuxml2argvdata/blkiotune-device.args | 34 - .../blkiotune-device.x86_64-latest.args | 36 + tests/qemuxml2argvdata/blkiotune.args | 34 - .../blkiotune.x86_64-latest.args | 36 + ...gs => channel-guestfwd.x86_64-latest.args} | 16 +- ...gs => channel-spicevmc.x86_64-latest.args} | 20 +- .../qemuxml2argvdata/channel-virtio-auto.args | 49 - .../channel-virtio-auto.x86_64-latest.args | 51 + .../channel-virtio-autoadd.args | 48 - .../channel-virtio-autoadd.x86_64-latest.args | 50 + .../channel-virtio-autoassign.args | 48 - ...annel-virtio-autoassign.x86_64-latest.args | 50 + .../channel-virtio-default.args | 41 - .../channel-virtio-default.x86_64-latest.args | 43 + .../channel-virtio-state.x86_64-latest.args | 43 + ...=> channel-virtio-unix.x86_64-latest.args} | 24 +- tests/qemuxml2argvdata/channel-virtio.args | 37 - ...args => channel-virtio.x86_64-latest.args} | 22 +- ...econnect-generated-path.x86_64-latest.err} | 0 ...connect-invalid-timeout.x86_64-latest.err} | 0 tests/qemuxml2argvdata/chardev-reconnect.args | 44 - .../chardev-reconnect.x86_64-latest.args | 46 + ....args => clock-catchup.x86_64-latest.args} | 14 +- ...e.args => clock-france.x86_64-latest.args} | 14 +- ....args => clock-hpet-off.x86_64-7.2.0.args} | 14 +- .../clock-hpet-off.x86_64-latest.args | 37 + ...altime-basis-localtime.x86_64-latest.args} | 14 +- ...rgs => clock-localtime.x86_64-latest.args} | 14 +- ...clock-timer-hyperv-rtc.x86_64-latest.args} | 11 +- ...-off.args => clock-utc.x86_64-latest.args} | 13 +- ...args => clock-variable.x86_64-latest.args} | 14 +- .../qemuxml2argvdata/console-compat-auto.args | 36 - .../console-compat-chardev.args | 36 - tests/qemuxml2argvdata/console-compat.args | 35 - ...=> console-virtio-many.x86_64-latest.args} | 24 +- ...args => console-virtio.x86_64-latest.args} | 18 +- tests/qemuxml2argvdata/controller-order.args | 52 - .../controller-order.x86_64-latest.args | 55 + ...s => cpu-Haswell-noTSX.x86_64-latest.args} | 11 +- ...ll.args => cpu-Haswell.x86_64-latest.args} | 11 +- ...2.args => cpu-Haswell2.x86_64-latest.args} | 11 +- ...3.args => cpu-Haswell3.x86_64-latest.args} | 11 +- .../cpu-cache-disable.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-cache-disable2.xml | 20 - .../cpu-cache-disable3.x86_64-latest.args | 33 + ...=> cpu-cache-emulate-l2.x86_64-latest.err} | 0 ...> cpu-cache-emulate-l3.x86_64-latest.args} | 13 +- ...pu-cache-passthrough-l3.x86_64-latest.err} | 0 .../cpu-cache-passthrough.args | 32 - ... cpu-cache-passthrough.x86_64-latest.args} | 13 +- .../cpu-cache-passthrough2.args | 32 - .../cpu-cache-passthrough2.xml | 20 - ... cpu-cache-passthrough3.x86_64-latest.err} | 0 .../cpu-check-default-none.args | 32 - .../cpu-check-default-none.x86_64-latest.args | 33 + ...pu-check-default-none2.x86_64-latest.args} | 11 +- .../cpu-check-default-partial.args | 32 - ...u-check-default-partial.x86_64-latest.args | 33 + ...check-default-partial2.x86_64-latest.args} | 11 +- tests/qemuxml2argvdata/cpu-check-full.args | 1 - .../cpu-check-full.x86_64-latest.args | 1 + ...args => cpu-check-none.x86_64-latest.args} | 11 +- tests/qemuxml2argvdata/cpu-check-partial.args | 1 - .../cpu-check-partial.x86_64-latest.args | 1 + ...ct1.args => cpu-exact1.x86_64-latest.args} | 11 +- ... cpu-exact2-nofallback.x86_64-latest.args} | 11 +- ...ct2.args => cpu-exact2.x86_64-latest.args} | 11 +- tests/qemuxml2argvdata/cpu-fallback.args | 32 - ...er.args => cpu-fallback.x86_64-5.2.0.args} | 9 +- .../cpu-fallback.x86_64-8.0.0.args | 33 + tests/qemuxml2argvdata/cpu-fallback.xml | 15 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 32 - .../cpu-host-kvmclock.x86_64-latest.args | 33 + ... => cpu-host-model-cmt.x86_64-latest.args} | 11 +- ...cpu-host-model-fallback.x86_64-4.2.0.args} | 7 +- ...cpu-host-model-fallback.x86_64-5.0.0.args} | 7 +- .../cpu-host-model-fallback.x86_64-5.1.0.args | 33 + .../cpu-host-model-fallback.x86_64-5.2.0.args | 34 + .../cpu-host-model-fallback.x86_64-6.0.0.args | 34 + .../cpu-host-model-fallback.x86_64-6.1.0.args | 34 + .../cpu-host-model-fallback.x86_64-6.2.0.args | 34 + .../cpu-host-model-fallback.x86_64-7.0.0.args | 34 + .../cpu-host-model-fallback.x86_64-7.1.0.args | 34 + .../cpu-host-model-fallback.x86_64-7.2.0.args | 34 + .../cpu-host-model-fallback.x86_64-8.0.0.args | 33 + ...cpu-host-model-fallback.x86_64-latest.args | 33 + .../cpu-host-model-nofallback.err | 1 - ...pu-host-model-nofallback.x86_64-4.2.0.args | 33 + ...pu-host-model-nofallback.x86_64-5.0.0.args | 33 + ...pu-host-model-nofallback.x86_64-5.1.0.args | 33 + ...pu-host-model-nofallback.x86_64-5.2.0.args | 34 + ...pu-host-model-nofallback.x86_64-6.0.0.args | 34 + ...pu-host-model-nofallback.x86_64-6.1.0.args | 34 + ...pu-host-model-nofallback.x86_64-6.2.0.args | 34 + ...pu-host-model-nofallback.x86_64-7.0.0.args | 34 + ...pu-host-model-nofallback.x86_64-7.1.0.args | 34 + ...pu-host-model-nofallback.x86_64-7.2.0.args | 34 + ...pu-host-model-nofallback.x86_64-8.0.0.args | 33 + ...u-host-model-nofallback.x86_64-latest.args | 33 + .../cpu-host-model-vendor.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-host-model.args | 40 - .../cpu-host-model.x86_64-6.2.0.args | 39 + .../cpu-host-model.x86_64-7.0.0.args | 39 + .../cpu-host-model.x86_64-7.1.0.args | 39 + .../cpu-host-model.x86_64-7.2.0.args | 39 + .../cpu-host-model.x86_64-8.0.0.args | 38 + ...t-passthrough-features.x86_64-latest.args} | 14 +- .../cpu-host-passthrough.args | 32 - .../cpu-host-passthrough.x86_64-latest.args | 33 + ...k.args => cpu-kvmclock.x86_64-latest.args} | 11 +- tests/qemuxml2argvdata/cpu-minimum1.args | 32 - .../cpu-minimum1.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-minimum2.args | 32 - .../cpu-minimum2.x86_64-latest.args | 33 + ...pu-no-removed-features.x86_64-latest.args} | 11 +- tests/qemuxml2argvdata/cpu-nofallback.err | 1 - .../cpu-nofallback.x86_64-5.2.0.err | 1 + .../cpu-nofallback.x86_64-8.0.0.args | 33 + tests/qemuxml2argvdata/cpu-nofallback.xml | 15 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 33 - .../cpu-numa-disjoint.x86_64-latest.args | 36 + .../cpu-numa-memshared.x86_64-latest.args | 36 + .../cpu-numa-no-memory-element.args | 33 - ...numa-no-memory-element.x86_64-latest.args} | 17 +- tests/qemuxml2argvdata/cpu-numa1.args | 33 - .../cpu-numa1.x86_64-latest.args | 36 + tests/qemuxml2argvdata/cpu-numa2.args | 33 - .../cpu-numa2.x86_64-latest.args | 36 + ...-numa3.err => cpu-numa3.x86_64-latest.err} | 0 .../cpu-phys-bits-emulate.args | 32 - ... cpu-phys-bits-emulate.x86_64-latest.args} | 13 +- .../cpu-phys-bits-emulate2.args | 32 - .../cpu-phys-bits-emulate2.x86_64-latest.args | 33 + .../cpu-phys-bits-passthrough.args | 32 - ...-phys-bits-passthrough.x86_64-latest.args} | 13 +- ...-phys-bits-passthrough2.x86_64-latest.err} | 0 ...u-qemu-host-passthrough.x86_64-latest.err} | 0 tests/qemuxml2argvdata/cpu-strict1.args | 32 - .../cpu-strict1.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-strict1.xml | 12 +- tests/qemuxml2argvdata/cpu-topology1.args | 31 - ....args => cpu-topology1.x86_64-latest.args} | 17 +- tests/qemuxml2argvdata/cpu-topology1.xml | 4 +- tests/qemuxml2argvdata/cpu-topology2.args | 32 - .../cpu-topology2.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-topology2.xml | 5 +- tests/qemuxml2argvdata/cpu-topology3.args | 31 - .../cpu-topology3.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-topology3.xml | 2 +- .../cpu-topology4.x86_64-latest.args | 33 + .../{monitor-json.xml => cpu-topology4.xml} | 18 +- ...s => cpu-tsc-frequency.x86_64-latest.args} | 11 +- ... default-kvm-host-arch.x86_64-latest.args} | 12 +- ...default-qemu-host-arch.x86_64-latest.args} | 12 +- .../graphics-egl-headless.args | 33 - ...raphics-sdl-fullscreen.x86_64-latest.args} | 14 +- ...l.args => graphics-sdl.x86_64-latest.args} | 14 +- ...isplay-missing-graphics.x86_64-latest.err} | 0 ... hostdev-mdev-duplicate.x86_64-latest.err} | 0 ...-invalid-target-address.x86_64-latest.err} | 0 ...ostdev-mdev-precreated.x86_64-latest.args} | 12 +- ...dev-src-address-invalid.x86_64-latest.err} | 0 .../hostdev-pci-address-unassigned.args | 34 - ...-pci-address-unassigned.x86_64-latest.args | 36 + ...> hostdev-pci-duplicate.x86_64-latest.err} | 0 .../hostdev-pci-multifunction.args | 38 - ...stdev-pci-multifunction.x86_64-latest.args | 40 + ... hostdev-scsi-duplicate.x86_64-latest.err} | 0 ...ev-scsi-vhost-scsi-pci.x86_64-latest.args} | 22 +- ...> hostdev-usb-duplicate.x86_64-latest.err} | 0 ...stdev-vfio-multidomain.x86_64-latest.args} | 17 +- ...ev-vfio-zpci-wrong-arch.x86_64-latest.err} | 0 tests/qemuxml2argvdata/hostdev-vfio.args | 35 - ...n.args => hostdev-vfio.x86_64-latest.args} | 16 +- ...e.args => hotplug-base.x86_64-latest.args} | 13 +- ...s-default-1G-nodeset-2M.x86_64-latest.err} | 0 ...pages-memaccess-invalid.x86_64-latest.err} | 0 ... => hugepages-memaccess3.x86_64-5.1.0.err} | 0 .../qemuxml2argvdata/input-usbmouse-addr.args | 35 - .../input-usbmouse-addr.x86_64-latest.args | 37 + .../input-usbmouse.x86_64-latest.args | 36 + tests/qemuxml2argvdata/input-usbtablet.args | 34 - .../input-usbtablet.x86_64-latest.args | 36 + ....args => kvm-pit-delay.x86_64-latest.args} | 14 +- ...rgs => kvm-pit-discard.x86_64-latest.args} | 14 +- ...clock.args => kvmclock.x86_64-latest.args} | 9 +- tests/qemuxml2argvdata/machine-aliases1.args | 34 - .../machine-aliases1.x86_64-latest.args | 36 + ...gs => machine-aliases2.x86_64-latest.args} | 15 +- .../machine-core-off.x86_64-latest.args | 35 + tests/qemuxml2argvdata/machine-core-on.args | 33 - ...rgs => machine-core-on.x86_64-latest.args} | 13 +- ...dparm-s390-char-invalid.x86_64-latest.err} | 0 ...adparm-s390-len-invalid.x86_64-latest.err} | 0 .../qemuxml2argvdata/machine-vmport-opt.args | 34 - .../machine-vmport-opt.x86_64-latest.args | 36 + ...rr => memory-align-fail.x86_64-latest.err} | 0 .../memory-hotplug-dimm.x86_64-latest.args | 41 + ...plug-invalid-targetnode.x86_64-latest.err} | 0 ...> memory-hotplug-nonuma.x86_64-latest.err} | 0 tests/qemuxml2argvdata/memory-hotplug.args | 35 - ...args => memory-hotplug.x86_64-latest.args} | 22 +- tests/qemuxml2argvdata/memtune-unlimited.args | 34 - .../memtune-unlimited.x86_64-latest.args | 36 + tests/qemuxml2argvdata/memtune.args | 34 - .../memtune.x86_64-latest.args | 36 + ...migrate-numa-unaligned.x86_64-latest.args} | 17 +- ...igrate.args => migrate.x86_64-latest.args} | 12 +- ...rr => minimal-no-memory.x86_64-latest.err} | 0 tests/qemuxml2argvdata/minimal.args | 34 - .../minimal.x86_64-latest.args | 36 + tests/qemuxml2argvdata/misc-acpi.args | 32 - ...late.args => misc-acpi.x86_64-latest.args} | 13 +- ...rgs => misc-disable-s3.x86_64-latest.args} | 12 +- ... misc-disable-suspends.x86_64-latest.args} | 12 +- tests/qemuxml2argvdata/misc-enable-s4.err | 1 - ...args => misc-enable-s4.x86_64-latest.args} | 12 +- tests/qemuxml2argvdata/misc-uuid.args | 32 - ...auto.args => misc-uuid.x86_64-latest.args} | 13 +- tests/qemuxml2argvdata/monitor-json.args | 34 - .../multifunction-pci-device.args | 43 - ...ultifunction-pci-device.x86_64-latest.args | 45 + ...s.args => nosharepages.x86_64-latest.args} | 12 +- .../numad-auto-memory-vcpu-cpuset.args | 34 - ...auto-memory-vcpu-cpuset.x86_64-latest.args | 36 + ...o-memory-vcpu-no-cpuset-and-placement.args | 34 - ...no-cpuset-and-placement.x86_64-latest.args | 36 + ...tic-numatune-no-nodeset.x86_64-latest.err} | 0 .../numad-auto-vcpu-static-numatune.args | 34 - ...to-vcpu-static-numatune.x86_64-latest.args | 36 + .../numad-static-memory-auto-vcpu.args | 34 - ...static-memory-auto-vcpu.x86_64-latest.args | 36 + tests/qemuxml2argvdata/numad.args | 34 - .../qemuxml2argvdata/numad.x86_64-latest.args | 36 + .../numatune-auto-nodeset-invalid.args | 34 - ...ne-auto-nodeset-invalid.x86_64-latest.args | 36 + ...> numatune-auto-prefer.x86_64-latest.args} | 14 +- ... => numatune-distances.x86_64-latest.args} | 28 +- ...ne-memnode-invalid-mode.x86_64-latest.err} | 0 ...tune-memnode-no-memory.x86_64-latest.args} | 15 +- ... numatune-memnode-nocpu.x86_64-latest.err} | 0 tests/qemuxml2argvdata/numatune-memnode.args | 37 - ...ne-memnodes-problematic.x86_64-latest.err} | 0 ...-memory-invalid-nodeset.x86_64-latest.err} | 0 tests/qemuxml2argvdata/numatune-memory.args | 34 - tests/qemuxml2argvdata/numatune-memory.xml | 31 - ...nodeset-exceed-hostnode.x86_64-latest.err} | 0 .../parallel-parport-chardev.args | 36 - .../parallel-tcp-chardev.args | 36 - tests/qemuxml2argvdata/pci-autoadd-addr.args | 41 - .../pci-autoadd-addr.x86_64-latest.args | 44 + tests/qemuxml2argvdata/pci-autoadd-idx.args | 42 - .../pci-autoadd-idx.x86_64-latest.args | 45 + ...s => pci-autofill-addr.x86_64-latest.args} | 16 +- ...-bridge-duplicate-index.x86_64-latest.err} | 0 ... pci-bridge-many-disks.x86_64-latest.args} | 224 ++-- ...-negative-index-invalid.x86_64-latest.err} | 0 tests/qemuxml2argvdata/pci-bridge.args | 101 -- .../pci-bridge.x86_64-latest.args | 104 ++ ....err => pci-bus-invalid.x86_64-latest.err} | 0 ...r => pci-domain-invalid.x86_64-latest.err} | 0 ...ci-expander-bus-bad-bus.x86_64-latest.err} | 0 ...xpander-bus-bad-machine.x86_64-latest.err} | 0 ...i-expander-bus-bad-node.x86_64-latest.err} | 0 tests/qemuxml2argvdata/pci-expander-bus.args | 98 -- .../pci-expander-bus.x86_64-latest.args | 101 ++ ...=> pci-function-invalid.x86_64-latest.err} | 0 ...-many.args => pci-many.x86_64-latest.args} | 71 +- .../pci-rom-disabled-invalid.args | 1 - ...ci-rom-disabled-invalid.x86_64-latest.args | 1 + ...gs => pci-rom-disabled.x86_64-latest.args} | 12 +- .../pci-rom.x86_64-latest.args | 42 + ...err => pci-root-address.x86_64-latest.err} | 0 ... pci-root-nonzero-index.x86_64-latest.err} | 0 .../pci-serial-dev-chardev.args | 36 - ...err => pci-slot-invalid.x86_64-latest.err} | 0 ...ie-expander-bus-bad-bus.x86_64-latest.err} | 0 ...xpander-bus-bad-machine.x86_64-latest.err} | 0 tests/qemuxml2argvdata/pcie-expander-bus.args | 135 -- .../pcie-expander-bus.x86_64-latest.args | 140 ++ ...oot-port-model-generic.x86_64-latest.args} | 14 +- ...oot-port-model-ioh3420.x86_64-latest.args} | 14 +- ...pcie-root-port-too-many.x86_64-latest.err} | 0 ...args => pcie-root-port.x86_64-latest.args} | 17 +- ...root.args => pcie-root.x86_64-latest.args} | 11 +- .../pcie-switch-downstream-port.args | 45 - ...-switch-downstream-port.x86_64-latest.args | 48 + .../pcie-switch-upstream-port.args | 39 - ...ie-switch-upstream-port.x86_64-latest.args | 43 + ....args => pcihole64-q35.x86_64-latest.args} | 15 +- ...le64.args => pcihole64.x86_64-latest.args} | 12 +- ...rgs => pmu-feature-off.x86_64-latest.args} | 8 +- ...re.args => pmu-feature.x86_64-latest.args} | 8 +- ...eatures-invalid-machine.x86_64-latest.err} | 0 ...-serial-invalid-machine.x86_64-latest.err} | 0 ...=> q35-dmi-bad-address1.x86_64-latest.err} | 0 ...=> q35-dmi-bad-address2.x86_64-latest.err} | 0 .../q35-pci-force-address.args | 38 - .../q35-pci-force-address.x86_64-latest.args | 40 + .../q35-pm-disable-fallback.args | 37 - .../q35-pm-disable-fallback.xml | 18 - tests/qemuxml2argvdata/q35-pm-disable.args | 37 - tests/qemuxml2argvdata/q35-pm-disable.xml | 18 - tests/qemuxml2argvdata/q35-usb2-multi.args | 49 - .../q35-usb2-multi.x86_64-latest.args | 51 + tests/qemuxml2argvdata/q35-usb2-reorder.args | 49 - .../q35-usb2-reorder.x86_64-latest.args | 51 + .../q35-usb2.x86_64-latest.args | 43 + ...t.err => q35-wrong-root.x86_64-latest.err} | 0 tests/qemuxml2argvdata/q35.args | 39 - .../{q35-usb2.args => q35.x86_64-latest.args} | 23 +- tests/qemuxml2argvdata/q35.xml | 4 + ...nv.args => qemu-ns-alt.x86_64-latest.args} | 15 +- .../qemu-ns-commandline-ns0.args | 34 - ...qemu-ns-commandline-ns0.x86_64-latest.args | 36 + .../qemu-ns-commandline-ns1.args | 34 - ...qemu-ns-commandline-ns1.x86_64-latest.args | 36 + .../qemuxml2argvdata/qemu-ns-commandline.args | 34 - .../qemu-ns-commandline.x86_64-latest.args | 36 + .../qemu-ns-domain-commandline-ns0.args | 34 - ...-domain-commandline-ns0.x86_64-latest.args | 36 + .../qemu-ns-domain-commandline.args | 34 - ...u-ns-domain-commandline.x86_64-latest.args | 36 + .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 34 - .../qemu-ns-domain-ns0.x86_64-latest.args | 36 + ...args => qemu-ns-no-env.x86_64-latest.args} | 15 +- ...eboot-timeout-disabled.x86_64-latest.args} | 10 +- ...reboot-timeout-enabled.x86_64-latest.args} | 10 +- ....args => restore-v2-fd.x86_64-latest.args} | 14 +- ...-v2.args => restore-v2.x86_64-latest.args} | 12 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 34 - .../seclabel-dac-none.x86_64-latest.args | 36 + ...label-device-duplicates.x86_64-latest.err} | 0 ...-device-relabel-invalid.x86_64-latest.err} | 0 .../seclabel-dynamic-baselabel.args | 34 - ...label-dynamic-baselabel.x86_64-latest.args | 36 + .../seclabel-dynamic-labelskip.args | 34 - ...label-dynamic-labelskip.x86_64-latest.args | 36 + ...label-dynamic-override.x86_64-latest.args} | 16 +- .../seclabel-dynamic-relabel.args | 34 - ...eclabel-dynamic-relabel.x86_64-latest.args | 36 + tests/qemuxml2argvdata/seclabel-dynamic.args | 34 - .../seclabel-dynamic.x86_64-latest.args | 36 + ...rr => seclabel-multiple.x86_64-latest.err} | 0 tests/qemuxml2argvdata/seclabel-none.args | 34 - .../seclabel-none.x86_64-latest.args | 36 + .../seclabel-static-labelskip.args | 34 - ...clabel-static-labelskip.x86_64-latest.args | 36 + .../seclabel-static-relabel.args | 34 - ...seclabel-static-relabel.x86_64-latest.args | 36 + tests/qemuxml2argvdata/seclabel-static.args | 34 - .../seclabel-static.x86_64-latest.args | 36 + .../serial-dev-chardev-iobase.args | 36 - .../qemuxml2argvdata/serial-dev-chardev.args | 36 - .../qemuxml2argvdata/serial-file-chardev.args | 37 - tests/qemuxml2argvdata/serial-file-log.args | 37 - .../qemuxml2argvdata/serial-many-chardev.args | 39 - .../qemuxml2argvdata/serial-pty-chardev.args | 36 - tests/qemuxml2argvdata/serial-spiceport.args | 38 - .../qemuxml2argvdata/serial-tcp-chardev.args | 36 - .../serial-tcp-telnet-chardev.args | 36 - .../serial-tcp-tlsx509-chardev-verify.args | 39 - .../serial-tcp-tlsx509-chardev.args | 39 - .../serial-tcp-tlsx509-secret-chardev.args | 40 - .../qemuxml2argvdata/serial-udp-chardev.args | 38 - tests/qemuxml2argvdata/serial-vc-chardev.args | 36 - .../smartcard-controller.x86_64-latest.args | 35 + ...t-certificates-database.x86_64-latest.args | 35 + .../smartcard-host-certificates.args | 33 - ...tcard-host-certificates.x86_64-latest.args | 35 + tests/qemuxml2argvdata/smartcard-host.args | 33 - .../smartcard-host.x86_64-latest.args | 35 + ...d-passthrough-spicevmc.x86_64-latest.args} | 18 +- ...rtcard-passthrough-tcp.x86_64-latest.args} | 16 +- ...date.err => smbios-date.x86_64-latest.err} | 0 ...rr => smbios-uuid-match.x86_64-latest.err} | 0 ...{smbios.args => smbios.x86_64-latest.args} | 14 +- tests/qemuxml2argvdata/smp-dies.args | 33 - tests/qemuxml2argvdata/smp.args | 33 - ... tpm-no-backend-invalid.x86_64-latest.err} | 0 ....err => usb-bus-missing.x86_64-latest.err} | 0 ...troller-default-i440fx.x86_64-latest.args} | 14 +- ....xml => usb-controller-default-i440fx.xml} | 0 ...controller-default-isapc.x86_64-latest.err | 1 + .../usb-controller-default-isapc.xml | 16 + ...controller-default-q35.x86_64-latest.args} | 10 +- ...ult-unavailable-i440fx.x86_64-latest.args} | 12 +- ...-controller-default-unavailable-i440fx.xml | 1 + ...default-unavailable-q35.x86_64-latest.err} | 0 ...sb-controller-explicit-unavailable-q35.xml | 1 - ...troller-ich9-autoassign.x86_64-latest.args | 41 + ...xml => usb-controller-ich9-autoassign.xml} | 0 ...ntroller-ich9-companion.x86_64-latest.args | 36 + ....xml => usb-controller-ich9-companion.xml} | 0 ...ntroller-ich9-ehci-addr.x86_64-latest.args | 44 + ....xml => usb-controller-ich9-ehci-addr.xml} | 0 ...oller-ich9-no-companion.x86_64-latest.err} | 0 ...l => usb-controller-ich9-no-companion.xml} | 0 ...roller-implicit-i440fx.x86_64-latest.args} | 13 +- ...xml => usb-controller-implicit-i440fx.xml} | 1 - ...troller-implicit-isapc.x86_64-latest.args} | 8 +- .../usb-controller-implicit-isapc.xml | 15 + ...controller-implicit-q35.x86_64-latest.args | 36 + .../usb-controller-implicit-q35.xml | 15 + ...ntroller-nec-xhci-limit.x86_64-latest.err} | 0 ....xml => usb-controller-nec-xhci-limit.xml} | 0 ...er-nec-xhci-unavailable.x86_64-latest.err} | 0 .../usb-controller-nec-xhci-unavailable.xml | 1 + ...sb-controller-nec-xhci.x86_64-latest.args} | 10 +- ...it-q35.xml => usb-controller-nec-xhci.xml} | 0 ...ler-nex-xhci-autoassign.x86_64-latest.args | 37 + ...=> usb-controller-nex-xhci-autoassign.xml} | 0 ...> usb-controller-piix3.x86_64-latest.args} | 15 +- ...ontroller.xml => usb-controller-piix3.xml} | 0 ...troller-qemu-xhci-limit.x86_64-latest.err} | 0 .../usb-controller-qemu-xhci-unavailable.err | 1 - .../usb-controller-qemu-xhci-unavailable.xml | 1 - .../usb-controller-qemu-xhci.args | 30 - ...b-controller-qemu-xhci.x86_64-latest.args} | 15 +- .../qemuxml2argvdata/usb-controller-xhci.args | 30 - tests/qemuxml2argvdata/usb-controller.args | 31 - .../usb-hub-autoadd-deluxe.args | 50 - .../usb-hub-autoadd-deluxe.x86_64-latest.args | 52 + tests/qemuxml2argvdata/usb-hub-autoadd.args | 36 - .../usb-hub-autoadd.x86_64-latest.args | 38 + ...err => usb-hub-conflict.x86_64-latest.err} | 0 ... => usb-hub-nonexistent.x86_64-latest.err} | 0 tests/qemuxml2argvdata/usb-hub.args | 32 - .../usb-hub.x86_64-latest.args | 34 + .../qemuxml2argvdata/usb-ich9-autoassign.args | 39 - .../qemuxml2argvdata/usb-ich9-companion.args | 34 - .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 42 - .../qemuxml2argvdata/usb-long-port-path.args | 35 - .../usb-long-port-path.x86_64-latest.args | 37 + ...hub.err => usb-none-hub.x86_64-latest.err} | 0 ...r.err => usb-none-other.x86_64-latest.err} | 0 ...r => usb-none-usbtablet.x86_64-latest.err} | 0 tests/qemuxml2argvdata/usb-none.args | 30 - .../usb-none.x86_64-latest.args | 32 + .../qemuxml2argvdata/usb-port-autoassign.args | 36 - .../usb-port-autoassign.x86_64-latest.args | 38 + tests/qemuxml2argvdata/usb-port-missing.args | 34 - .../usb-port-missing.x86_64-latest.args | 36 + ... usb-ports-out-of-range.x86_64-latest.err} | 0 tests/qemuxml2argvdata/usb-ports.args | 36 - .../usb-ports.x86_64-latest.args | 38 + tests/qemuxml2argvdata/usb-redir-boot.args | 39 - .../usb-redir-boot.x86_64-latest.args | 41 + .../usb-redir-filter-version.args | 36 - ...sb-redir-filter-version.x86_64-latest.args | 38 + tests/qemuxml2argvdata/usb-redir-filter.args | 39 - .../usb-redir-filter.x86_64-latest.args | 41 + tests/qemuxml2argvdata/usb-redir.args | 39 - .../usb-redir.x86_64-latest.args | 41 + ...-long-port-path-invalid.x86_64-latest.err} | 0 .../qemuxml2argvdata/usb-xhci-autoassign.args | 35 - tests/qemuxml2argvdata/usb1-usb2.args | 43 - .../usb1-usb2.x86_64-latest.args | 45 + ...=> vhost_queues-invalid.x86_64-latest.err} | 0 .../virtio-input-passthrough.args | 32 - ...irtio-input-passthrough.x86_64-latest.args | 34 + tests/qemuxml2argvdata/virtio-input.args | 34 - .../virtio-input.x86_64-latest.args | 36 + ...lloon-freepage-reporting.x86_64-5.0.0.err} | 0 .../qemuxml2argvdata/virtio-rng-default.args | 33 - .../virtio-rng-default.x86_64-latest.args | 35 + ...=> virtio-rng-egd-crash.x86_64-latest.err} | 0 ...args => virtio-rng-egd.x86_64-latest.args} | 16 +- .../qemuxml2argvdata/virtio-rng-multiple.args | 36 - .../virtio-rng-multiple.x86_64-latest.args | 38 + tests/qemuxml2argvdata/virtio-rng-random.args | 33 - .../virtio-rng-random.x86_64-latest.args | 35 + tests/qemuxml2argvdata/vmcoreinfo.args | 35 - .../vmcoreinfo.x86_64-latest.args | 37 + tests/qemuxml2argvtest.c | 1189 ++++++----------- .../default-kvm-host-arch.x86_64-latest.xml | 2 +- .../default-qemu-host-arch.x86_64-latest.xml | 2 +- .../qemuxml2xmloutdata/q35.x86_64-latest.xml | 4 + ...ntroller-default-i440fx.x86_64-latest.xml} | 0 ...ault-unavailable-i440fx.x86_64-latest.xml} | 22 +- ...ntroller-ich9-ehci-addr.x86_64-latest.xml} | 0 ...troller-implicit-i440fx.x86_64-latest.xml} | 12 +- ...ntroller-implicit-isapc.x86_64-latest.xml} | 18 +- ...-controller-implicit-q35.x86_64-latest.xml | 43 + ...usb-controller-nec-xhci.x86_64-latest.xml} | 0 ...=> usb-controller-piix3.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 14 +- tests/testutilsqemu.c | 159 +-- tests/testutilsqemu.h | 6 +- 550 files changed, 6870 insertions(+), 7188 deletions(-) rename tests/qemuxml2argvdata/{440fx-ide-address-conflict.err => 440fx-ide-address-conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{440fx-wrong-root.err => 440fx-wrong-root.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-both.args => aarch64-gic-default-both.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-v2.args => aarch64-gic-default-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-v3.args => aarch64-gic-default-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-host.args => aarch64-gic-host.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-both.args => aarch64-gic-none-both.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-tcg.args => aarch64-gic-none-tcg.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-v2.args => aarch64-gic-none-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-v3.args => aarch64-gic-none-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-v2.args => aarch64-gic-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-v3.args => aarch64-gic-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{machine-core-off.args => acpi-table.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/autoindex.args create mode 100644 tests/qemuxml2argvdata/autoindex.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/blkiotune-device.args create mode 100644 tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/blkiotune.args create mode 100644 tests/qemuxml2argvdata/blkiotune.x86_64-latest.args rename tests/qemuxml2argvdata/{channel-guestfwd.args => channel-guestfwd.x86_64-latest.args} (58%) rename tests/qemuxml2argvdata/{channel-spicevmc.args => channel-spicevmc.x86_64-latest.args} (55%) delete mode 100644 tests/qemuxml2argvdata/channel-virtio-auto.args create mode 100644 tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/channel-virtio-autoadd.args create mode 100644 tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/channel-virtio-autoassign.args create mode 100644 tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/channel-virtio-default.args create mode 100644 tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args rename tests/qemuxml2argvdata/{channel-virtio-unix.args => channel-virtio-unix.x86_64-latest.args} (50%) delete mode 100644 tests/qemuxml2argvdata/channel-virtio.args rename tests/qemuxml2argvdata/{channel-virtio-state.args => channel-virtio.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{chardev-reconnect-generated-path.err => chardev-reconnect-generated-path.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{chardev-reconnect-invalid-timeout.err => chardev-reconnect-invalid-timeout.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/chardev-reconnect.args create mode 100644 tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args rename tests/qemuxml2argvdata/{clock-catchup.args => clock-catchup.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{clock-localtime.args => clock-france.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{clock-hpet-off.args => clock-hpet-off.x86_64-7.2.0.args} (60%) create mode 100644 tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args rename tests/qemuxml2argvdata/{clock-localtime-basis-localtime.args => clock-localtime-basis-localtime.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{clock-france.args => clock-localtime.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{clock-timer-hyperv-rtc.args => clock-timer-hyperv-rtc.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{balloon-device-deflate-off.args => clock-utc.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{clock-variable.args => clock-variable.x86_64-latest.args} (61%) delete mode 100644 tests/qemuxml2argvdata/console-compat-auto.args delete mode 100644 tests/qemuxml2argvdata/console-compat-chardev.args delete mode 100644 tests/qemuxml2argvdata/console-compat.args rename tests/qemuxml2argvdata/{console-virtio-many.args => console-virtio-many.x86_64-latest.args} (52%) rename tests/qemuxml2argvdata/{console-virtio.args => console-virtio.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2argvdata/controller-order.args create mode 100644 tests/qemuxml2argvdata/controller-order.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-Haswell-noTSX.args => cpu-Haswell-noTSX.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{cpu-Haswell.args => cpu-Haswell.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{cpu-Haswell2.args => cpu-Haswell2.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{cpu-Haswell3.args => cpu-Haswell3.x86_64-latest.args} (60%) create mode 100644 tests/qemuxml2argvdata/cpu-cache-disable.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-cache-disable2.xml create mode 100644 tests/qemuxml2argvdata/cpu-cache-disable3.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-cache-emulate-l2.err => cpu-cache-emulate-l2.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{cpu-cache-disable.args => cpu-cache-emulate-l3.x86_64-latest.args} (56%) rename tests/qemuxml2argvdata/{cpu-cache-passthrough-l3.err => cpu-cache-passthrough-l3.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough.args rename tests/qemuxml2argvdata/{cpu-cache-disable2.args => cpu-cache-passthrough.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.args delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.xml rename tests/qemuxml2argvdata/{cpu-cache-passthrough3.err => cpu-cache-passthrough3.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/cpu-check-default-none.args create mode 100644 tests/qemuxml2argvdata/cpu-check-default-none.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-check-default-none2.args => cpu-check-default-none2.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/cpu-check-default-partial.args create mode 100644 tests/qemuxml2argvdata/cpu-check-default-partial.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-check-default-partial2.args => cpu-check-default-partial2.x86_64-latest.args} (60%) delete mode 120000 tests/qemuxml2argvdata/cpu-check-full.args create mode 120000 tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-check-none.args => cpu-check-none.x86_64-latest.args} (60%) delete mode 120000 tests/qemuxml2argvdata/cpu-check-partial.args create mode 120000 tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-exact1.args => cpu-exact1.x86_64-latest.args} (62%) rename tests/qemuxml2argvdata/{cpu-exact2-nofallback.args => cpu-exact2-nofallback.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{cpu-exact2.args => cpu-exact2.x86_64-latest.args} (63%) delete mode 100644 tests/qemuxml2argvdata/cpu-fallback.args rename tests/qemuxml2argvdata/{usb-piix3-controller.args => cpu-fallback.x86_64-5.2.0.args} (73%) create mode 100644 tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args delete mode 100644 tests/qemuxml2argvdata/cpu-host-kvmclock.args create mode 100644 tests/qemuxml2argvdata/cpu-host-kvmclock.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-host-model-cmt.args => cpu-host-model-cmt.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.args => cpu-host-model-fallback.x86_64-4.2.0.args} (63%) rename tests/qemuxml2argvdata/{cpu-host-model-vendor.args => cpu-host-model-fallback.x86_64-5.0.0.args} (63%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.err create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-vendor.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args rename tests/qemuxml2argvdata/{machine-aliases2.args => cpu-host-passthrough-features.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/cpu-host-passthrough.args create mode 100644 tests/qemuxml2argvdata/cpu-host-passthrough.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-kvmclock.args => cpu-kvmclock.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/cpu-minimum1.args create mode 100644 tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-minimum2.args create mode 100644 tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-no-removed-features.args => cpu-no-removed-features.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/cpu-nofallback.err create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args delete mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.args create mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-numa-no-memory-element.args rename tests/qemuxml2argvdata/{cpu-numa-memshared.args => cpu-numa-no-memory-element.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2argvdata/cpu-numa1.args create mode 100644 tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-numa2.args create mode 100644 tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-numa3.err => cpu-numa3.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate.args rename tests/qemuxml2argvdata/{cpu-cache-disable3.args => cpu-phys-bits-emulate.x86_64-latest.args} (57%) delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args rename tests/qemuxml2argvdata/{cpu-cache-emulate-l3.args => cpu-phys-bits-passthrough.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{cpu-phys-bits-passthrough2.err => cpu-phys-bits-passthrough2.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{cpu-qemu-host-passthrough.err => cpu-qemu-host-passthrough.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/cpu-strict1.args create mode 100644 tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-topology1.args rename tests/qemuxml2argvdata/{balloon-device.args => cpu-topology1.x86_64-latest.args} (55%) delete mode 100644 tests/qemuxml2argvdata/cpu-topology2.args create mode 100644 tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-topology3.args create mode 100644 tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args rename tests/qemuxml2argvdata/{monitor-json.xml => cpu-topology4.xml} (51%) rename tests/qemuxml2argvdata/{cpu-tsc-frequency.args => cpu-tsc-frequency.x86_64-latest.args} (65%) rename tests/qemuxml2argvdata/{default-kvm-host-arch.args => default-kvm-host-arch.x86_64-latest.args} (58%) rename tests/qemuxml2argvdata/{default-qemu-host-arch.args => default-qemu-host-arch.x86_64-latest.args} (59%) delete mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args rename tests/qemuxml2argvdata/{graphics-sdl-fullscreen.args => graphics-sdl-fullscreen.x86_64-latest.args} (62%) rename tests/qemuxml2argvdata/{graphics-sdl.args => graphics-sdl.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{hostdev-mdev-display-missing-graphics.err => hostdev-mdev-display-missing-graphics.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-duplicate.err => hostdev-mdev-duplicate.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-invalid-target-address.err => hostdev-mdev-invalid-target-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-precreated.args => hostdev-mdev-precreated.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{hostdev-mdev-src-address-invalid.err => hostdev-mdev-src-address-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-unassigned.x86_64-latest.args rename tests/qemuxml2argvdata/{hostdev-pci-duplicate.err => hostdev-pci-duplicate.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.x86_64-latest.args rename tests/qemuxml2argvdata/{hostdev-scsi-duplicate.err => hostdev-scsi-duplicate.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-rom.args => hostdev-scsi-vhost-scsi-pci.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{hostdev-usb-duplicate.err => hostdev-usb-duplicate.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pci.args => hostdev-vfio-multidomain.x86_64-latest.args} (58%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-wrong-arch.err => hostdev-vfio-zpci-wrong-arch.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio.args rename tests/qemuxml2argvdata/{hostdev-vfio-multidomain.args => hostdev-vfio.x86_64-latest.args} (58%) rename tests/qemuxml2argvdata/{hotplug-base.args => hotplug-base.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{hugepages-default-1G-nodeset-2M.err => hugepages-default-1G-nodeset-2M.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-memaccess-invalid.err => hugepages-memaccess-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-memaccess3.err => hugepages-memaccess3.x86_64-5.1.0.err} (100%) delete mode 100644 tests/qemuxml2argvdata/input-usbmouse-addr.args create mode 100644 tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/input-usbtablet.args create mode 100644 tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args rename tests/qemuxml2argvdata/{kvm-pit-delay.args => kvm-pit-delay.x86_64-latest.args} (62%) rename tests/qemuxml2argvdata/{kvm-pit-discard.args => kvm-pit-discard.x86_64-latest.args} (62%) rename tests/qemuxml2argvdata/{kvmclock.args => kvmclock.x86_64-latest.args} (64%) delete mode 100644 tests/qemuxml2argvdata/machine-aliases1.args create mode 100644 tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-host-passthrough-features.args => machine-aliases2.x86_64-latest.args} (61%) create mode 100644 tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/machine-core-on.args rename tests/qemuxml2argvdata/{balloon-device-period.args => machine-core-on.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{machine-loadparm-s390-char-invalid.err => machine-loadparm-s390-char-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{machine-loadparm-s390-len-invalid.err => machine-loadparm-s390-len-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/machine-vmport-opt.args create mode 100644 tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args rename tests/qemuxml2argvdata/{memory-align-fail.err => memory-align-fail.x86_64-latest.err} (100%) create mode 100644 tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args rename tests/qemuxml2argvdata/{memory-hotplug-invalid-targetnode.err => memory-hotplug-invalid-targetnode.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{memory-hotplug-nonuma.err => memory-hotplug-nonuma.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/memory-hotplug.args rename tests/qemuxml2argvdata/{memory-hotplug-dimm.args => memory-hotplug.x86_64-latest.args} (58%) delete mode 100644 tests/qemuxml2argvdata/memtune-unlimited.args create mode 100644 tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/memtune.args create mode 100644 tests/qemuxml2argvdata/memtune.x86_64-latest.args rename tests/qemuxml2argvdata/{migrate-numa-unaligned.args => migrate-numa-unaligned.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{migrate.args => migrate.x86_64-latest.args} (65%) rename tests/qemuxml2argvdata/{minimal-no-memory.err => minimal-no-memory.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/minimal.args create mode 100644 tests/qemuxml2argvdata/minimal.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/misc-acpi.args rename tests/qemuxml2argvdata/{balloon-device-deflate.args => misc-acpi.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{misc-disable-s3.args => misc-disable-s3.x86_64-latest.args} (65%) rename tests/qemuxml2argvdata/{misc-disable-suspends.args => misc-disable-suspends.x86_64-latest.args} (65%) delete mode 100644 tests/qemuxml2argvdata/misc-enable-s4.err rename tests/qemuxml2argvdata/{misc-enable-s4.args => misc-enable-s4.x86_64-latest.args} (65%) delete mode 100644 tests/qemuxml2argvdata/misc-uuid.args rename tests/qemuxml2argvdata/{balloon-device-auto.args => misc-uuid.x86_64-latest.args} (64%) delete mode 100644 tests/qemuxml2argvdata/monitor-json.args delete mode 100644 tests/qemuxml2argvdata/multifunction-pci-device.args create mode 100644 tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args rename tests/qemuxml2argvdata/{nosharepages.args => nosharepages.x86_64-latest.args} (64%) delete mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args create mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args create mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args rename tests/qemuxml2argvdata/{numad-auto-vcpu-static-numatune-no-nodeset.err => numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args create mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args create mode 100644 tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/numad.args create mode 100644 tests/qemuxml2argvdata/numad.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args create mode 100644 tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args rename tests/qemuxml2argvdata/{numatune-auto-prefer.args => numatune-auto-prefer.x86_64-latest.args} (56%) rename tests/qemuxml2argvdata/{numatune-distances.args => numatune-distances.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{numatune-memnode-invalid-mode.err => numatune-memnode-invalid-mode.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numatune-memnode-no-memory.args => numatune-memnode-no-memory.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{numatune-memnode-nocpu.err => numatune-memnode-nocpu.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.args rename tests/qemuxml2argvdata/{numatune-memnodes-problematic.err => numatune-memnodes-problematic.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numatune-memory-invalid-nodeset.err => numatune-memory-invalid-nodeset.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numatune-memory.args delete mode 100644 tests/qemuxml2argvdata/numatune-memory.xml rename tests/qemuxml2argvdata/{numatune-static-nodeset-exceed-hostnode.err => numatune-static-nodeset-exceed-hostnode.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/parallel-parport-chardev.args delete mode 100644 tests/qemuxml2argvdata/parallel-tcp-chardev.args delete mode 100644 tests/qemuxml2argvdata/pci-autoadd-addr.args create mode 100644 tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/pci-autoadd-idx.args create mode 100644 tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-autofill-addr.args => pci-autofill-addr.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{pci-bridge-duplicate-index.err => pci-bridge-duplicate-index.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-bridge-many-disks.args => pci-bridge-many-disks.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{pci-bridge-negative-index-invalid.err => pci-bridge-negative-index-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/pci-bridge.args create mode 100644 tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-bus-invalid.err => pci-bus-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-domain-invalid.err => pci-domain-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-expander-bus-bad-bus.err => pci-expander-bus-bad-bus.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-expander-bus-bad-machine.err => pci-expander-bus-bad-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-expander-bus-bad-node.err => pci-expander-bus-bad-node.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/pci-expander-bus.args create mode 100644 tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-function-invalid.err => pci-function-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-many.args => pci-many.x86_64-latest.args} (67%) delete mode 120000 tests/qemuxml2argvdata/pci-rom-disabled-invalid.args create mode 120000 tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-rom-disabled.args => pci-rom-disabled.x86_64-latest.args} (58%) create mode 100644 tests/qemuxml2argvdata/pci-rom.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-root-address.err => pci-root-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-root-nonzero-index.err => pci-root-nonzero-index.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/pci-serial-dev-chardev.args rename tests/qemuxml2argvdata/{pci-slot-invalid.err => pci-slot-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pcie-expander-bus-bad-bus.err => pcie-expander-bus-bad-bus.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pcie-expander-bus-bad-machine.err => pcie-expander-bus-bad-machine.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/pcie-expander-bus.args create mode 100644 tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args rename tests/qemuxml2argvdata/{pcie-root-port-model-ioh3420.args => pcie-root-port-model-generic.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{pcie-root-port-model-generic.args => pcie-root-port-model-ioh3420.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{pcie-root-port-too-many.err => pcie-root-port-too-many.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pcie-root-port.args => pcie-root-port.x86_64-latest.args} (53%) rename tests/qemuxml2argvdata/{pcie-root.args => pcie-root.x86_64-latest.args} (55%) delete mode 100644 tests/qemuxml2argvdata/pcie-switch-downstream-port.args create mode 100644 tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/pcie-switch-upstream-port.args create mode 100644 tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args rename tests/qemuxml2argvdata/{pcihole64-q35.args => pcihole64-q35.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{pcihole64.args => pcihole64.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{pmu-feature-off.args => pmu-feature-off.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{pmu-feature.args => pmu-feature.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{pseries-features-invalid-machine.err => pseries-features-invalid-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pseries-serial-invalid-machine.err => pseries-serial-invalid-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{q35-dmi-bad-address1.err => q35-dmi-bad-address1.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{q35-dmi-bad-address2.err => q35-dmi-bad-address2.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/q35-pci-force-address.args create mode 100644 tests/qemuxml2argvdata/q35-pci-force-address.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.args delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.xml delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.args delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.xml delete mode 100644 tests/qemuxml2argvdata/q35-usb2-multi.args create mode 100644 tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-usb2-reorder.args create mode 100644 tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args rename tests/qemuxml2argvdata/{q35-wrong-root.err => q35-wrong-root.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/q35.args rename tests/qemuxml2argvdata/{q35-usb2.args => q35.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{qemu-ns-no-env.args => qemu-ns-alt.x86_64-latest.args} (61%) delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-ns0.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args rename tests/qemuxml2argvdata/{qemu-ns-alt.args => qemu-ns-no-env.x86_64-latest.args} (65%) rename tests/qemuxml2argvdata/{reboot-timeout-disabled.args => reboot-timeout-disabled.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{reboot-timeout-enabled.args => reboot-timeout-enabled.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{restore-v2-fd.args => restore-v2-fd.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{restore-v2.args => restore-v2.x86_64-latest.args} (65%) delete mode 100644 tests/qemuxml2argvdata/seclabel-dac-none.args create mode 100644 tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args rename tests/qemuxml2argvdata/{seclabel-device-duplicates.err => seclabel-device-duplicates.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{seclabel-device-relabel-invalid.err => seclabel-device-relabel-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args rename tests/qemuxml2argvdata/{seclabel-dynamic-override.args => seclabel-dynamic-override.x86_64-latest.args} (63%) delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-relabel.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args rename tests/qemuxml2argvdata/{seclabel-multiple.err => seclabel-multiple.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/seclabel-none.args create mode 100644 tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/seclabel-static-labelskip.args create mode 100644 tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/seclabel-static-relabel.args create mode 100644 tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/seclabel-static.args create mode 100644 tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev-iobase.args delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-file-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-file-log.args delete mode 100644 tests/qemuxml2argvdata/serial-many-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-pty-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-spiceport.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-udp-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-vc-chardev.args create mode 100644 tests/qemuxml2argvdata/smartcard-controller.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates-database.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates.args create mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/smartcard-host.args create mode 100644 tests/qemuxml2argvdata/smartcard-host.x86_64-latest.args rename tests/qemuxml2argvdata/{smartcard-passthrough-spicevmc.args => smartcard-passthrough-spicevmc.x86_64-latest.args} (52%) rename tests/qemuxml2argvdata/{smartcard-passthrough-tcp.args => smartcard-passthrough-tcp.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{smbios-date.err => smbios-date.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{smbios-uuid-match.err => smbios-uuid-match.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{smbios.args => smbios.x86_64-latest.args} (70%) delete mode 100644 tests/qemuxml2argvdata/smp-dies.args delete mode 100644 tests/qemuxml2argvdata/smp.args rename tests/qemuxml2argvdata/{tpm-no-backend-invalid.err => tpm-no-backend-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-bus-missing.err => usb-bus-missing.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{clock-utc.args => usb-controller-default-i440fx.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{usb-controller.xml => usb-controller-default-i440fx.xml} (100%) create mode 100644 tests/qemuxml2argvdata/usb-controller-default-isapc.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/usb-controller-default-isapc.xml rename tests/qemuxml2argvdata/{usb-controller-default-q35.args => usb-controller-default-q35.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{smartcard-controller.args => usb-controller-default-unavailable-i440fx.x86_64-latest.args} (63%) create mode 120000 tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.xml rename tests/qemuxml2argvdata/{usb-controller-default-unavailable-q35.err => usb-controller-default-unavailable-q35.x86_64-latest.err} (100%) delete mode 120000 tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml create mode 100644 tests/qemuxml2argvdata/usb-controller-ich9-autoassign.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-ich9-autoassign.xml => usb-controller-ich9-autoassign.xml} (100%) create mode 100644 tests/qemuxml2argvdata/usb-controller-ich9-companion.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-ich9-companion.xml => usb-controller-ich9-companion.xml} (100%) create mode 100644 tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-ich9-ehci-addr.xml => usb-controller-ich9-ehci-addr.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-no-companion.err => usb-controller-ich9-no-companion.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-ich9-no-companion.xml => usb-controller-ich9-no-companion.xml} (100%) rename tests/qemuxml2argvdata/{smartcard-host-certificates-database.args => usb-controller-implicit-i440fx.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{usb-controller-xhci.xml => usb-controller-implicit-i440fx.xml} (86%) rename tests/qemuxml2argvdata/{acpi-table.args => usb-controller-implicit-isapc.x86_64-latest.args} (67%) create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.xml rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.err => usb-controller-nec-xhci-limit.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.xml => usb-controller-nec-xhci-limit.xml} (100%) rename tests/qemuxml2argvdata/{usb-controller-explicit-unavailable-q35.err => usb-controller-nec-xhci-unavailable.x86_64-latest.err} (100%) create mode 120000 tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.args => usb-controller-nec-xhci.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.xml => usb-controller-nec-xhci.xml} (100%) create mode 100644 tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-xhci-autoassign.xml => usb-controller-nex-xhci-autoassign.xml} (100%) rename tests/qemuxml2argvdata/{input-usbmouse.args => usb-controller-piix3.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{usb-piix3-controller.xml => usb-controller-piix3.xml} (100%) rename tests/qemuxml2argvdata/{usb-controller-qemu-xhci-limit.err => usb-controller-qemu-xhci-limit.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.err delete mode 120000 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml delete mode 100644 tests/qemuxml2argvdata/usb-controller-qemu-xhci.args rename tests/qemuxml2argvdata/{serial-unix-chardev.args => usb-controller-qemu-xhci.x86_64-latest.args} (63%) delete mode 100644 tests/qemuxml2argvdata/usb-controller-xhci.args delete mode 100644 tests/qemuxml2argvdata/usb-controller.args delete mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args create mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd.args create mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-hub-conflict.err => usb-hub-conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-hub-nonexistent.err => usb-hub-nonexistent.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-hub.args create mode 100644 tests/qemuxml2argvdata/usb-hub.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-ich9-autoassign.args delete mode 100644 tests/qemuxml2argvdata/usb-ich9-companion.args delete mode 100644 tests/qemuxml2argvdata/usb-ich9-ehci-addr.args delete mode 100644 tests/qemuxml2argvdata/usb-long-port-path.args create mode 100644 tests/qemuxml2argvdata/usb-long-port-path.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-none-hub.err => usb-none-hub.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-none-other.err => usb-none-other.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-none-usbtablet.err => usb-none-usbtablet.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-none.args create mode 100644 tests/qemuxml2argvdata/usb-none.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-port-autoassign.args create mode 100644 tests/qemuxml2argvdata/usb-port-autoassign.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-port-missing.args create mode 100644 tests/qemuxml2argvdata/usb-port-missing.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-ports-out-of-range.err => usb-ports-out-of-range.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-ports.args create mode 100644 tests/qemuxml2argvdata/usb-ports.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-redir-boot.args create mode 100644 tests/qemuxml2argvdata/usb-redir-boot.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-redir-filter-version.args create mode 100644 tests/qemuxml2argvdata/usb-redir-filter-version.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-redir-filter.args create mode 100644 tests/qemuxml2argvdata/usb-redir-filter.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-redir.args create mode 100644 tests/qemuxml2argvdata/usb-redir.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-too-long-port-path-invalid.err => usb-too-long-port-path-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-xhci-autoassign.args delete mode 100644 tests/qemuxml2argvdata/usb1-usb2.args create mode 100644 tests/qemuxml2argvdata/usb1-usb2.x86_64-latest.args rename tests/qemuxml2argvdata/{vhost_queues-invalid.err => vhost_queues-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/virtio-input-passthrough.args create mode 100644 tests/qemuxml2argvdata/virtio-input-passthrough.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/virtio-input.args create mode 100644 tests/qemuxml2argvdata/virtio-input.x86_64-latest.args rename tests/qemuxml2argvdata/{virtio-options-memballoon-freepage-reporting.err => virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err} (100%) delete mode 100644 tests/qemuxml2argvdata/virtio-rng-default.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-default.x86_64-latest.args rename tests/qemuxml2argvdata/{virtio-rng-egd-crash.err => virtio-rng-egd-crash.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{virtio-rng-egd.args => virtio-rng-egd.x86_64-latest.args} (54%) delete mode 100644 tests/qemuxml2argvdata/virtio-rng-multiple.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-multiple.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/virtio-rng-random.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-random.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/vmcoreinfo.args create mode 100644 tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args rename tests/qemuxml2xmloutdata/{usb-controller.x86_64-latest.xml => usb-controller-default-i440fx.x86_64-latest.xml} (100%) rename tests/{qemuxml2argvdata/smp.xml => qemuxml2xmloutdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml} (57%) rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.x86_64-latest.xml => usb-controller-ich9-ehci-addr.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{smp.x86_64-latest.xml => usb-controller-implicit-i440fx.x86_64-latest.xml} (65%) rename tests/{qemuxml2argvdata/smp-dies.xml => qemuxml2xmloutdata/usb-controller-implicit-isapc.x86_64-latest.xml} (50%) create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x86_64-latest.xml rename tests/qemuxml2xmloutdata/{usb-controller-explicit-q35.x86_64-latest.xml => usb-controller-nec-xhci.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{usb-piix3-controller.x86_64-latest.xml => usb-controller-piix3.x86_64-latest.xml} (100%) -- 2.41.0

The support for PIIX power management was added in qemu commit v1.0-3094-g459ae5ea5a and the suport for ICH9 power management was added in qemu commit v2.2.0-542-g6ac0d8d44c and both can't be compiled out. This means we can always assume support for these features. Remove the validation and impossible tests. Move relevant bits from 'q35-pm-disable' to 'q35' test case. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 40 +++++++------------ src/qemu/qemu_validate.c | 37 ++--------------- tests/qemuxml2argvdata/misc-enable-s4.err | 1 - .../q35-pm-disable-fallback.args | 37 ----------------- .../q35-pm-disable-fallback.xml | 18 --------- tests/qemuxml2argvdata/q35-pm-disable.args | 37 ----------------- tests/qemuxml2argvdata/q35-pm-disable.xml | 18 --------- tests/qemuxml2argvdata/q35.args | 2 + tests/qemuxml2argvdata/q35.xml | 4 ++ tests/qemuxml2argvtest.c | 18 ++------- .../qemuxml2xmloutdata/q35.x86_64-latest.xml | 4 ++ 11 files changed, 31 insertions(+), 185 deletions(-) delete mode 100644 tests/qemuxml2argvdata/misc-enable-s4.err delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.args delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.xml delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.args delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a55218d5fd..f7079c6920 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6047,7 +6047,7 @@ qemuBuildClockCommandLine(virCommand *cmd, } -static int +static void qemuBuildPMCommandLine(virCommand *cmd, const virDomainDef *def, qemuDomainObjPrivate *priv) @@ -6075,35 +6075,24 @@ qemuBuildPMCommandLine(virCommand *cmd, virCommandAddArg(cmd, "-no-acpi"); } - /* We fall back to PIIX4_PM even for q35, since it's what we did - pre-q35-pm support. QEMU starts up fine (with a warning) if - mixing PIIX PM and -M q35. Starting to reject things here - could mean we refuse to start existing configs in the wild.*/ - if (def->pm.s3) { + if (def->pm.s3 || def->pm.s4) { const char *pm_object = "PIIX4_PM"; - if (qemuDomainIsQ35(def) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_S3)) + if (qemuDomainIsQ35(def)) pm_object = "ICH9-LPC"; - virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "%s.disable_s3=%d", - pm_object, def->pm.s3 == VIR_TRISTATE_BOOL_NO); - } - - if (def->pm.s4) { - const char *pm_object = "PIIX4_PM"; - - if (qemuDomainIsQ35(def) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_S4)) - pm_object = "ICH9-LPC"; + if (def->pm.s3) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.disable_s3=%d", + pm_object, def->pm.s3 == VIR_TRISTATE_BOOL_NO); + } - virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "%s.disable_s4=%d", - pm_object, def->pm.s4 == VIR_TRISTATE_BOOL_NO); + if (def->pm.s4) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.disable_s4=%d", + pm_object, def->pm.s4 == VIR_TRISTATE_BOOL_NO); + } } - - return 0; } @@ -10444,8 +10433,7 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildClockCommandLine(cmd, def, qemuCaps) < 0) return NULL; - if (qemuBuildPMCommandLine(cmd, def, priv) < 0) - return NULL; + qemuBuildPMCommandLine(cmd, def, priv); if (qemuBuildBootCommandLine(cmd, def) < 0) return NULL; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 8f9e8fd7f0..d5fe1cbd73 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -588,38 +588,6 @@ qemuValidateDomainDefClockTimers(const virDomainDef *def, } -static int -qemuValidateDomainDefPM(const virDomainDef *def, - virQEMUCaps *qemuCaps) -{ - bool q35Dom = qemuDomainIsQ35(def); - - if (def->pm.s3) { - bool q35ICH9_S3 = q35Dom && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_S3); - - if (!q35ICH9_S3 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABLE_S3)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("setting ACPI S3 not supported")); - return -1; - } - } - - if (def->pm.s4) { - bool q35ICH9_S4 = q35Dom && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_S4); - - if (!q35ICH9_S4 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABLE_S4)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("setting ACPI S4 not supported")); - return -1; - } - } - - return 0; -} - - static int qemuValidateDomainDefNvram(const virDomainDef *def, virQEMUCaps *qemuCaps) @@ -1279,8 +1247,11 @@ qemuValidateDomainDef(const virDomainDef *def, if (qemuValidateDomainDefClockTimers(def, qemuCaps) < 0) return -1; - if (qemuValidateDomainDefPM(def, qemuCaps) < 0) + if ((def->pm.s3 || def->pm.s4) && !ARCH_IS_X86(def->os.arch)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("setting ACPI S3/S4 not supported")); return -1; + } if (qemuValidateDomainDefBoot(def, qemuCaps) < 0) return -1; diff --git a/tests/qemuxml2argvdata/misc-enable-s4.err b/tests/qemuxml2argvdata/misc-enable-s4.err deleted file mode 100644 index a256b75792..0000000000 --- a/tests/qemuxml2argvdata/misc-enable-s4.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: setting ACPI S4 not supported diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args deleted file mode 100644 index 924e3087fb..0000000000 --- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-q35 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-q35/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-q35/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=q35,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35/master-key.aes \ --machine q35,usb=off,dump-guest-core=off \ --accel tcg \ --m size=1048576k \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --global PIIX4_PM.disable_s3=1 \ --global PIIX4_PM.disable_s4=1 \ --boot strict=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=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --global ICH9-LPC.noreboot=off \ --watchdog-action reset \ --device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml b/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml deleted file mode 100644 index 386391b270..0000000000 --- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml +++ /dev/null @@ -1,18 +0,0 @@ -<domain type='qemu'> - <name>q35</name> - <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='q35'>hvm</type> - <boot dev='network'/> - </os> - <pm> - <suspend-to-mem enabled='no'/> - <suspend-to-disk enabled='no'/> - </pm> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2argvdata/q35-pm-disable.args deleted file mode 100644 index f50ddcc118..0000000000 --- a/tests/qemuxml2argvdata/q35-pm-disable.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-q35 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-q35/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-q35/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=q35,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35/master-key.aes \ --machine q35,usb=off,dump-guest-core=off \ --accel tcg \ --m size=1048576k \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --global ICH9-LPC.disable_s3=1 \ --global ICH9-LPC.disable_s4=1 \ --boot strict=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=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --global ICH9-LPC.noreboot=off \ --watchdog-action reset \ --device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-pm-disable.xml b/tests/qemuxml2argvdata/q35-pm-disable.xml deleted file mode 100644 index 386391b270..0000000000 --- a/tests/qemuxml2argvdata/q35-pm-disable.xml +++ /dev/null @@ -1,18 +0,0 @@ -<domain type='qemu'> - <name>q35</name> - <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='q35'>hvm</type> - <boot dev='network'/> - </os> - <pm> - <suspend-to-mem enabled='no'/> - <suspend-to-disk enabled='no'/> - </pm> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args index e4cb36b1d0..638c79d45f 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -24,6 +24,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -rtc base=utc \ -no-shutdown \ -no-acpi \ +-global ICH9-LPC.disable_s3=1 \ +-global ICH9-LPC.disable_s4=0 \ -boot strict=on \ -device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \ -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \ diff --git a/tests/qemuxml2argvdata/q35.xml b/tests/qemuxml2argvdata/q35.xml index 22a7aca47b..30697fb940 100644 --- a/tests/qemuxml2argvdata/q35.xml +++ b/tests/qemuxml2argvdata/q35.xml @@ -8,6 +8,10 @@ <type arch='x86_64' machine='q35'>hvm</type> <boot dev='hd'/> </os> + <pm> + <suspend-to-mem enabled='no'/> + <suspend-to-disk enabled='yes'/> + </pm> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1e6cbbf028..5d23c552c5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1394,10 +1394,9 @@ mymain(void) DO_TEST_NOCAPS("input-usbmouse"); DO_TEST_NOCAPS("input-usbtablet"); DO_TEST_NOCAPS("misc-acpi"); - DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3); - DO_TEST("misc-disable-suspends", QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4); - DO_TEST("misc-enable-s4", QEMU_CAPS_PIIX_DISABLE_S4); - DO_TEST_PARSE_ERROR_NOCAPS("misc-enable-s4"); + DO_TEST_NOCAPS("misc-disable-s3"); + DO_TEST_NOCAPS("misc-disable-suspends"); + DO_TEST_NOCAPS("misc-enable-s4"); DO_TEST_CAPS_VER("misc-no-reboot", "5.2.0"); DO_TEST_CAPS_LATEST("misc-no-reboot"); DO_TEST_NOCAPS("misc-uuid"); @@ -2135,17 +2134,6 @@ mymain(void) QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420); - DO_TEST("q35-pm-disable", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, - QEMU_CAPS_ICH9_DISABLE_S3, QEMU_CAPS_ICH9_DISABLE_S4); - DO_TEST("q35-pm-disable-fallback", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4); DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable"); DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable"); DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5.1.0"); diff --git a/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml b/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml index 909f94fe2c..3303370e7a 100644 --- a/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml @@ -15,6 +15,10 @@ <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> + <pm> + <suspend-to-mem enabled='no'/> + <suspend-to-disk enabled='yes'/> + </pm> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> -- 2.41.0

Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 12 ++++-------- src/qemu/qemu_capabilities.h | 8 ++++---- tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 4 ---- 19 files changed, 8 insertions(+), 72 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ea4e248349..b52e25a072 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -208,8 +208,8 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 100 */ "virtio-scsi-pci", /* QEMU_CAPS_VIRTIO_SCSI */ "blockio", /* X_QEMU_CAPS_BLOCKIO */ - "disable-s3", /* QEMU_CAPS_PIIX_DISABLE_S3 */ - "disable-s4", /* QEMU_CAPS_PIIX_DISABLE_S4 */ + "disable-s3", /* X_QEMU_CAPS_PIIX_DISABLE_S3 */ + "disable-s4", /* X_QEMU_CAPS_PIIX_DISABLE_S4 */ "usb-redir.filter", /* QEMU_CAPS_USB_REDIR_FILTER */ /* 105 */ @@ -354,8 +354,8 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 205 */ "chardev-file-append", /* X_QEMU_CAPS_CHARDEV_FILE_APPEND */ - "ich9-disable-s3", /* QEMU_CAPS_ICH9_DISABLE_S3 */ - "ich9-disable-s4", /* QEMU_CAPS_ICH9_DISABLE_S4 */ + "ich9-disable-s3", /* X_QEMU_CAPS_ICH9_DISABLE_S3 */ + "ich9-disable-s4", /* X_QEMU_CAPS_ICH9_DISABLE_S4 */ "vserport-change-event", /* X_QEMU_CAPS_VSERPORT_CHANGE */ "virtio-balloon-pci.deflate-on-oom", /* QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE */ @@ -1457,8 +1457,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[] = { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = { - { "disable_s3", QEMU_CAPS_PIIX_DISABLE_S3, NULL }, - { "disable_s4", QEMU_CAPS_PIIX_DISABLE_S4, NULL }, { "acpi-root-pci-hotplug", QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG, NULL }, }; @@ -1493,8 +1491,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioGpu[] = { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsICH9[] = { - { "disable_s3", QEMU_CAPS_ICH9_DISABLE_S3, NULL }, - { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ba289ba6b9..642a4762b3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -186,8 +186,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 100 */ QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ X_QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ - QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ - QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ + X_QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ + X_QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ /* 105 */ @@ -332,8 +332,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 205 */ X_QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=on|off */ - QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ - QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ + X_QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ + X_QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ X_QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}. * deflate-on-oom */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml index bf920a74c4..3c197af464 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -25,8 +25,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -72,8 +70,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml index 8fa4148232..dc107952ca 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -25,8 +25,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -72,8 +70,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml index c0f3444d85..ddd3b560ab 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -25,8 +25,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -72,8 +70,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml index 6bd531a825..7162ca6a18 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -25,8 +25,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -72,8 +70,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml index 4223eb1a2e..77890694ad 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -71,8 +69,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml index cacfd6969f..563c337b23 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index 914cda2048..b18d0509c2 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -20,8 +20,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='vnc'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index 4792691285..a33911ff3c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index 748b897f70..6f29b29632 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index 8d026d540d..ce16662d6b 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 310b8f9d75..67d9b23e79 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -23,8 +23,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 07e8c57f27..56422fbdf8 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index b8d4d4888c..e5df1832b7 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 928270d287..69e35c7133 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -23,8 +23,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -69,8 +67,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index a889c1b034..b2fd5794cc 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index 6d105e78a9..3613dfd4cc 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index adcf594138..965ba37c7f 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> -- 2.41.0

Internally the preferred machine which is 'pc' for x86_64 must be kept in the first place in the array of machines. This was not the case when stripping the machine aliases for use in tests (so that test output stays stable) where we've created a new entry for the alias. This means that the original name (e.g. pc-i440fx-8.1) stayed in the first place. To fix this we now swap the names around and create a new entry at the end for the specific type. Additionally the default flag is not propagated to the copy. This is also visible now in the output of 'qemuxml2xmltest' as the test cases which use the default machine type return to 'pc' instead of the more specific name. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 21 +++++++++++++++---- .../default-kvm-host-arch.x86_64-latest.xml | 2 +- .../default-qemu-host-arch.x86_64-latest.xml | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b52e25a072..972f3e24ee 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6756,11 +6756,21 @@ virQEMUCapsStripMachineAliasesForVirtType(virQEMUCaps *qemuCaps, for (i = 0; i < accel->nmachineTypes; i++) { virQEMUCapsMachineType *mach = &accel->machineTypes[i]; - g_autofree char *name = g_steal_pointer(&mach->alias); - if (name) { - virQEMUCapsAddMachine(qemuCaps, virtType, name, NULL, mach->defaultCPU, - mach->maxCpus, mach->hotplugCpus, mach->qemuDefault, + if (mach->alias) { + g_autofree char *origName = g_steal_pointer(&mach->name); + + /* The preferred machine type, which is generally the default by qemu + * in most cases but also generally an alias needs to be kept at the + * first entry in the list, because virQEMUCapsGetPreferredMachine + * picks the first element. Thus we create a new entry for the + * original machine name and replace the existing one by the alias. */ + mach->name = g_steal_pointer(&mach->alias); + + /* also de-assert the copy's default flag, to ensure we don't have multiple + * machines with it */ + virQEMUCapsAddMachine(qemuCaps, virtType, origName, NULL, mach->defaultCPU, + mach->maxCpus, mach->hotplugCpus, false, mach->numaMemSupported, mach->defaultRAMid, mach->deprecated, mach->acpi); } @@ -6778,6 +6788,9 @@ virQEMUCapsStripMachineAliasesForVirtType(virQEMUCaps *qemuCaps, * * Remove all aliases so that the tests depending on the latest capabilities * file can be stable when new files are added. + * + * Additionally if a machine type is default, only the copy created for the + * alias will be kept as default to eliminate churn in output files. */ void virQEMUCapsStripMachineAliases(virQEMUCaps *qemuCaps) diff --git a/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml b/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml index a9de07d41c..c5f03ff2c1 100644 --- a/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>4194304</currentMemory> <vcpu placement='static'>4</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-8.1'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu mode='custom' match='exact' check='none'> diff --git a/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml b/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml index 37673010f6..36ed26c473 100644 --- a/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>4194304</currentMemory> <vcpu placement='static'>4</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-8.1'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu mode='custom' match='exact' check='none'> -- 2.41.0

If a test uses ARG_CAPS_HOST_CPU_MODEL feature we override the global host cpu model to the selected CPU but don't clear it afterwards. This can trip up fake caps tests following a test which uses this feature. This does not happen with real caps, because unless overriden, the host cpu from capabilities is always populated as the host cpu. Clear the CPU on cleanup. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvtest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5d23c552c5..32affb16c0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -713,6 +713,9 @@ testCompareXMLToArgv(const void *data) ret = 0; cleanup: + /* clear overriden host cpu */ + if (info->args.capsHostCPUModel) + qemuTestSetHostCPU(&driver, driver.hostarch, NULL); virDomainChrSourceDefClear(&monitor_chr); virObjectUnref(vm); virIdentitySetCurrent(NULL); -- 2.41.0

At this point only x86_64 is using fake machines, and for real machines we don't populate the fake cpu models. Thus we can remove everything non-x86_64. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvtest.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 32affb16c0..3c2156118a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -270,15 +270,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy) "486", "coreduo", "kvm32", "qemu32", "kvm64", "core2duo", "phenom", "qemu64", }; - const char *armModels[] = { - "cortex-a9", "cortex-a8", "cortex-a57", "cortex-a53", - }; - const char *ppc64Models[] = { - "POWER8", "POWER7", - }; - const char *s390xModels[] = { - "z990", "zEC12", "z13", - }; if (ARCH_IS_X86(arch)) { if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, x86Models, @@ -300,27 +291,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy) VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0) return -1; } - } else if (ARCH_IS_ARM(arch)) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, armModels, - G_N_ELEMENTS(armModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0 || - virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, armModels, - G_N_ELEMENTS(armModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0) - return -1; - } else if (ARCH_IS_PPC64(arch)) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, ppc64Models, - G_N_ELEMENTS(ppc64Models), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0 || - virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, ppc64Models, - G_N_ELEMENTS(ppc64Models), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0) - return -1; - } else if (ARCH_IS_S390(arch)) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, s390xModels, - G_N_ELEMENTS(s390xModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0) - return -1; } return 0; -- 2.41.0

QMP monitor is the only thing we support at this point, thus all other tests test the same thing. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/monitor-json.args | 34 ------------------------ tests/qemuxml2argvdata/monitor-json.xml | 25 ----------------- tests/qemuxml2argvtest.c | 2 -- 3 files changed, 61 deletions(-) delete mode 100644 tests/qemuxml2argvdata/monitor-json.args delete mode 100644 tests/qemuxml2argvdata/monitor-json.xml diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args deleted file mode 100644 index 817806f5a4..0000000000 --- a/tests/qemuxml2argvdata/monitor-json.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=encryptdisk,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"file","filename":"/dev/hda1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/monitor-json.xml b/tests/qemuxml2argvdata/monitor-json.xml deleted file mode 100644 index d151884434..0000000000 --- a/tests/qemuxml2argvdata/monitor-json.xml +++ /dev/null @@ -1,25 +0,0 @@ -<domain type='qemu'> - <name>encryptdisk</name> - <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/dev/hda1'/> - <target dev='hda'/> - </disk> - <controller type='usb' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c2156118a..8238dceed8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1892,8 +1892,6 @@ mymain(void) DO_TEST("multifunction-pci-device", QEMU_CAPS_SCSI_LSI); - DO_TEST_NOCAPS("monitor-json"); - DO_TEST_NOCAPS("seclabel-dynamic"); DO_TEST_NOCAPS("seclabel-dynamic-baselabel"); DO_TEST_NOCAPS("seclabel-dynamic-override"); -- 2.41.0

All supported qemu versions have this feature and it can't be compiled out. The logic is a bit more complex in this instance as the flag is asserted if: if (ARCH_IS_X86(qemuCaps->arch) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); } Now QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION is available since qemu-2.8 but only on certain architectures, thus we need to keep the flag itself, but x86_64 is one of them. The flag can be also assumed as qemuValidateDomainDefCpu rejects any cache config on non-x86 arches. Remove any use of the capability and drop the impossible test cases. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 6 ++-- .../qemuxml2argvdata/cpu-cache-disable2.args | 32 ------------------- tests/qemuxml2argvdata/cpu-cache-disable2.xml | 20 ------------ .../cpu-cache-passthrough2.args | 32 ------------------- .../cpu-cache-passthrough2.xml | 20 ------------ tests/qemuxml2argvtest.c | 10 +++--- 6 files changed, 6 insertions(+), 114 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-cache-disable2.args delete mode 100644 tests/qemuxml2argvdata/cpu-cache-disable2.xml delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.args delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f7079c6920..a912ed064f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6560,12 +6560,10 @@ qemuBuildCpuCommandLine(virCommand *cmd, if (hostOff && (def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH || - def->cpu->mode == VIR_CPU_MODE_MAXIMUM) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_CACHE)) + def->cpu->mode == VIR_CPU_MODE_MAXIMUM)) virBufferAddLit(&buf, ",host-cache-info=off"); - if (l3Off && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_CACHE)) + if (l3Off) virBufferAddLit(&buf, ",l3-cache=off"); } diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args b/tests/qemuxml2argvdata/cpu-cache-disable2.args deleted file mode 100644 index adfad725aa..0000000000 --- a/tests/qemuxml2argvdata/cpu-cache-disable2.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-foo \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-foo/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-foo/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=foo,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel kvm \ --cpu host \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.xml b/tests/qemuxml2argvdata/cpu-cache-disable2.xml deleted file mode 100644 index e6f39951ca..0000000000 --- a/tests/qemuxml2argvdata/cpu-cache-disable2.xml +++ /dev/null @@ -1,20 +0,0 @@ -<domain type='kvm'> - <name>foo</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='host-passthrough'> - <cache mode='disable'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args deleted file mode 100644 index 37b27e450a..0000000000 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-foo \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-foo/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-foo/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=foo,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel kvm \ --cpu host,host-cache-info=on \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.xml b/tests/qemuxml2argvdata/cpu-cache-passthrough2.xml deleted file mode 100644 index 74846fdd31..0000000000 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.xml +++ /dev/null @@ -1,20 +0,0 @@ -<domain type='kvm'> - <name>foo</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='host-passthrough'> - <cache mode='passthrough'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8238dceed8..8afb2bf2be 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2521,12 +2521,10 @@ mymain(void) DO_TEST("cpu-check-default-partial", QEMU_CAPS_KVM); DO_TEST("cpu-check-default-partial2", QEMU_CAPS_KVM); - DO_TEST("cpu-cache-disable", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); - DO_TEST("cpu-cache-disable2", QEMU_CAPS_KVM); - DO_TEST("cpu-cache-disable3", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); - DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); - DO_TEST("cpu-cache-passthrough2", QEMU_CAPS_KVM); - DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); + DO_TEST("cpu-cache-disable", QEMU_CAPS_KVM); + DO_TEST("cpu-cache-disable3", QEMU_CAPS_KVM); + DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM); + DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("cpu-cache-passthrough3", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", QEMU_CAPS_KVM); -- 2.41.0

Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 7 +------ src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - 15 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 972f3e24ee..c1aca27d64 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -417,7 +417,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 250 */ "query-named-block-nodes", /* X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES */ - "cpu-cache", /* QEMU_CAPS_CPU_CACHE */ + "cpu-cache", /* X_QEMU_CAPS_CPU_CACHE */ "qemu-xhci", /* QEMU_CAPS_DEVICE_QEMU_XHCI */ "kernel-irqchip", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP */ "kernel-irqchip.split", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT */ @@ -5457,11 +5457,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps) static void virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) { - if (ARCH_IS_X86(qemuCaps->arch) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); - } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 642a4762b3..612ed03c1f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -396,7 +396,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 250 */ X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */ - QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */ + X_QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */ QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */ X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */ X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=split */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml index 3c197af464..87d4fc6308 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -86,7 +86,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml index dc107952ca..bd506fc3b3 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -86,7 +86,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml index ddd3b560ab..96ea862323 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -86,7 +86,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml index 7162ca6a18..7761b43708 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -86,7 +86,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml index 77890694ad..237268cb69 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -85,7 +85,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml index 563c337b23..d7fd5742df 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -84,7 +84,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index a33911ff3c..da548c8beb 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -84,7 +84,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index ce16662d6b..d4b9c16a52 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -84,7 +84,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 56422fbdf8..088c417f4d 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -84,7 +84,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 69e35c7133..d25f0c50b3 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -83,7 +83,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index b2fd5794cc..b29c52a643 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -84,7 +84,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index 3613dfd4cc..20625eee00 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -84,7 +84,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 965ba37c7f..a107d2c8dd 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -84,7 +84,6 @@ <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> - <flag name='cpu-cache'/> <flag name='qemu-xhci'/> <flag name='intel-iommu.intremap'/> <flag name='intel-iommu.caching-mode'/> -- 2.41.0

The 'display' option for the 'vfio-pci' device was added in qemu-2.12 and can't be compiled out. Assume support for the flag. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 11 ++++------- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +- tests/qemuxml2argvtest.c | 3 +-- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9781df1355..c7d64e1b5c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6034,13 +6034,11 @@ qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(virDomainHostdevDef *host static int -qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevsrc, - virQEMUCaps *qemuCaps) +qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevsrc) { /* QEMU 2.12 added support for vfio-pci display type, we default to * 'display=off' to stay safe from future changes */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY) && - mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI && + if (mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI && mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT) mdevsrc->display = VIR_TRISTATE_SWITCH_OFF; @@ -6050,7 +6048,6 @@ qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevsrc, static int qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev, - virQEMUCaps *qemuCaps, unsigned int parseFlags) { virDomainHostdevSubsys *subsys = &hostdev->source.subsys; @@ -6063,7 +6060,7 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev, if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV && - qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev, qemuCaps) < 0) + qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev) < 0) return -1; return 0; @@ -6213,7 +6210,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDef *dev, break; case VIR_DOMAIN_DEVICE_HOSTDEV: - ret = qemuDomainHostdevDefPostParse(dev->data.hostdev, qemuCaps, parseFlags); + ret = qemuDomainHostdevDefPostParse(dev->data.hostdev, parseFlags); break; case VIR_DOMAIN_DEVICE_TPM: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index d5fe1cbd73..1346bbfb44 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2341,12 +2341,6 @@ qemuValidateDomainMdevDefVFIOPCI(const virDomainHostdevDef *hostdev, if (dev->display == VIR_TRISTATE_SWITCH_ABSENT) return 0; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("display property of device vfio-pci is not supported by this version of QEMU")); - return -1; - } - if (dev->model != VIR_MDEV_MODEL_TYPE_VFIO_PCI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("<hostdev> attribute 'display' is only supported with model='vfio-pci'")); diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args index 2e49cff0e2..7c76cd5d15 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,bus=pci.0,addr=0x2 \ +-device vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,display=off,bus=pci.0,addr=0x2 \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8afb2bf2be..1fe2fafeab 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1714,8 +1714,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc-egl-headless"); DO_TEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_VFIO_PCI_DISPLAY); + QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-display-ramfb-multiple"); DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch", -- 2.41.0

Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- 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_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_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - 36 files changed, 2 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c1aca27d64..630be618bf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -503,7 +503,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine.pseries.cap-htm", /* X_QEMU_CAPS_MACHINE_PSERIES_CAP_HTM */ "usb-storage.werror", /* X_QEMU_CAPS_USB_STORAGE_WERROR */ "egl-headless", /* QEMU_CAPS_EGL_HEADLESS */ - "vfio-pci.display", /* QEMU_CAPS_VFIO_PCI_DISPLAY */ + "vfio-pci.display", /* X_QEMU_CAPS_VFIO_PCI_DISPLAY */ "blockdev", /* X_QEMU_CAPS_BLOCKDEV */ /* 315 */ @@ -1445,7 +1445,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioSCSI[] = { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = { - { "display", QEMU_CAPS_VFIO_PCI_DISPLAY, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 612ed03c1f..afc28620dd 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -482,7 +482,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */ X_QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */ QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */ - QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */ + X_QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */ X_QEMU_CAPS_BLOCKDEV, /* -blockdev and blockdev-add are supported */ /* 315 */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml index f4f52fc1af..72e6b614cf 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml @@ -77,7 +77,6 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml index baa05be2fb..9eff51672f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml @@ -78,7 +78,6 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml index 4f7c98377d..20d458e55d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml @@ -46,7 +46,6 @@ <flag name='screendump_device'/> <flag name='vhost-vsock'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='vfio-ap'/> <flag name='zpci'/> <flag name='memory-backend-memfd'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml index 87d4fc6308..28ccaa1271 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -107,7 +107,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml index 0b9eabd3da..9d90e25343 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml @@ -80,7 +80,6 @@ <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml index 481519c762..3e244da67e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml @@ -81,7 +81,6 @@ <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml index 60384517a1..a1393e843d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml @@ -79,7 +79,6 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml index bd506fc3b3..d40f771e77 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -107,7 +107,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml index 96ea862323..e26f946a63 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -106,7 +106,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml index d0c75c2bb9..46666a783f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml @@ -79,7 +79,6 @@ <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml index d86dab4482..0496d3f0d6 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='vhost-vsock'/> <flag name='tpm-emulator'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml index f57dc02b13..edd562898e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml @@ -77,7 +77,6 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml index d44ca2a121..0a18f55960 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml @@ -44,7 +44,6 @@ <flag name='screendump_device'/> <flag name='vhost-vsock'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='vfio-ap'/> <flag name='zpci'/> <flag name='memory-backend-memfd'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml index 7761b43708..387fa3c8c2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -106,7 +106,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml index 5f2e6c2e5b..6b7c40fb54 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml @@ -80,7 +80,6 @@ <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml index 19f23f22f1..483962c83b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml @@ -44,7 +44,6 @@ <flag name='screendump_device'/> <flag name='vhost-vsock'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='vfio-ap'/> <flag name='zpci'/> <flag name='memory-backend-memfd'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml index 237268cb69..daf47aa4b5 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -106,7 +106,6 @@ <flag name='mch.extended-tseg-mbytes'/> <flag name='sev-guest'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml index d7fd5742df..28f3a94617 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -104,7 +104,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml index 5cfce5eaa9..3a16a54ca7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml @@ -87,7 +87,6 @@ <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index b18d0509c2..fe1bffd491 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -76,7 +76,6 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='nvdimm.unarmed'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index da548c8beb..3f021441ed 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -104,7 +104,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml index 9a340e2566..45131f0b7f 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml @@ -86,7 +86,6 @@ <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml index f662cefb42..bbdd01b55a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml @@ -87,7 +87,6 @@ <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index 6f29b29632..047a867766 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -83,7 +83,6 @@ <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index d4b9c16a52..25d9725391 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -104,7 +104,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 67d9b23e79..4315241d1d 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -81,7 +81,6 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='memory-backend-file.pmem'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 088c417f4d..bd84750dc5 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -104,7 +104,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index e5df1832b7..a1fc441412 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -76,7 +76,6 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index d25f0c50b3..06a01a2c4c 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -103,7 +103,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index b29c52a643..8ac1529c30 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -104,7 +104,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml index 4aeb210ca7..31300d3d31 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml @@ -70,7 +70,6 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='memory-backend-file.pmem'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index 20625eee00..c2fa8eb028 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -104,7 +104,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index a7519021e2..427ee9d5c7 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -41,7 +41,6 @@ <flag name='screendump_device'/> <flag name='vhost-vsock'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='vfio-ap'/> <flag name='zpci'/> <flag name='memory-backend-memfd'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index a107d2c8dd..6f8c5a57b7 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -104,7 +104,6 @@ <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> <flag name='egl-headless'/> - <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='egl-headless.rendernode'/> -- 2.41.0

We've forgot to add test invocations with real caps for qemu versions starting with 6.2. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../cpu-host-model.x86_64-6.2.0.args | 39 +++++++++++++++++++ .../cpu-host-model.x86_64-7.0.0.args | 39 +++++++++++++++++++ .../cpu-host-model.x86_64-7.1.0.args | 39 +++++++++++++++++++ .../cpu-host-model.x86_64-7.2.0.args | 39 +++++++++++++++++++ .../cpu-host-model.x86_64-8.0.0.args | 38 ++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 6 files changed, 199 insertions(+) create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args new file mode 100644 index 0000000000..f65444948e --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-q35-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \ +-device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \ +-device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \ +-device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=off \ +-watchdog-action reset \ +-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args new file mode 100644 index 0000000000..8f8b1645d5 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-q35-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=off \ +-watchdog-action reset \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","addr":"0x0"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args new file mode 100644 index 0000000000..df03bafab3 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-q35-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,vmcb-clean=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=off \ +-watchdog-action reset \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","addr":"0x0"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args new file mode 100644 index 0000000000..7a796812fa --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-q35-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=off \ +-watchdog-action reset \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","addr":"0x0"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args new file mode 100644 index 0000000000..d63438e81c --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-q35-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=off \ +-watchdog-action reset \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","addr":"0x0"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1fe2fafeab..49041e7925 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1813,6 +1813,11 @@ mymain(void) DO_TEST_CAPS_VER("cpu-host-model", "5.2.0"); DO_TEST_CAPS_VER("cpu-host-model", "6.0.0"); DO_TEST_CAPS_VER("cpu-host-model", "6.1.0"); + DO_TEST_CAPS_VER("cpu-host-model", "6.2.0"); + DO_TEST_CAPS_VER("cpu-host-model", "7.0.0"); + DO_TEST_CAPS_VER("cpu-host-model", "7.1.0"); + DO_TEST_CAPS_VER("cpu-host-model", "7.2.0"); + DO_TEST_CAPS_VER("cpu-host-model", "8.0.0"); /* For this specific test we accept the increased likelihood of changes * if qemu updates the CPU model */ -- 2.41.0

All tests have already a real capability variant. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemuxml2argvdata/console-compat-auto.args | 36 --------------- .../console-compat-chardev.args | 36 --------------- tests/qemuxml2argvdata/console-compat.args | 35 -------------- .../parallel-parport-chardev.args | 36 --------------- .../parallel-tcp-chardev.args | 36 --------------- .../pci-serial-dev-chardev.args | 36 --------------- .../serial-dev-chardev-iobase.args | 36 --------------- .../qemuxml2argvdata/serial-dev-chardev.args | 36 --------------- .../qemuxml2argvdata/serial-file-chardev.args | 37 --------------- tests/qemuxml2argvdata/serial-file-log.args | 37 --------------- .../qemuxml2argvdata/serial-many-chardev.args | 39 ---------------- .../qemuxml2argvdata/serial-pty-chardev.args | 36 --------------- tests/qemuxml2argvdata/serial-spiceport.args | 38 --------------- .../qemuxml2argvdata/serial-tcp-chardev.args | 36 --------------- .../serial-tcp-telnet-chardev.args | 36 --------------- .../serial-tcp-tlsx509-chardev-verify.args | 39 ---------------- .../serial-tcp-tlsx509-chardev.args | 39 ---------------- .../serial-tcp-tlsx509-secret-chardev.args | 40 ---------------- .../qemuxml2argvdata/serial-udp-chardev.args | 38 --------------- .../qemuxml2argvdata/serial-unix-chardev.args | 35 -------------- tests/qemuxml2argvdata/serial-vc-chardev.args | 36 --------------- tests/qemuxml2argvtest.c | 46 ------------------- 22 files changed, 819 deletions(-) delete mode 100644 tests/qemuxml2argvdata/console-compat-auto.args delete mode 100644 tests/qemuxml2argvdata/console-compat-chardev.args delete mode 100644 tests/qemuxml2argvdata/console-compat.args delete mode 100644 tests/qemuxml2argvdata/parallel-parport-chardev.args delete mode 100644 tests/qemuxml2argvdata/parallel-tcp-chardev.args delete mode 100644 tests/qemuxml2argvdata/pci-serial-dev-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev-iobase.args delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-file-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-file-log.args delete mode 100644 tests/qemuxml2argvdata/serial-many-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-pty-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-spiceport.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-udp-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-unix-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-vc-chardev.args diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args deleted file mode 100644 index 12159aca7d..0000000000 --- a/tests/qemuxml2argvdata/console-compat-auto.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev pty,id=charserial0 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args deleted file mode 100644 index 12159aca7d..0000000000 --- a/tests/qemuxml2argvdata/console-compat-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev pty,id=charserial0 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args deleted file mode 100644 index 69439cba46..0000000000 --- a/tests/qemuxml2argvdata/console-compat.args +++ /dev/null @@ -1,35 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev pty,id=charserial0 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args deleted file mode 100644 index 0ced8a58ac..0000000000 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev parallel,id=charparallel0,path=/dev/parport0 \ --device isa-parallel,chardev=charparallel0,id=parallel0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args deleted file mode 100644 index 6ffc4cbf10..0000000000 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,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 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args deleted file mode 100644 index 7dbba6985d..0000000000 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev serial,id=charserial0,path=/dev/ttyS2 \ --device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args deleted file mode 100644 index d118e5a204..0000000000 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev serial,id=charserial0,path=/dev/ttyS2 \ --device isa-serial,chardev=charserial0,id=serial0,index=0,iobase=1016,irq=4 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args deleted file mode 100644 index 67e965d648..0000000000 --- a/tests/qemuxml2argvdata/serial-dev-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev serial,id=charserial0,path=/dev/ttyS2 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args deleted file mode 100644 index 5e0f9baab8..0000000000 --- a/tests/qemuxml2argvdata/serial-file-chardev.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --add-fd set=0,fd=1750,opaque=serial0-source \ --chardev file,id=charserial0,path=/dev/fdset/0,append=on \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args deleted file mode 100644 index 0068cf98ce..0000000000 --- a/tests/qemuxml2argvdata/serial-file-log.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --add-fd set=0,fd=1750,opaque=serial0-source \ --add-fd set=1,fd=1751,opaque=serial0-log \ --chardev file,id=charserial0,path=/dev/fdset/0,append=on,logfile=/dev/fdset/1,logappend=on \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args deleted file mode 100644 index 540a97ad65..0000000000 --- a/tests/qemuxml2argvdata/serial-many-chardev.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev pty,id=charserial0 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --add-fd set=0,fd=1750,opaque=serial1-source \ --chardev file,id=charserial1,path=/dev/fdset/0,append=on \ --device isa-serial,chardev=charserial1,id=serial1,index=1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args deleted file mode 100644 index 12159aca7d..0000000000 --- a/tests/qemuxml2argvdata/serial-pty-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev pty,id=charserial0 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args deleted file mode 100644 index ce8356ae48..0000000000 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --device usb-tablet,id=input0,bus=usb.0,port=1 \ --audiodev '{"id":"audio1","driver":"spice"}' \ --spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,seamless-migration=on \ --device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args deleted file mode 100644 index b204fcc650..0000000000 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev socket,id=charserial0,host=127.0.0.1,port=9999 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args deleted file mode 100644 index e8df25bd92..0000000000 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,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,index=0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args deleted file mode 100644 index bbc4b83808..0000000000 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --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,index=1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args deleted file mode 100644 index bbc4b83808..0000000000 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --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,index=1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args deleted file mode 100644 index 292953e184..0000000000 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args +++ /dev/null @@ -1,40 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --object secret,id=charserial1-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on,passwordid=charserial1-secret0 \ --chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \ --device isa-serial,chardev=charserial1,id=serial1,index=1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args deleted file mode 100644 index 0bf4f1c7af..0000000000 --- a/tests/qemuxml2argvdata/serial-udp-chardev.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev udp,id=charserial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,localport=9999 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --chardev udp,id=charserial1,host=,port=9999,localaddr=,localport=0 \ --device isa-serial,chardev=charserial1,id=serial1,index=1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args deleted file mode 100644 index f518b03568..0000000000 --- a/tests/qemuxml2argvdata/serial-unix-chardev.args +++ /dev/null @@ -1,35 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --chardev socket,id=charserial0,path=/tmp/serial.sock \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --chardev socket,id=charserial1,fd=1729,server=on,wait=off \ --device isa-serial,chardev=charserial1,id=serial1,index=1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args deleted file mode 100644 index 3d87049879..0000000000 --- a/tests/qemuxml2argvdata/serial-vc-chardev.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev vc,id=charserial0 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 49041e7925..fd8339a819 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1423,32 +1423,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("serial-file-log", - QEMU_CAPS_DEVICE_ISA_SERIAL); - driver.config->spiceTLS = 1; - DO_TEST("serial-spiceport", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_ISA_SERIAL); - driver.config->spiceTLS = 0; - - DO_TEST("console-compat", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("console-compat-auto", - QEMU_CAPS_DEVICE_ISA_SERIAL); - - DO_TEST("serial-vc-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-pty-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-dev-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-dev-chardev-iobase", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-file-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-unix-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-file-log"); driver.config->spiceTLS = 1; DO_TEST_CAPS_LATEST("serial-spiceport"); @@ -1464,45 +1438,25 @@ mymain(void) DO_TEST_CAPS_LATEST("serial-dev-chardev-iobase"); DO_TEST_CAPS_LATEST("serial-file-chardev"); DO_TEST_CAPS_LATEST("serial-unix-chardev"); - DO_TEST("serial-tcp-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-udp-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("serial-tcp-telnet-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-unix-chardev"); DO_TEST_CAPS_LATEST_PARSE_ERROR("serial-unix-missing-source"); DO_TEST_CAPS_LATEST("serial-tcp-chardev"); DO_TEST_CAPS_LATEST("serial-udp-chardev"); DO_TEST_CAPS_LATEST("serial-tcp-telnet-chardev"); driver.config->chardevTLS = 1; - DO_TEST("serial-tcp-tlsx509-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev"); driver.config->chardevTLSx509verify = 1; - DO_TEST("serial-tcp-tlsx509-chardev-verify", - QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-verify"); driver.config->chardevTLSx509verify = 0; DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls"); driver.config->chardevTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); - DO_TEST("serial-tcp-tlsx509-secret-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-secret-chardev"); VIR_FREE(driver.config->chardevTLSx509secretUUID); driver.config->chardevTLS = 0; - DO_TEST("serial-many-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST_NOCAPS("parallel-tcp-chardev"); - DO_TEST_NOCAPS("parallel-parport-chardev"); DO_TEST_CAPS_LATEST("serial-many-chardev"); DO_TEST_CAPS_LATEST("parallel-tcp-chardev"); DO_TEST_CAPS_LATEST("parallel-parport-chardev"); DO_TEST_CAPS_LATEST("parallel-unix-chardev"); - DO_TEST("console-compat-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("pci-serial-dev-chardev", - QEMU_CAPS_DEVICE_PCI_SERIAL); DO_TEST_CAPS_LATEST("console-compat-chardev"); DO_TEST_CAPS_LATEST("pci-serial-dev-chardev"); -- 2.41.0

Change DO_TEST_GIC so that it accepts the version and switch it to use DO_TEST_CAPS_ARCH_VER_FULL internally which will ensure that the output filenames conform to the format we use for real capabilities. This also allows us to convert a few of versioned tests to use this improved macro. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...ch64-gic-default-both.aarch64-latest.args} | 0 ...arch64-gic-default-v2.aarch64-latest.args} | 0 ...arch64-gic-default-v3.aarch64-latest.args} | 0 ...s => aarch64-gic-host.aarch64-latest.args} | 0 ...aarch64-gic-none-both.aarch64-latest.args} | 0 ... aarch64-gic-none-tcg.aarch64-latest.args} | 0 ...> aarch64-gic-none-v2.aarch64-latest.args} | 0 ...> aarch64-gic-none-v3.aarch64-latest.args} | 0 ...rgs => aarch64-gic-v2.aarch64-latest.args} | 0 ...rgs => aarch64-gic-v3.aarch64-latest.args} | 0 tests/qemuxml2argvtest.c | 79 +++++++------------ 11 files changed, 28 insertions(+), 51 deletions(-) rename tests/qemuxml2argvdata/{aarch64-gic-default-both.args => aarch64-gic-default-both.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-v2.args => aarch64-gic-default-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-v3.args => aarch64-gic-default-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-host.args => aarch64-gic-host.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-both.args => aarch64-gic-none-both.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-tcg.args => aarch64-gic-none-tcg.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-v2.args => aarch64-gic-none-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-v3.args => aarch64-gic-none-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-v2.args => aarch64-gic-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-v3.args => aarch64-gic-v3.aarch64-latest.args} (100%) diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/qemuxml2argvdata/aarch64-gic-default-both.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-both.args rename to tests/qemuxml2argvdata/aarch64-gic-default-both.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qemuxml2argvdata/aarch64-gic-default-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-v2.args rename to tests/qemuxml2argvdata/aarch64-gic-default-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qemuxml2argvdata/aarch64-gic-default-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-v3.args rename to tests/qemuxml2argvdata/aarch64-gic-default-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2argvdata/aarch64-gic-host.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-host.args rename to tests/qemuxml2argvdata/aarch64-gic-host.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemuxml2argvdata/aarch64-gic-none-both.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-both.args rename to tests/qemuxml2argvdata/aarch64-gic-none-both.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-tcg.args rename to tests/qemuxml2argvdata/aarch64-gic-none-tcg.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxml2argvdata/aarch64-gic-none-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-v2.args rename to tests/qemuxml2argvdata/aarch64-gic-none-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxml2argvdata/aarch64-gic-none-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-v3.args rename to tests/qemuxml2argvdata/aarch64-gic-none-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2argvdata/aarch64-gic-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-v2.args rename to tests/qemuxml2argvdata/aarch64-gic-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2argvdata/aarch64-gic-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-v3.args rename to tests/qemuxml2argvdata/aarch64-gic-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fd8339a819..92ff7e4b1c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -877,13 +877,8 @@ mymain(void) # define DO_TEST_NOCAPS(name) \ DO_TEST_FULL(name, "", ARG_END) -/* GIC tests use 'latest' capabilities */ -# define DO_TEST_GIC(name, gic) \ - DO_TEST_FULL(name, "", \ - ARG_GIC, gic, \ - ARG_CAPS_ARCH, "aarch64", \ - ARG_CAPS_VER, "latest", \ - ARG_END) +# define DO_TEST_GIC(name, ver, gic) \ + DO_TEST_CAPS_ARCH_VER_FULL(name, "aarch64", ver, ARG_GIC, gic, ARG_END) # define DO_TEST_FAILURE(name, ...) \ DO_TEST_FULL(name, "", \ @@ -2249,50 +2244,32 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-default-nic", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-cpu-passthrough", "aarch64"); - DO_TEST_FULL("aarch64-gic-none", ".aarch64-4.2.0", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "4.2.0", - ARG_END); - DO_TEST_FULL("aarch64-gic-none", ".aarch64-latest", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_END); - DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2); - DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3); - DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH); - DO_TEST_FULL("aarch64-gic-none-tcg", "", - ARG_GIC, GIC_BOTH, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS_LAST, - ARG_END); - DO_TEST_FULL("aarch64-gic-default", ".aarch64-4.2.0", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "4.2.0", - ARG_END); - DO_TEST_FULL("aarch64-gic-default", ".aarch64-latest", - ARG_GIC, GIC_NONE, - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_END); - DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2); - DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3); - DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH); - DO_TEST_GIC("aarch64-gic-v2", GIC_NONE); - DO_TEST_GIC("aarch64-gic-v2", GIC_V2); - DO_TEST_GIC("aarch64-gic-v2", GIC_V3); - DO_TEST_GIC("aarch64-gic-v2", GIC_BOTH); - DO_TEST_GIC("aarch64-gic-v3", GIC_NONE); - DO_TEST_GIC("aarch64-gic-v3", GIC_V2); - DO_TEST_GIC("aarch64-gic-v3", GIC_V3); - DO_TEST_GIC("aarch64-gic-v3", GIC_BOTH); - DO_TEST_GIC("aarch64-gic-host", GIC_NONE); - DO_TEST_GIC("aarch64-gic-host", GIC_V2); - DO_TEST_GIC("aarch64-gic-host", GIC_V3); - DO_TEST_GIC("aarch64-gic-host", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-none", "4.2.0", GIC_NONE); + DO_TEST_GIC("aarch64-gic-none", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-none-v2", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-none-v3", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-none-both", "latest", GIC_BOTH); + DO_TEST_CAPS_ARCH_VER_FULL("aarch64-gic-none-tcg", "aarch64", "latest", + ARG_GIC, GIC_BOTH, + ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS_LAST, + ARG_END); + DO_TEST_GIC("aarch64-gic-default", "4.2.0", GIC_NONE); + DO_TEST_GIC("aarch64-gic-default", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-default-v2", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-default-v3", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-default-both", "latest", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_NONE); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_V2); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_V3); + DO_TEST_GIC("aarch64-gic-host", "latest", GIC_BOTH); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-invalid", "aarch64"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-virt", "aarch64"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-arm", "ppc64"); -- 2.41.0

Few tests were invoked multiple times either with identical or equivalent config. Remove those invocations. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvtest.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 92ff7e4b1c..870902868b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1371,7 +1371,6 @@ mymain(void) DO_TEST_PARSE_ERROR_NOCAPS("vhost_queues-invalid"); - DO_TEST_CAPS_LATEST("net-vhostuser"); DO_TEST_CAPS_LATEST("net-vhostuser"); DO_TEST_CAPS_LATEST("net-vhostuser-multiq"); DO_TEST_CAPS_LATEST_FAILURE("net-vhostuser-fail"); @@ -1433,7 +1432,6 @@ mymain(void) DO_TEST_CAPS_LATEST("serial-dev-chardev-iobase"); DO_TEST_CAPS_LATEST("serial-file-chardev"); DO_TEST_CAPS_LATEST("serial-unix-chardev"); - DO_TEST_CAPS_LATEST("serial-unix-chardev"); DO_TEST_CAPS_LATEST_PARSE_ERROR("serial-unix-missing-source"); DO_TEST_CAPS_LATEST("serial-tcp-chardev"); DO_TEST_CAPS_LATEST("serial-udp-chardev"); @@ -2313,7 +2311,6 @@ mymain(void) DO_TEST_FAILURE_NOCAPS("memory-align-fail"); DO_TEST_PARSE_ERROR("memory-hotplug-nonuma", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST_PARSE_ERROR_NOCAPS("memory-hotplug-invalid-targetnode"); - DO_TEST_NOCAPS("memory-hotplug"); DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr"); -- 2.41.0

Drop tests which already are tested with real caps, thus the fake caps version doesn't bring much value. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/cpu-host-model.args | 40 ------------------- .../graphics-egl-headless.args | 33 --------------- tests/qemuxml2argvtest.c | 9 ----- 3 files changed, 82 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.args delete mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2argvdata/cpu-host-model.args deleted file mode 100644 index a35822ada3..0000000000 --- a/tests/qemuxml2argvdata/cpu-host-model.args +++ /dev/null @@ -1,40 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine q35,usb=off,dump-guest-core=off \ --accel kvm \ --cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ --m size=219136k \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=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=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \ --device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \ --device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \ --audiodev '{"id":"audio1","driver":"none"}' \ --global ICH9-LPC.noreboot=off \ --watchdog-action reset \ --device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args deleted file mode 100644 index e5ea7bcf2b..0000000000 --- a/tests/qemuxml2argvdata/graphics-egl-headless.args +++ /dev/null @@ -1,33 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --display egl-headless \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 870902868b..07cc2f9bef 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1292,9 +1292,6 @@ mymain(void) DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); - DO_TEST("graphics-egl-headless", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_EGL_HEADLESS); DO_TEST_CAPS_LATEST("graphics-egl-headless"); DO_TEST_CAPS_LATEST("graphics-egl-headless-rendernode"); @@ -1745,12 +1742,6 @@ mymain(void) DO_TEST_PARSE_ERROR_NOCAPS("cpu-numa3"); DO_TEST_NOCAPS("cpu-numa-disjoint"); DO_TEST_NOCAPS("cpu-numa-memshared"); - DO_TEST("cpu-host-model", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1); /* host-model cpu expansion depends on the cpu reported by qemu and thus * we invoke it for all real capability dumps we have */ -- 2.41.0

The feature is supported since qemu-5.1. Use real qemu-5.0 caps for the test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...rtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err} | 0 tests/qemuxml2argvtest.c | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/qemuxml2argvdata/{virtio-options-memballoon-freepage-reporting.err => virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err} (100%) diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.err b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.err rename to tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 07cc2f9bef..840daab25a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2421,10 +2421,10 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-options-input-packed"); DO_TEST_CAPS_LATEST("virtio-options-memballoon-packed"); DO_TEST_CAPS_LATEST("virtio-options-memballoon-freepage-reporting"); + DO_TEST_CAPS_VER_PARSE_ERROR("virtio-options-memballoon-freepage-reporting", "5.0.0"); DO_TEST_CAPS_LATEST("virtio-options-net-packed"); DO_TEST_CAPS_LATEST("virtio-options-rng-packed"); DO_TEST_CAPS_LATEST("virtio-options-video-packed"); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-freepage-reporting"); DO_TEST_CAPS_LATEST("fd-memory-numa-topology"); DO_TEST_CAPS_LATEST("fd-memory-numa-topology2"); -- 2.41.0

Similarly to 'cpu-host-model' add a real capability invocation for each version we support and remove the old fake caps invocation. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...cpu-host-model-fallback.x86_64-4.2.0.args} | 7 ++-- .../cpu-host-model-fallback.x86_64-5.0.0.args | 33 ++++++++++++++++++ .../cpu-host-model-fallback.x86_64-5.1.0.args | 33 ++++++++++++++++++ .../cpu-host-model-fallback.x86_64-5.2.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-6.0.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-6.1.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-6.2.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-7.0.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-7.1.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-7.2.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-8.0.0.args | 33 ++++++++++++++++++ ...cpu-host-model-fallback.x86_64-latest.args | 33 ++++++++++++++++++ tests/qemuxml2argvtest.c | 15 ++++++-- 13 files changed, 387 insertions(+), 5 deletions(-) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.args => cpu-host-model-fallback.x86_64-4.2.0.args} (63%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args similarity index 63% rename from tests/qemuxml2argvdata/cpu-host-model-fallback.args rename to tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args index 3d09b039f3..cf7ad7b5f4 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args @@ -10,9 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \ -accel tcg \ --cpu Conroe,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,monitor=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ -m size=219136k \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args new file mode 100644 index 0000000000..257b271386 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.0,usb=off,dump-guest-core=off \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args new file mode 100644 index 0000000000..71551b51a3 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.1,usb=off,dump-guest-core=off \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args new file mode 100644 index 0000000000..834d92c35a --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-object memory-backend-ram,id=pc.ram,size=224395264 \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args new file mode 100644 index 0000000000..611bf05482 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args new file mode 100644 index 0000000000..79ae00e993 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args new file mode 100644 index 0000000000..9c8331629a --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args new file mode 100644 index 0000000000..5929c9a87b --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args new file mode 100644 index 0000000000..141c2e36eb --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args new file mode 100644 index 0000000000..1e7f444d73 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args new file mode 100644 index 0000000000..943b0d477b --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args new file mode 100644 index 0000000000..135aed7287 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 840daab25a..6222b2edc5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1757,13 +1757,24 @@ mymain(void) DO_TEST_CAPS_VER("cpu-host-model", "7.2.0"); DO_TEST_CAPS_VER("cpu-host-model", "8.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "4.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "8.0.0"); + /* For this specific test we accept the increased likelihood of changes * if qemu updates the CPU model */ DO_TEST_CAPS_LATEST("cpu-host-model"); + DO_TEST_CAPS_LATEST("cpu-host-model-fallback"); DO_TEST_NOCAPS("cpu-host-model-vendor"); - DO_TEST_FULL("cpu-host-model-fallback", "", - ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS, ARG_END); DO_TEST_FULL("cpu-host-model-nofallback", "", ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE, ARG_END); -- 2.41.0

Similarly to 'cpu-host-model' add a real capability invocation for each version we support and remove the old fake caps invocation. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../cpu-host-model-nofallback.err | 1 - ...pu-host-model-nofallback.x86_64-4.2.0.args | 33 ++++++++++++++++++ ...pu-host-model-nofallback.x86_64-5.0.0.args | 33 ++++++++++++++++++ ...pu-host-model-nofallback.x86_64-5.1.0.args | 33 ++++++++++++++++++ ...pu-host-model-nofallback.x86_64-5.2.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-6.0.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-6.1.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-6.2.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-7.0.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-7.1.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-7.2.0.args | 34 +++++++++++++++++++ ...pu-host-model-nofallback.x86_64-8.0.0.args | 33 ++++++++++++++++++ ...u-host-model-nofallback.x86_64-latest.args | 33 ++++++++++++++++++ tests/qemuxml2argvtest.c | 16 +++++++-- 14 files changed, 416 insertions(+), 4 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.err create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.err b/tests/qemuxml2argvdata/cpu-host-model-nofallback.err deleted file mode 100644 index 35fa03a5a4..0000000000 --- a/tests/qemuxml2argvdata/cpu-host-model-nofallback.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: CPU model core2duo is not supported by hypervisor diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args new file mode 100644 index 0000000000..cf7ad7b5f4 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args new file mode 100644 index 0000000000..257b271386 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.0,usb=off,dump-guest-core=off \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args new file mode 100644 index 0000000000..71551b51a3 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.1,usb=off,dump-guest-core=off \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args new file mode 100644 index 0000000000..834d92c35a --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-object memory-backend-ram,id=pc.ram,size=224395264 \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args new file mode 100644 index 0000000000..611bf05482 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args new file mode 100644 index 0000000000..79ae00e993 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args new file mode 100644 index 0000000000..9c8331629a --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args new file mode 100644 index 0000000000..5929c9a87b --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args new file mode 100644 index 0000000000..141c2e36eb --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args new file mode 100644 index 0000000000..1e7f444d73 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args new file mode 100644 index 0000000000..943b0d477b --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args new file mode 100644 index 0000000000..135aed7287 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6222b2edc5..a8f476b551 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1769,15 +1769,25 @@ mymain(void) DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.2.0"); DO_TEST_CAPS_VER("cpu-host-model-fallback", "8.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "4.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "5.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "5.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "5.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "6.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "6.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "6.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "7.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "7.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "7.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-nofallback", "8.0.0"); + /* For this specific test we accept the increased likelihood of changes * if qemu updates the CPU model */ DO_TEST_CAPS_LATEST("cpu-host-model"); DO_TEST_CAPS_LATEST("cpu-host-model-fallback"); + DO_TEST_CAPS_LATEST("cpu-host-model-nofallback"); DO_TEST_NOCAPS("cpu-host-model-vendor"); - DO_TEST_FULL("cpu-host-model-nofallback", "", - ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE, - ARG_END); DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); -- 2.41.0

Remove the notion of legacy cpus as there are no test cases using it any more. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvtest.c | 27 +++++---------------------- tests/testutilsqemu.h | 5 ++--- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a8f476b551..a6a1646efb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -257,18 +257,16 @@ static virNWFilterDriver fakeNWFilterDriver = { static int -testAddCPUModels(virQEMUCaps *caps, bool skipLegacy) +testAddCPUModels(virQEMUCaps *caps) { virArch arch = virQEMUCapsGetArch(caps); const char *x86Models[] = { - "Opteron_G3", "Opteron_G2", "Opteron_G1", - "Nehalem", "Penryn", "Conroe", - "Haswell-noTSX", "Haswell", - }; - const char *x86LegacyModels[] = { "n270", "athlon", "pentium3", "pentium2", "pentium", "486", "coreduo", "kvm32", "qemu32", "kvm64", "core2duo", "phenom", "qemu64", + "Opteron_G3", "Opteron_G2", "Opteron_G1", + "Nehalem", "Penryn", "Conroe", + "Haswell-noTSX", "Haswell", }; if (ARCH_IS_X86(arch)) { @@ -279,18 +277,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy) G_N_ELEMENTS(x86Models), VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0) return -1; - - if (!skipLegacy) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, - x86LegacyModels, - G_N_ELEMENTS(x86LegacyModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0 || - virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, - x86LegacyModels, - G_N_ELEMENTS(x86LegacyModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0) - return -1; - } } return 0; @@ -313,8 +299,7 @@ testUpdateQEMUCaps(const struct testQemuInfo *info, virQEMUCapsSetArch(info->qemuCaps, arch); - if (testAddCPUModels(info->qemuCaps, - !!(info->flags & FLAG_SKIP_LEGACY_CPUS)) < 0) + if (testAddCPUModels(info->qemuCaps) < 0) return -1; testUpdateQEMUCapsHostCPUModel(info->qemuCaps, caps->host.arch); @@ -330,11 +315,9 @@ testCheckExclusiveFlags(int flags) FLAG_EXPECT_PARSE_ERROR | FLAG_FIPS_HOST | FLAG_REAL_CAPS | - FLAG_SKIP_LEGACY_CPUS | FLAG_SLIRP_HELPER | 0, -1); - VIR_EXCLUSIVE_FLAGS_RET(FLAG_REAL_CAPS, FLAG_SKIP_LEGACY_CPUS, -1); return 0; } diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 7845ac7cb6..89d40ce9bc 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -57,9 +57,8 @@ typedef enum { FLAG_EXPECT_PARSE_ERROR = 1 << 1, FLAG_FIPS_HOST = 1 << 2, /* simulate host with FIPS mode enabled */ FLAG_REAL_CAPS = 1 << 3, - FLAG_SKIP_LEGACY_CPUS = 1 << 4, - FLAG_SLIRP_HELPER = 1 << 5, - FLAG_SKIP_CONFIG_ACTIVE = 1 << 6, /* Skip 'active' config test in qemuxml2xmltest */ + FLAG_SLIRP_HELPER = 1 << 4, + FLAG_SKIP_CONFIG_ACTIVE = 1 << 5, /* Skip 'active' config test in qemuxml2xmltest */ } testQemuInfoFlags; struct testQemuConf { -- 2.41.0

To minimize upcoming churn in test data when they will be converted to latest capabilities enable JSON syntax for -device, -object, and -netdev for all fake caps test files. Doing this should also help git track renames of the files better as there will be more of consistent context present. We can do this safely as internally we generate JSON first and then back-convert it into the old-style commandline if given qemu doesn't support it. This means that all generated content will be the same. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/acpi-table.args | 2 +- tests/qemuxml2argvdata/autoindex.args | 62 ++--- .../qemuxml2argvdata/balloon-device-auto.args | 6 +- .../balloon-device-deflate-off.args | 6 +- .../balloon-device-deflate.args | 6 +- .../balloon-device-period.args | 6 +- tests/qemuxml2argvdata/balloon-device.args | 6 +- tests/qemuxml2argvdata/blkiotune-device.args | 6 +- tests/qemuxml2argvdata/blkiotune.args | 6 +- tests/qemuxml2argvdata/channel-guestfwd.args | 8 +- tests/qemuxml2argvdata/channel-spicevmc.args | 12 +- .../qemuxml2argvdata/channel-virtio-auto.args | 24 +- .../channel-virtio-autoadd.args | 22 +- .../channel-virtio-autoassign.args | 22 +- .../channel-virtio-default.args | 16 +- .../channel-virtio-state.args | 14 +- .../qemuxml2argvdata/channel-virtio-unix.args | 16 +- tests/qemuxml2argvdata/channel-virtio.args | 10 +- tests/qemuxml2argvdata/chardev-reconnect.args | 20 +- tests/qemuxml2argvdata/clock-catchup.args | 6 +- tests/qemuxml2argvdata/clock-france.args | 6 +- tests/qemuxml2argvdata/clock-hpet-off.args | 6 +- .../clock-localtime-basis-localtime.args | 6 +- tests/qemuxml2argvdata/clock-localtime.args | 4 +- .../clock-timer-hyperv-rtc.args | 4 +- tests/qemuxml2argvdata/clock-utc.args | 4 +- tests/qemuxml2argvdata/clock-variable.args | 6 +- .../qemuxml2argvdata/console-virtio-many.args | 16 +- tests/qemuxml2argvdata/console-virtio.args | 10 +- tests/qemuxml2argvdata/controller-order.args | 36 +-- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 4 +- tests/qemuxml2argvdata/cpu-Haswell.args | 4 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 4 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 4 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 4 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 4 +- .../cpu-cache-emulate-l3.args | 4 +- .../cpu-cache-passthrough.args | 4 +- .../cpu-check-default-none.args | 4 +- .../cpu-check-default-none2.args | 4 +- .../cpu-check-default-partial.args | 4 +- .../cpu-check-default-partial2.args | 4 +- tests/qemuxml2argvdata/cpu-check-none.args | 4 +- tests/qemuxml2argvdata/cpu-exact1.args | 4 +- .../cpu-exact2-nofallback.args | 4 +- tests/qemuxml2argvdata/cpu-exact2.args | 4 +- tests/qemuxml2argvdata/cpu-fallback.args | 4 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 4 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 4 +- .../cpu-host-model-vendor.args | 4 +- .../cpu-host-passthrough-features.args | 6 +- .../cpu-host-passthrough.args | 4 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 4 +- tests/qemuxml2argvdata/cpu-minimum1.args | 4 +- tests/qemuxml2argvdata/cpu-minimum2.args | 4 +- .../cpu-no-removed-features.args | 4 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 4 +- .../qemuxml2argvdata/cpu-numa-memshared.args | 8 +- .../cpu-numa-no-memory-element.args | 4 +- tests/qemuxml2argvdata/cpu-numa1.args | 4 +- tests/qemuxml2argvdata/cpu-numa2.args | 4 +- .../cpu-phys-bits-emulate.args | 4 +- .../cpu-phys-bits-emulate2.args | 4 +- .../cpu-phys-bits-passthrough.args | 4 +- tests/qemuxml2argvdata/cpu-strict1.args | 4 +- tests/qemuxml2argvdata/cpu-topology1.args | 4 +- tests/qemuxml2argvdata/cpu-topology2.args | 4 +- tests/qemuxml2argvdata/cpu-topology3.args | 4 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 4 +- .../default-kvm-host-arch.args | 4 +- .../default-qemu-host-arch.args | 4 +- .../graphics-sdl-fullscreen.args | 6 +- tests/qemuxml2argvdata/graphics-sdl.args | 6 +- .../hostdev-mdev-precreated.args | 4 +- .../hostdev-pci-address-unassigned.args | 10 +- .../hostdev-pci-multifunction.args | 18 +- .../hostdev-scsi-vhost-scsi-pci.args | 10 +- .../hostdev-vfio-multidomain.args | 8 +- tests/qemuxml2argvdata/hostdev-vfio.args | 8 +- tests/qemuxml2argvdata/hotplug-base.args | 6 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 8 +- tests/qemuxml2argvdata/input-usbmouse.args | 6 +- tests/qemuxml2argvdata/input-usbtablet.args | 6 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 6 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 6 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- tests/qemuxml2argvdata/machine-aliases1.args | 6 +- tests/qemuxml2argvdata/machine-aliases2.args | 6 +- tests/qemuxml2argvdata/machine-core-off.args | 4 +- tests/qemuxml2argvdata/machine-core-on.args | 4 +- .../qemuxml2argvdata/machine-vmport-opt.args | 6 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 14 +- tests/qemuxml2argvdata/memory-hotplug.args | 6 +- tests/qemuxml2argvdata/memtune-unlimited.args | 6 +- tests/qemuxml2argvdata/memtune.args | 6 +- tests/qemuxml2argvdata/minimal.args | 6 +- tests/qemuxml2argvdata/misc-acpi.args | 4 +- tests/qemuxml2argvdata/misc-disable-s3.args | 4 +- .../misc-disable-suspends.args | 4 +- tests/qemuxml2argvdata/misc-enable-s4.args | 4 +- tests/qemuxml2argvdata/misc-uuid.args | 4 +- .../multifunction-pci-device.args | 24 +- tests/qemuxml2argvdata/nosharepages.args | 4 +- .../numad-auto-memory-vcpu-cpuset.args | 6 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 6 +- .../numad-auto-vcpu-static-numatune.args | 6 +- .../numad-static-memory-auto-vcpu.args | 6 +- tests/qemuxml2argvdata/numad.args | 6 +- .../numatune-auto-nodeset-invalid.args | 6 +- .../numatune-auto-prefer.args | 4 +- .../qemuxml2argvdata/numatune-distances.args | 4 +- .../numatune-memnode-no-memory.args | 8 +- tests/qemuxml2argvdata/numatune-memnode.args | 10 +- tests/qemuxml2argvdata/numatune-memory.args | 6 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 22 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 24 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 8 +- .../pci-bridge-many-disks.args | 218 +++++++++--------- tests/qemuxml2argvdata/pci-bridge.args | 140 +++++------ tests/qemuxml2argvdata/pci-expander-bus.args | 136 +++++------ tests/qemuxml2argvdata/pci-many.args | 64 ++--- tests/qemuxml2argvdata/pci-rom-disabled.args | 6 +- tests/qemuxml2argvdata/pci-rom.args | 18 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 202 ++++++++-------- .../pcie-root-port-model-generic.args | 8 +- .../pcie-root-port-model-ioh3420.args | 6 +- tests/qemuxml2argvdata/pcie-root-port.args | 10 +- tests/qemuxml2argvdata/pcie-root.args | 2 +- .../pcie-switch-downstream-port.args | 26 +-- .../pcie-switch-upstream-port.args | 14 +- tests/qemuxml2argvdata/pcihole64-q35.args | 6 +- tests/qemuxml2argvdata/pcihole64.args | 4 +- tests/qemuxml2argvdata/pmu-feature-off.args | 2 +- tests/qemuxml2argvdata/pmu-feature.args | 2 +- .../q35-pci-force-address.args | 16 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 34 +-- tests/qemuxml2argvdata/q35-usb2-reorder.args | 34 +-- tests/qemuxml2argvdata/q35-usb2.args | 18 +- tests/qemuxml2argvdata/q35.args | 14 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 6 +- .../qemu-ns-commandline-ns0.args | 6 +- .../qemu-ns-commandline-ns1.args | 6 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 6 +- .../qemu-ns-domain-commandline-ns0.args | 6 +- .../qemu-ns-domain-commandline.args | 6 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 6 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 4 +- .../reboot-timeout-disabled.args | 2 +- .../reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 6 +- .../seclabel-dynamic-baselabel.args | 6 +- .../seclabel-dynamic-labelskip.args | 6 +- .../seclabel-dynamic-override.args | 8 +- .../seclabel-dynamic-relabel.args | 6 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 6 +- tests/qemuxml2argvdata/seclabel-none.args | 6 +- .../seclabel-static-labelskip.args | 6 +- .../seclabel-static-relabel.args | 6 +- tests/qemuxml2argvdata/seclabel-static.args | 6 +- .../smartcard-controller.args | 8 +- .../smartcard-host-certificates-database.args | 8 +- .../smartcard-host-certificates.args | 8 +- tests/qemuxml2argvdata/smartcard-host.args | 8 +- .../smartcard-passthrough-spicevmc.args | 10 +- .../smartcard-passthrough-tcp.args | 8 +- tests/qemuxml2argvdata/smbios.args | 6 +- tests/qemuxml2argvdata/smp-dies.args | 4 +- tests/qemuxml2argvdata/smp.args | 4 +- .../usb-controller-default-q35.args | 4 +- .../usb-controller-explicit-q35.args | 4 +- .../usb-controller-qemu-xhci.args | 4 +- .../qemuxml2argvdata/usb-controller-xhci.args | 4 +- tests/qemuxml2argvdata/usb-controller.args | 4 +- .../usb-hub-autoadd-deluxe.args | 42 ++-- tests/qemuxml2argvdata/usb-hub-autoadd.args | 14 +- tests/qemuxml2argvdata/usb-hub.args | 6 +- .../qemuxml2argvdata/usb-ich9-autoassign.args | 22 +- .../qemuxml2argvdata/usb-ich9-companion.args | 12 +- .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 28 +-- .../qemuxml2argvdata/usb-long-port-path.args | 12 +- tests/qemuxml2argvdata/usb-none.args | 4 +- .../usb-piix3-controller.args | 6 +- .../qemuxml2argvdata/usb-port-autoassign.args | 14 +- tests/qemuxml2argvdata/usb-port-missing.args | 10 +- tests/qemuxml2argvdata/usb-ports.args | 14 +- tests/qemuxml2argvdata/usb-redir-boot.args | 18 +- .../usb-redir-filter-version.args | 10 +- tests/qemuxml2argvdata/usb-redir-filter.args | 18 +- tests/qemuxml2argvdata/usb-redir.args | 18 +- .../qemuxml2argvdata/usb-xhci-autoassign.args | 14 +- tests/qemuxml2argvdata/usb1-usb2.args | 30 +-- .../virtio-input-passthrough.args | 6 +- tests/qemuxml2argvdata/virtio-input.args | 10 +- .../qemuxml2argvdata/virtio-rng-default.args | 8 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 8 +- .../qemuxml2argvdata/virtio-rng-multiple.args | 12 +- tests/qemuxml2argvdata/virtio-rng-random.args | 8 +- tests/qemuxml2argvdata/vmcoreinfo.args | 8 +- tests/qemuxml2argvtest.c | 17 +- 199 files changed, 1223 insertions(+), 1210 deletions(-) diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.args index 6819a8573b..88a9c97e79 100644 --- a/tests/qemuxml2argvdata/acpi-table.args +++ b/tests/qemuxml2argvdata/acpi-table.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args index 87d98012e4..3d7bffff7f 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,38 +25,38 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=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=8,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=0,chassis=5,id=pci.5,bus=pci.4,addr=0x0 \ --device xio3130-downstream,port=1,chassis=6,id=pci.6,bus=pci.4,addr=0x1 \ --device xio3130-downstream,port=2,chassis=7,id=pci.7,bus=pci.4,addr=0x2 \ --device xio3130-downstream,port=3,chassis=8,id=pci.8,bus=pci.4,addr=0x3 \ --device xio3130-downstream,port=4,chassis=9,id=pci.9,bus=pci.4,addr=0x4 \ --device xio3130-downstream,port=5,chassis=10,id=pci.10,bus=pci.4,addr=0x5 \ --device xio3130-downstream,port=6,chassis=11,id=pci.11,bus=pci.4,addr=0x6 \ --device xio3130-downstream,port=7,chassis=12,id=pci.12,bus=pci.4,addr=0x7 \ --device xio3130-downstream,port=8,chassis=13,id=pci.13,bus=pci.4,addr=0x8 \ --device xio3130-downstream,port=9,chassis=14,id=pci.14,bus=pci.4,addr=0x9 \ --device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \ --device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \ --device ich9-usb-ehci1,id=usb1,bus=pcie.0,addr=0x1a.0x7 \ --device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1a \ --device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1 \ --device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.2,addr=0x1.0x1 \ --device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \ --device ich9-usb-ehci1,id=usb2,bus=pci.2,addr=0x1.0x7 \ --device nec-usb-xhci,id=usb3,bus=pci.5,addr=0x0 \ --device ich9-usb-uhci1,masterbus=usb4.0,firstport=0,bus=pci.2,multifunction=on,addr=0x2 \ --device ich9-usb-uhci2,masterbus=usb4.0,firstport=2,bus=pci.2,addr=0x2.0x1 \ --device ich9-usb-uhci3,masterbus=usb4.0,firstport=4,bus=pci.2,addr=0x2.0x2 \ --device ich9-usb-ehci1,id=usb4,bus=pci.2,addr=0x2.0x7 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.3","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":0,"chassis":5,"id":"pci.5","bus":"pci.4","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":1,"chassis":6,"id":"pci.6","bus":"pci.4","addr":"0x1"}' \ +-device '{"driver":"xio3130-downstream","port":2,"chassis":7,"id":"pci.7","bus":"pci.4","addr":"0x2"}' \ +-device '{"driver":"xio3130-downstream","port":3,"chassis":8,"id":"pci.8","bus":"pci.4","addr":"0x3"}' \ +-device '{"driver":"xio3130-downstream","port":4,"chassis":9,"id":"pci.9","bus":"pci.4","addr":"0x4"}' \ +-device '{"driver":"xio3130-downstream","port":5,"chassis":10,"id":"pci.10","bus":"pci.4","addr":"0x5"}' \ +-device '{"driver":"xio3130-downstream","port":6,"chassis":11,"id":"pci.11","bus":"pci.4","addr":"0x6"}' \ +-device '{"driver":"xio3130-downstream","port":7,"chassis":12,"id":"pci.12","bus":"pci.4","addr":"0x7"}' \ +-device '{"driver":"xio3130-downstream","port":8,"chassis":13,"id":"pci.13","bus":"pci.4","addr":"0x8"}' \ +-device '{"driver":"xio3130-downstream","port":9,"chassis":14,"id":"pci.14","bus":"pci.4","addr":"0x9"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pcie.0","addr":"0x1a.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1a"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bus":"pci.2","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.2","addr":"0x1.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.2","addr":"0x1.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.2","addr":"0x1.0x7"}' \ +-device '{"driver":"nec-usb-xhci","id":"usb3","bus":"pci.5","addr":"0x0"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb4.0","firstport":0,"bus":"pci.2","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb4.0","firstport":2,"bus":"pci.2","addr":"0x2.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb4.0","firstport":4,"bus":"pci.2","addr":"0x2.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb4","bus":"pci.2","addr":"0x2.0x7"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args index c1acd2f6b6..dbee8dab7b 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,deflate-on-oom=off,bus=pci.0,addr=0x12 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":false,"bus":"pci.0","addr":"0x12"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args index a5017e6657..c7ed5f1698 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,deflate-on-oom=on,bus=pci.0,addr=0x12 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":true,"bus":"pci.0","addr":"0x12"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args index 517d83feab..5de1090233 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x12"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args index 517d83feab..5de1090233 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x12"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args index bdd413d4bf..147c54348f 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","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 \ +-netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:charchannel0"}],"id":"channel0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args index da36b815b0..009abf0b09 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -24,15 +24,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -chardev spicevmc,id=charchannel0,name=vdagent \ --device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args index 5bd8e2193c..d86ff6d6a0 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,25 +25,25 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --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=0x3 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":16,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial2","bus":"pci.0","addr":"0x3"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=charchannel0 \ --device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}' \ -chardev pty,id=charchannel1 \ --device virtserialport,bus=virtio-serial1.0,nr=1,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":1,"chardev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo"}' \ -chardev pty,id=charchannel2 \ --device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.bar \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.bar"}' \ -chardev pty,id=charchannel3 \ --device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel3,id=channel3,name=org.linux-kvm.port.wizz \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel3","id":"channel3","name":"org.linux-kvm.port.wizz"}' \ -chardev pty,id=charchannel4 \ --device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \ +-device '{"driver":"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 '{"driver":"virtserialport","bus":"virtio-serial2.0","nr":1,"chardev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args index df6657f587..d7a32b5b1d 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,24 +25,24 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --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 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0x3"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=charchannel0 \ --device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}' \ -chardev pty,id=charchannel1 \ --device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo"}' \ -chardev pty,id=charchannel2 \ --device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.bar \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.bar"}' \ -chardev pty,id=charchannel3 \ --device virtserialport,bus=virtio-serial1.0,nr=1,chardev=charchannel3,id=channel3,name=org.linux-kvm.port.wizz \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":1,"chardev":"charchannel3","id":"channel3","name":"org.linux-kvm.port.wizz"}' \ -chardev pty,id=charchannel4 \ --device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \ +-device '{"driver":"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 '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args index b952025101..8ee30c8c2a 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,24 +25,24 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --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 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=charchannel0 \ --device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}' \ -chardev pty,id=charchannel1 \ --device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo"}' \ -chardev pty,id=charchannel2 \ --device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.bar \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.bar"}' \ -chardev pty,id=charchannel3 \ --device virtserialport,bus=virtio-serial1.0,nr=1,chardev=charchannel3,id=channel3,name=org.linux-kvm.port.wizz \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":1,"chardev":"charchannel3","id":"channel3","name":"org.linux-kvm.port.wizz"}' \ -chardev pty,id=charchannel4 \ --device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \ +-device '{"driver":"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 '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args index 5ff502848d..032938afca 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -24,18 +24,18 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --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 '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x3"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=charchannel0 \ --device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0 \ +-device '{"driver":"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 '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"com.redhat.spice.0"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=0,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args index 6d20f431cb..27113716ad 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,17 +25,17 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","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 '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.foo"}' \ -chardev pty,id=charchannel1 \ --device virtserialport,bus=virtio-serial1.0,nr=4,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo1 \ +-device '{"driver":"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 '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":5,"chardev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.foo2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args index 6e42dc9f41..12ef286573 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,19 +25,19 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ --device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -chardev socket,id=charchannel0,fd=1729,server=on,wait=off \ --device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -chardev socket,id=charchannel1,fd=1729,server=on,wait=off \ --device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1"}' \ -chardev socket,id=charchannel2,fd=1729,server=on,wait=off \ --device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,id=channel2,name=ble \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"ble"}' \ -chardev socket,id=charchannel3,fd=1729,server=on,wait=off \ --device virtserialport,bus=virtio-serial0.0,nr=4,chardev=charchannel3,id=channel3,name=fdsa \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chardev":"charchannel3","id":"channel3","name":"fdsa"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args index 423c27eb42..11c899376a 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,13 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","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 '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.foo"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args index aae62b8f75..ee84969f73 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,20 +25,20 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ --device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ -usb \ --device usb-ccid,id=ccid0,bus=usb.0,port=1 \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -chardev socket,id=charsmartcard0,path=/var/lib/libvirt/qemu/channel/target/asdf,reconnect=20 \ --device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \ +-device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}' \ -chardev socket,id=charchannel0,host=localhost,port=1234,reconnect=10 \ --device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=asdf \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"asdf"}' \ -chardev socket,id=charchannel1,path=/var/lib/libvirt/qemu/channel/target/fdsa,reconnect=0 \ --device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=fdsa \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"fdsa"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=charredir0,host=localhost,port=3456,reconnect=15 \ --device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \ +-device '{"driver":"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=0x3 \ +-object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args index d7ec73ace2..717e39de4b 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args index a5664b547d..ebaf3983f2 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -10,7 +10,7 @@ TZ=Europe/Paris \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,7 +29,7 @@ TZ=Europe/Paris \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args index b5cb297e92..349685854d 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index 8fd8f42083..cfb65c94b3 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args index daf503d3fd..2f27165702 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args index 5a952a2cf6..629091aba2 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu qemu64,hv-time=on \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args index 2ebb6cb762..7b0d7e31af 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args index ed42be8dd0..7faefe3464 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args index bb67eec187..d45a1b4eb0 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,19 +25,19 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=charserial0 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ -chardev pty,id=charconsole1 \ --device virtconsole,chardev=charconsole1,id=console1 \ +-device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}' \ -chardev pty,id=charconsole2 \ --device virtconsole,chardev=charconsole2,id=console2 \ +-device '{"driver":"virtconsole","chardev":"charconsole2","id":"console2"}' \ -chardev pty,id=charconsole3 \ --device virtconsole,chardev=charconsole3,id=console3 \ +-device '{"driver":"virtconsole","chardev":"charconsole3","id":"console3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args index 2baa069c04..20a6eb9c45 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,13 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=charconsole0 \ --device virtconsole,chardev=charconsole0,id=console0 \ +-device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args index 27a0e01153..58222e601f 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=fdr,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -m size=4194304k \ @@ -23,30 +23,30 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr/.config \ -rtc base=utc \ -no-shutdown \ -boot menu=off,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=0x7 \ --device usb-hub,id=hub0,bus=usb.0,port=1 \ --device usb-ccid,id=ccid0,bus=usb.0,port=1.1 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x7"}' \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1.1"}' \ -blockdev '{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x5,share-rw=on,drive=libvirt-2-format,id=virtio-disk0,bootindex=1,write-cache=on \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","share-rw":true,"drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1,"write-cache":"on"}' \ -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \ --netdev user,id=hostnet0 \ --device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:4d:4b:19,bootindex=2,bus=pci.0,addr=0x3 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:4d:4b:19","bootindex":2,"bus":"pci.0","addr":"0x3"}' \ -chardev spicevmc,id=charsmartcard0,name=smartcard \ --device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \ +-device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}' \ -chardev pty,id=charserial0 \ --device isa-serial,chardev=charserial0,id=serial0,index=0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ -chardev spicevmc,id=charchannel0,name=vdagent \ --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 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1.2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=5901,addr=0.0.0.0,seamless-migration=on \ --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,audiodev=audio1 \ --device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"intel-hda","id":"sound0","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad":0,"audiodev":"audio1"}' \ +-device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","bus":"usb.0","port":"2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args index dc35ed4a7e..6b4e0aa6cb 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu Haswell-noTSX \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args index 97eeed5804..c36c67a8b8 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell.args +++ b/tests/qemuxml2argvdata/cpu-Haswell.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu Haswell \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args index c816510613..280d48f76f 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/cpu-Haswell2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu Haswell,hle=off,rtm=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args index 9d692e3c6c..f66a637bbe 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/cpu-Haswell3.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu Haswell,rtm=on,hle=on \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args index 7b5d95270d..6bab5d64a5 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=foo,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu host,host-cache-info=off,l3-cache=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args index e4ccdad41c..dd9227de22 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=foo,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,l3-cache=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args index bcb354433b..38f1d93973 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=foo,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu host,l3-cache=on,host-cache-info=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args index cf90428952..4bf1305f16 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=foo,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu host,host-cache-info=on,l3-cache=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args index 4ca878576d..65fc3e1bad 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu host \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args index bd056383f6..cd55fad737 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -cpu core2duo \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args index fff3d02cfc..959a421741 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args index de46ed5ae7..48ad817176 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args index de46ed5ae7..48ad817176 100644 --- a/tests/qemuxml2argvdata/cpu-check-none.args +++ b/tests/qemuxml2argvdata/cpu-check-none.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args index b6dc380ddb..bd452e017e 100644 --- a/tests/qemuxml2argvdata/cpu-exact1.args +++ b/tests/qemuxml2argvdata/cpu-exact1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu qemu64,mca=off,pse36=off,clflush=off,syscall=off,nx=off,lm=off,svm=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args index 844da9ef3d..2916d10b23 100644 --- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo,ds=on,ht=on,tm=on,ds-cpl=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args index 844da9ef3d..2916d10b23 100644 --- a/tests/qemuxml2argvdata/cpu-exact2.args +++ b/tests/qemuxml2argvdata/cpu-exact2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo,ds=on,ht=on,tm=on,ds-cpl=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args index 341e649ce6..ef6c3b29f3 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu Conroe,cx16=on,sse4.1=off,sse4.2=off,popcnt=off,aes=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args index 1e5a3af103..836fe208a0 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu host,kvmclock=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args index d891dcd73b..97b7b9fda6 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args index c043bba085..8bece6f8da 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -cpu 'core2duo,vendor=Libvirt QEMU,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on' \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args index fba3d076d2..b8e0734d7d 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu host,abm=on,ds=on,invtsc=off \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args index 4ca878576d..65fc3e1bad 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu host \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args index 60bc63a2bf..ef469a1e5a 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo,kvmclock=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args index fff3d02cfc..959a421741 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args index 632f76f7dd..de2c6f4fe5 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,syscall=off,nx=off,lm=off,svm=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.args index de46ed5ae7..48ad817176 100644 --- a/tests/qemuxml2argvdata/cpu-no-removed-features.args +++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args index 7ef84e0b2c..5fc82723eb 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,5 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args index 47341169d5..fc4c03f1a6 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -9,15 +9,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ -overcommit mem-lock=off \ -smp 16,sockets=2,cores=4,threads=2 \ --object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=on,size=112197632 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":true,"size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ --object memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1,share=off,size=112197632 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1","share":false,"size":112197632}' \ -numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ @@ -31,5 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args index 741edc4c1c..3cf5b44742 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,5 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args index 741edc4c1c..3cf5b44742 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,5 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args index 741edc4c1c..3cf5b44742 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,5 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args index e1823727ae..6710c3edc5 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=foo,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu host,phys-bits=42 \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args index d8add83283..f4fdaab483 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=foo,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,phys-bits=42 \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args index 7af943c451..0ae7743b5a 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=foo,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu host,host-phys-bits=on \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args index 69a1405f92..f865d7557a 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ht=on,tm=on,ds-cpl=on,vmx=on,est=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args index 6482bacaf1..52e36d0de5 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args index ff4c85c800..6f8f674859 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -cpu core2duo \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args index 6482bacaf1..52e36d0de5 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args index f4b7a70ba2..f3a8a62c00 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,invtsc=on,tsc-frequency=4567890000 \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args index 7ae1c7eef1..07ee740065 100644 --- a/tests/qemuxml2argvdata/default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=kvm,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-kvm/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-kvm/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -m size=4194304k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args index cc37778373..a54dc14136 100644 --- a/tests/qemuxml2argvdata/default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu-host/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=qemu-host,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-qemu-host/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-qemu-host/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=4194304k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu-host/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args index 96ab12917e..33ad2bd5da 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -11,7 +11,7 @@ DISPLAY=:0.1 \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,8 +29,8 @@ DISPLAY=:0.1 \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -full-screen \ -display sdl \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args index c7d20d3e1f..bd6f994856 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -11,7 +11,7 @@ DISPLAY=:0.1 \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,7 +29,7 @@ DISPLAY=:0.1 \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -display sdl \ --device VGA,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"VGA","id":"video0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args index 7c76cd5d15..8f51127035 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,display=off,bus=pci.0,addr=0x2 \ +-device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"off","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args index 61fe727996..b59083cb3c 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=delete,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-delete/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-delete/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -m size=262144k \ @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --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 \ +-device '{"driver":"vfio-pci","host":"0005:90:01.0","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"vfio-pci","host":"0005:90:01.2","id":"hostdev2","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","host":"0005:90:01.3","id":"hostdev3","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args index 50d6010429..b0110be8b1 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args +++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=delete,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-delete/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-delete/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -m size=262144k \ @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --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 \ +-device '{"driver":"vfio-pci","host":"0005:90:01.0","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"vfio-pci","host":"0001:01:00.1","id":"hostdev1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","host":"0001:01:00.0","id":"hostdev2","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"vfio-pci","host":"0005:90:01.2","id":"hostdev3","bus":"pci.0","addr":"0x5"}' \ +-device '{"driver":"vfio-pci","host":"0005:90:01.3","id":"hostdev4","bus":"pci.0","addr":"0x6"}' \ +-device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev5","bus":"pci.0","addr":"0x7"}' \ +-device '{"driver":"vfio-pci","host":"0000:06:12.2","id":"hostdev6","bus":"pci.0","addr":"0x8"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x9"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index 5f8197e7ed..972a023d5b 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x3"}' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --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 \ +-device '{"driver":"vhost-scsi-pci","wwpn":"naa.5123456789abcde0","vhostfd":"3","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args index ac9db13ab5..909f65ecae 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --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 \ +-device '{"driver":"vfio-pci","host":"0021:de:1f.1","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args index 9872d77f17..a52b705099 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --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 \ +-device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.args index fd1ff8f36d..030552411e 100644 --- a/tests/qemuxml2argvdata/hotplug-base.args +++ b/tests/qemuxml2argvdata/hotplug-base.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-hotplug/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=hotplug,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-hotplug/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-hotplug/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -m size=4194304k \ @@ -24,8 +24,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-hotplug/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ --device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x4 \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x4"}' \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args index 06d31b4605..1d7e8f29aa 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --device usb-mouse,id=input0,bus=usb.0,port=2 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args index 3b85615ce2..fdf0cd14c5 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --device usb-mouse,id=input0,bus=usb.0,port=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args index 95ceafb413..18f484fc0a 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --device usb-tablet,id=input0,bus=usb.0,port=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args index f8234ba1cb..fd7a2b306a 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args index b75f0945cc..c3cdc71020 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args index bd71be3ec0..df9ab68537 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -cpu qemu64,kvmclock=off \ diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args index 290a762e91..6501e5e417 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args index 2ebb6cb762..7b0d7e31af 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args index 78dea552bf..a1b9905d5c 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=on \ -accel tcg \ -m size=219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args index 88eb59d12e..c7cdb0c85f 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,vmport=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index 4e45bb059a..b84efa4556 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k,slots=16,maxmem=1099511627776k \ @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --object memory-backend-ram,id=memdimm0,size=536870912 \ --device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ --object memory-backend-file,id=memdimm1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ --device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ +-object '{"qom-type":"memory-backend-ram","id":"memdimm0","size":536870912}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","slot":0}' \ +-object '{"qom-type":"memory-backend-file","id":"memdimm1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":536870912,"host-nodes":[1,2,3],"policy":"bind"}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm1","id":"dimm1","slot":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args index 3bd7aaf9e5..62600fefe2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k,slots=16,maxmem=1099511627776k \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args index 12f2d4e6ae..15343c68b0 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args index d64b9f56ae..3dc66e443e 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,6 +29,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args index 554620fe24..314612c229 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args index 0734635405..f2e9fcc0a6 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -29,6 +29,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args index 12f2d4e6ae..15343c68b0 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args index 40a25fbe7b..40c38dea48 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,19 +25,19 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device lsi,id=scsi0,bus=pci.0,multifunction=off,addr=0x3 \ --device lsi,id=scsi1,bus=pci.0,multifunction=on,addr=0x4 \ --device lsi,id=scsi2,bus=pci.0,multifunction=on,addr=0x4.0x1 \ --device lsi,id=scsi3,bus=pci.0,addr=0x4.0x2 \ --device lsi,id=scsi4,bus=pci.0,addr=0x4.0x3 \ --device lsi,id=scsi5,bus=pci.0,addr=0x4.0x4 \ --device lsi,id=scsi6,bus=pci.0,addr=0x4.0x5 \ --device lsi,id=scsi7,bus=pci.0,addr=0x4.0x6 \ --device lsi,id=scsi8,bus=pci.0,addr=0x4.0x7 \ +-device '{"driver":"lsi","id":"scsi0","bus":"pci.0","multifunction":false,"addr":"0x3"}' \ +-device '{"driver":"lsi","id":"scsi1","bus":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"lsi","id":"scsi2","bus":"pci.0","multifunction":true,"addr":"0x4.0x1"}' \ +-device '{"driver":"lsi","id":"scsi3","bus":"pci.0","addr":"0x4.0x2"}' \ +-device '{"driver":"lsi","id":"scsi4","bus":"pci.0","addr":"0x4.0x3"}' \ +-device '{"driver":"lsi","id":"scsi5","bus":"pci.0","addr":"0x4.0x4"}' \ +-device '{"driver":"lsi","id":"scsi6","bus":"pci.0","addr":"0x4.0x5"}' \ +-device '{"driver":"lsi","id":"scsi7","bus":"pci.0","addr":"0x4.0x6"}' \ +-device '{"driver":"lsi","id":"scsi8","bus":"pci.0","addr":"0x4.0x7"}' \ -usb \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device scsi-hd,bus=scsi0.0,scsi-id=0,device_id=drive-scsi0-0-0,drive=libvirt-1-format,id=scsi0-0-0,bootindex=1 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"drive-scsi0-0-0","drive":"libvirt-1-format","id":"scsi0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args index a059b61da4..7bcd073c98 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,mem-merge=off \ -accel tcg \ -m size=220160k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on 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 951de4194a..d0703d283a 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 @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemuxml2argvdata/numatune-auto-prefer.args index fd9b839404..5f8db1b479 100644 --- a/tests/qemuxml2argvdata/numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=65536k \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.args index d2f240dd96..f349b5639c 100644 --- a/tests/qemuxml2argvdata/numatune-distances.args +++ b/tests/qemuxml2argvdata/numatune-distances.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=12582912k \ @@ -68,5 +68,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args index b8098cd5a5..efc9bb9476 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args @@ -9,15 +9,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=65536k \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ --object memory-backend-ram,id=ram-node0,size=33554432,host-nodes=3,policy=preferred \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":33554432,"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ --object memory-backend-ram,id=ram-node1,size=33554432 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":33554432}' \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ @@ -31,5 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args index f5f6e727a1..163aa530da 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.args +++ b/tests/qemuxml2argvdata/numatune-memnode.args @@ -9,17 +9,17 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=24683520k \ -overcommit mem-lock=off \ -smp 32,sockets=32,cores=1,threads=1 \ --object memory-backend-ram,id=ram-node0,size=20971520,host-nodes=3,policy=preferred \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520,"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ --object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-3,policy=bind \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":676331520,"host-nodes":[0,1,2,3],"policy":"bind"}' \ -numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \ --object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=0,host-nodes=2,policy=bind \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621440,"host-nodes":[0,2],"policy":"bind"}' \ -numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ @@ -33,5 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args index 951de4194a..d0703d283a 100644 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ b/tests/qemuxml2argvdata/numatune-memory.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args index f1a49702ef..ec75429384 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=fdr-br,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -24,18 +24,18 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --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=4,id=pci.4,bus=pci.0,addr=0x6 \ --device pci-bridge,chassis_nr=5,id=pci.5,bus=pci.0,addr=0x7 \ --device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x8 \ --device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0x9 \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0","addr":"0x5"}' \ +-device '{"driver":"pci-bridge","chassis_nr":4,"id":"pci.4","bus":"pci.0","addr":"0x6"}' \ +-device '{"driver":"pci-bridge","chassis_nr":5,"id":"pci.5","bus":"pci.0","addr":"0x7"}' \ +-device '{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0","addr":"0x8"}' \ +-device '{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0","addr":"0x9"}' \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.7","addr":"0x6"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args index aed802a501..5c6377d619 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=fdr-br,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -24,19 +24,19 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device pci-bridge,chassis_nr=8,id=pci.8,bus=pci.0,addr=0x3 \ --device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x4 \ --device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x5 \ --device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x6 \ --device pci-bridge,chassis_nr=4,id=pci.4,bus=pci.0,addr=0x7 \ --device pci-bridge,chassis_nr=5,id=pci.5,bus=pci.0,addr=0x8 \ --device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x9 \ --device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0xa \ +-device '{"driver":"pci-bridge","chassis_nr":8,"id":"pci.8","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0","addr":"0x5"}' \ +-device '{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0","addr":"0x6"}' \ +-device '{"driver":"pci-bridge","chassis_nr":4,"id":"pci.4","bus":"pci.0","addr":"0x7"}' \ +-device '{"driver":"pci-bridge","chassis_nr":5,"id":"pci.5","bus":"pci.0","addr":"0x8"}' \ +-device '{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0","addr":"0x9"}' \ +-device '{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0","addr":"0xa"}' \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","addr":"0x6"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args index 0b9866d00e..f43a1da7ab 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=fdr-br,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args index 6868de7344..7d990296c7 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-lots-of-disks/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=lots-of-disks,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-lots-of-disks/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-lots-of-disks/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -cpu qemu64,kvmclock=off \ @@ -25,324 +25,324 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-lots-of-disks/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --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 \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0","addr":"0x4"}' \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img","node-name":"libvirt-105-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-105-format","read-only":false,"driver":"raw","file":"libvirt-105-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-105-format,id=virtio-disk0,bootindex=1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"libvirt-105-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.img","node-name":"libvirt-104-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-104-format","read-only":false,"driver":"raw","file":"libvirt-104-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-104-format,id=virtio-disk26 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"libvirt-104-format","id":"virtio-disk26"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.img","node-name":"libvirt-103-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-103-format","read-only":false,"driver":"raw","file":"libvirt-103-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-103-format,id=virtio-disk27 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-103-format","id":"virtio-disk27"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.img","node-name":"libvirt-102-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-102-format","read-only":false,"driver":"raw","file":"libvirt-102-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x8,drive=libvirt-102-format,id=virtio-disk28 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"libvirt-102-format","id":"virtio-disk28"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.img","node-name":"libvirt-101-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-101-format","read-only":false,"driver":"raw","file":"libvirt-101-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x9,drive=libvirt-101-format,id=virtio-disk29 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"libvirt-101-format","id":"virtio-disk29"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.img","node-name":"libvirt-100-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-100-format","read-only":false,"driver":"raw","file":"libvirt-100-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xa,drive=libvirt-100-format,id=virtio-disk52 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"libvirt-100-format","id":"virtio-disk52"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.img","node-name":"libvirt-99-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-99-format","read-only":false,"driver":"raw","file":"libvirt-99-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xb,drive=libvirt-99-format,id=virtio-disk53 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xb","drive":"libvirt-99-format","id":"virtio-disk53"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.img","node-name":"libvirt-98-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-98-format","read-only":false,"driver":"raw","file":"libvirt-98-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xc,drive=libvirt-98-format,id=virtio-disk54 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xc","drive":"libvirt-98-format","id":"virtio-disk54"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.img","node-name":"libvirt-97-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-97-format","read-only":false,"driver":"raw","file":"libvirt-97-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xd,drive=libvirt-97-format,id=virtio-disk55 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xd","drive":"libvirt-97-format","id":"virtio-disk55"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.img","node-name":"libvirt-96-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-96-format","read-only":false,"driver":"raw","file":"libvirt-96-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xe,drive=libvirt-96-format,id=virtio-disk78 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xe","drive":"libvirt-96-format","id":"virtio-disk78"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.img","node-name":"libvirt-95-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-95-format","read-only":false,"driver":"raw","file":"libvirt-95-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xf,drive=libvirt-95-format,id=virtio-disk79 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xf","drive":"libvirt-95-format","id":"virtio-disk79"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.img","node-name":"libvirt-94-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-94-format","read-only":false,"driver":"raw","file":"libvirt-94-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x10,drive=libvirt-94-format,id=virtio-disk80 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x10","drive":"libvirt-94-format","id":"virtio-disk80"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.img","node-name":"libvirt-93-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-93-format","read-only":false,"driver":"raw","file":"libvirt-93-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x11,drive=libvirt-93-format,id=virtio-disk81 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x11","drive":"libvirt-93-format","id":"virtio-disk81"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.img","node-name":"libvirt-92-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-92-format","read-only":false,"driver":"raw","file":"libvirt-92-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x12,drive=libvirt-92-format,id=virtio-disk104 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x12","drive":"libvirt-92-format","id":"virtio-disk104"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.img","node-name":"libvirt-91-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-91-format","read-only":false,"driver":"raw","file":"libvirt-91-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x13,drive=libvirt-91-format,id=virtio-disk105 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x13","drive":"libvirt-91-format","id":"virtio-disk105"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.img","node-name":"libvirt-90-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-90-format","read-only":false,"driver":"raw","file":"libvirt-90-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x14,drive=libvirt-90-format,id=virtio-disk106 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x14","drive":"libvirt-90-format","id":"virtio-disk106"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.img","node-name":"libvirt-89-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-89-format","read-only":false,"driver":"raw","file":"libvirt-89-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x15,drive=libvirt-89-format,id=virtio-disk107 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x15","drive":"libvirt-89-format","id":"virtio-disk107"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.img","node-name":"libvirt-88-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-88-format","read-only":false,"driver":"raw","file":"libvirt-88-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x16,drive=libvirt-88-format,id=virtio-disk130 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x16","drive":"libvirt-88-format","id":"virtio-disk130"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.img","node-name":"libvirt-87-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-87-format","read-only":false,"driver":"raw","file":"libvirt-87-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x17,drive=libvirt-87-format,id=virtio-disk131 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x17","drive":"libvirt-87-format","id":"virtio-disk131"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.img","node-name":"libvirt-86-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-86-format","read-only":false,"driver":"raw","file":"libvirt-86-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x18,drive=libvirt-86-format,id=virtio-disk132 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x18","drive":"libvirt-86-format","id":"virtio-disk132"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.img","node-name":"libvirt-85-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-85-format","read-only":false,"driver":"raw","file":"libvirt-85-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x19,drive=libvirt-85-format,id=virtio-disk133 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x19","drive":"libvirt-85-format","id":"virtio-disk133"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.img","node-name":"libvirt-84-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-84-format","read-only":false,"driver":"raw","file":"libvirt-84-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=libvirt-84-format,id=virtio-disk156 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1a","drive":"libvirt-84-format","id":"virtio-disk156"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.img","node-name":"libvirt-83-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-83-format","read-only":false,"driver":"raw","file":"libvirt-83-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=libvirt-83-format,id=virtio-disk157 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1b","drive":"libvirt-83-format","id":"virtio-disk157"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.img","node-name":"libvirt-82-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-82-format","read-only":false,"driver":"raw","file":"libvirt-82-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=libvirt-82-format,id=virtio-disk158 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1c","drive":"libvirt-82-format","id":"virtio-disk158"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.img","node-name":"libvirt-81-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-81-format","read-only":false,"driver":"raw","file":"libvirt-81-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=libvirt-81-format,id=virtio-disk159 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1d","drive":"libvirt-81-format","id":"virtio-disk159"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.img","node-name":"libvirt-80-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-80-format","read-only":false,"driver":"raw","file":"libvirt-80-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=libvirt-80-format,id=virtio-disk182 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1e","drive":"libvirt-80-format","id":"virtio-disk182"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.img","node-name":"libvirt-79-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-79-format","read-only":false,"driver":"raw","file":"libvirt-79-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=libvirt-79-format,id=virtio-disk183 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1f","drive":"libvirt-79-format","id":"virtio-disk183"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-c.img","node-name":"libvirt-78-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-78-format","read-only":false,"driver":"raw","file":"libvirt-78-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x1,drive=libvirt-78-format,id=virtio-disk184 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1","drive":"libvirt-78-format","id":"virtio-disk184"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-d.img","node-name":"libvirt-77-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-77-format","read-only":false,"driver":"raw","file":"libvirt-77-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x2,drive=libvirt-77-format,id=virtio-disk185 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x2","drive":"libvirt-77-format","id":"virtio-disk185"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-a.img","node-name":"libvirt-76-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-76-format","read-only":false,"driver":"raw","file":"libvirt-76-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x3,drive=libvirt-76-format,id=virtio-disk208 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x3","drive":"libvirt-76-format","id":"virtio-disk208"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-b.img","node-name":"libvirt-75-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-75-format","read-only":false,"driver":"raw","file":"libvirt-75-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x4,drive=libvirt-75-format,id=virtio-disk209 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x4","drive":"libvirt-75-format","id":"virtio-disk209"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-c.img","node-name":"libvirt-74-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-74-format","read-only":false,"driver":"raw","file":"libvirt-74-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x5,drive=libvirt-74-format,id=virtio-disk210 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x5","drive":"libvirt-74-format","id":"virtio-disk210"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-d.img","node-name":"libvirt-73-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-73-format","read-only":false,"driver":"raw","file":"libvirt-73-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x6,drive=libvirt-73-format,id=virtio-disk211 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x6","drive":"libvirt-73-format","id":"virtio-disk211"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-a.img","node-name":"libvirt-72-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-72-format","read-only":false,"driver":"raw","file":"libvirt-72-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x7,drive=libvirt-72-format,id=virtio-disk234 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x7","drive":"libvirt-72-format","id":"virtio-disk234"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-b.img","node-name":"libvirt-71-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-71-format","read-only":false,"driver":"raw","file":"libvirt-71-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x8,drive=libvirt-71-format,id=virtio-disk235 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x8","drive":"libvirt-71-format","id":"virtio-disk235"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-c.img","node-name":"libvirt-70-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-70-format","read-only":false,"driver":"raw","file":"libvirt-70-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x9,drive=libvirt-70-format,id=virtio-disk236 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x9","drive":"libvirt-70-format","id":"virtio-disk236"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-d.img","node-name":"libvirt-69-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-69-format","read-only":false,"driver":"raw","file":"libvirt-69-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0xa,drive=libvirt-69-format,id=virtio-disk237 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xa","drive":"libvirt-69-format","id":"virtio-disk237"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-a.img","node-name":"libvirt-68-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-68-format","read-only":false,"driver":"raw","file":"libvirt-68-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0xb,drive=libvirt-68-format,id=virtio-disk260 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xb","drive":"libvirt-68-format","id":"virtio-disk260"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-b.img","node-name":"libvirt-67-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-67-format","read-only":false,"driver":"raw","file":"libvirt-67-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0xc,drive=libvirt-67-format,id=virtio-disk261 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xc","drive":"libvirt-67-format","id":"virtio-disk261"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-c.img","node-name":"libvirt-66-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-66-format","read-only":false,"driver":"raw","file":"libvirt-66-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0xd,drive=libvirt-66-format,id=virtio-disk262 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xd","drive":"libvirt-66-format","id":"virtio-disk262"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-d.img","node-name":"libvirt-65-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-65-format","read-only":false,"driver":"raw","file":"libvirt-65-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0xe,drive=libvirt-65-format,id=virtio-disk263 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xe","drive":"libvirt-65-format","id":"virtio-disk263"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-a.img","node-name":"libvirt-64-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-64-format","read-only":false,"driver":"raw","file":"libvirt-64-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0xf,drive=libvirt-64-format,id=virtio-disk286 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xf","drive":"libvirt-64-format","id":"virtio-disk286"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-b.img","node-name":"libvirt-63-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-63-format","read-only":false,"driver":"raw","file":"libvirt-63-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x10,drive=libvirt-63-format,id=virtio-disk287 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x10","drive":"libvirt-63-format","id":"virtio-disk287"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-c.img","node-name":"libvirt-62-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-62-format","read-only":false,"driver":"raw","file":"libvirt-62-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x11,drive=libvirt-62-format,id=virtio-disk288 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x11","drive":"libvirt-62-format","id":"virtio-disk288"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-d.img","node-name":"libvirt-61-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-61-format","read-only":false,"driver":"raw","file":"libvirt-61-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x12,drive=libvirt-61-format,id=virtio-disk289 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x12","drive":"libvirt-61-format","id":"virtio-disk289"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-a.img","node-name":"libvirt-60-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-60-format","read-only":false,"driver":"raw","file":"libvirt-60-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x13,drive=libvirt-60-format,id=virtio-disk312 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x13","drive":"libvirt-60-format","id":"virtio-disk312"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-b.img","node-name":"libvirt-59-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-59-format","read-only":false,"driver":"raw","file":"libvirt-59-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x14,drive=libvirt-59-format,id=virtio-disk313 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x14","drive":"libvirt-59-format","id":"virtio-disk313"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-c.img","node-name":"libvirt-58-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-58-format","read-only":false,"driver":"raw","file":"libvirt-58-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x15,drive=libvirt-58-format,id=virtio-disk314 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x15","drive":"libvirt-58-format","id":"virtio-disk314"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-d.img","node-name":"libvirt-57-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-57-format","read-only":false,"driver":"raw","file":"libvirt-57-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x16,drive=libvirt-57-format,id=virtio-disk315 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x16","drive":"libvirt-57-format","id":"virtio-disk315"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-a.img","node-name":"libvirt-56-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-56-format","read-only":false,"driver":"raw","file":"libvirt-56-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x17,drive=libvirt-56-format,id=virtio-disk338 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x17","drive":"libvirt-56-format","id":"virtio-disk338"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-b.img","node-name":"libvirt-55-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-55-format","read-only":false,"driver":"raw","file":"libvirt-55-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x18,drive=libvirt-55-format,id=virtio-disk339 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x18","drive":"libvirt-55-format","id":"virtio-disk339"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-c.img","node-name":"libvirt-54-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-54-format","read-only":false,"driver":"raw","file":"libvirt-54-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x19,drive=libvirt-54-format,id=virtio-disk340 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x19","drive":"libvirt-54-format","id":"virtio-disk340"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-d.img","node-name":"libvirt-53-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-53-format","read-only":false,"driver":"raw","file":"libvirt-53-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=libvirt-53-format,id=virtio-disk341 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1a","drive":"libvirt-53-format","id":"virtio-disk341"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-a.img","node-name":"libvirt-52-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-52-format","read-only":false,"driver":"raw","file":"libvirt-52-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=libvirt-52-format,id=virtio-disk364 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1b","drive":"libvirt-52-format","id":"virtio-disk364"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-b.img","node-name":"libvirt-51-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-51-format","read-only":false,"driver":"raw","file":"libvirt-51-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=libvirt-51-format,id=virtio-disk365 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1c","drive":"libvirt-51-format","id":"virtio-disk365"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-c.img","node-name":"libvirt-50-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-50-format","read-only":false,"driver":"raw","file":"libvirt-50-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=libvirt-50-format,id=virtio-disk366 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1d","drive":"libvirt-50-format","id":"virtio-disk366"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-d.img","node-name":"libvirt-49-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-49-format","read-only":false,"driver":"raw","file":"libvirt-49-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=libvirt-49-format,id=virtio-disk367 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1e","drive":"libvirt-49-format","id":"virtio-disk367"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-a.img","node-name":"libvirt-48-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-48-format","read-only":false,"driver":"raw","file":"libvirt-48-storage"}' \ --device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=libvirt-48-format,id=virtio-disk390 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1f","drive":"libvirt-48-format","id":"virtio-disk390"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-b.img","node-name":"libvirt-47-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-47-format","read-only":false,"driver":"raw","file":"libvirt-47-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x1,drive=libvirt-47-format,id=virtio-disk391 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1","drive":"libvirt-47-format","id":"virtio-disk391"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-c.img","node-name":"libvirt-46-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-46-format","read-only":false,"driver":"raw","file":"libvirt-46-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x2,drive=libvirt-46-format,id=virtio-disk392 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x2","drive":"libvirt-46-format","id":"virtio-disk392"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-d.img","node-name":"libvirt-45-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-45-format","read-only":false,"driver":"raw","file":"libvirt-45-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x3,drive=libvirt-45-format,id=virtio-disk393 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x3","drive":"libvirt-45-format","id":"virtio-disk393"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-a.img","node-name":"libvirt-44-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-44-format","read-only":false,"driver":"raw","file":"libvirt-44-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x4,drive=libvirt-44-format,id=virtio-disk416 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x4","drive":"libvirt-44-format","id":"virtio-disk416"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-b.img","node-name":"libvirt-43-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-43-format","read-only":false,"driver":"raw","file":"libvirt-43-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x5,drive=libvirt-43-format,id=virtio-disk417 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x5","drive":"libvirt-43-format","id":"virtio-disk417"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-c.img","node-name":"libvirt-42-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-42-format","read-only":false,"driver":"raw","file":"libvirt-42-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x6,drive=libvirt-42-format,id=virtio-disk418 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x6","drive":"libvirt-42-format","id":"virtio-disk418"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-d.img","node-name":"libvirt-41-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-41-format","read-only":false,"driver":"raw","file":"libvirt-41-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x7,drive=libvirt-41-format,id=virtio-disk419 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x7","drive":"libvirt-41-format","id":"virtio-disk419"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-a.img","node-name":"libvirt-40-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-40-format","read-only":false,"driver":"raw","file":"libvirt-40-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x8,drive=libvirt-40-format,id=virtio-disk442 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x8","drive":"libvirt-40-format","id":"virtio-disk442"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-b.img","node-name":"libvirt-39-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-39-format","read-only":false,"driver":"raw","file":"libvirt-39-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x9,drive=libvirt-39-format,id=virtio-disk443 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x9","drive":"libvirt-39-format","id":"virtio-disk443"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-c.img","node-name":"libvirt-38-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-38-format","read-only":false,"driver":"raw","file":"libvirt-38-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0xa,drive=libvirt-38-format,id=virtio-disk444 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xa","drive":"libvirt-38-format","id":"virtio-disk444"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-d.img","node-name":"libvirt-37-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-37-format","read-only":false,"driver":"raw","file":"libvirt-37-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0xb,drive=libvirt-37-format,id=virtio-disk445 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xb","drive":"libvirt-37-format","id":"virtio-disk445"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-a.img","node-name":"libvirt-36-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-36-format","read-only":false,"driver":"raw","file":"libvirt-36-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0xc,drive=libvirt-36-format,id=virtio-disk468 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xc","drive":"libvirt-36-format","id":"virtio-disk468"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-b.img","node-name":"libvirt-35-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-35-format","read-only":false,"driver":"raw","file":"libvirt-35-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0xd,drive=libvirt-35-format,id=virtio-disk469 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xd","drive":"libvirt-35-format","id":"virtio-disk469"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-c.img","node-name":"libvirt-34-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-34-format","read-only":false,"driver":"raw","file":"libvirt-34-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0xe,drive=libvirt-34-format,id=virtio-disk470 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xe","drive":"libvirt-34-format","id":"virtio-disk470"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-d.img","node-name":"libvirt-33-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-33-format","read-only":false,"driver":"raw","file":"libvirt-33-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0xf,drive=libvirt-33-format,id=virtio-disk471 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xf","drive":"libvirt-33-format","id":"virtio-disk471"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-a.img","node-name":"libvirt-32-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-32-format","read-only":false,"driver":"raw","file":"libvirt-32-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x10,drive=libvirt-32-format,id=virtio-disk494 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x10","drive":"libvirt-32-format","id":"virtio-disk494"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-b.img","node-name":"libvirt-31-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-31-format","read-only":false,"driver":"raw","file":"libvirt-31-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x11,drive=libvirt-31-format,id=virtio-disk495 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x11","drive":"libvirt-31-format","id":"virtio-disk495"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-c.img","node-name":"libvirt-30-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-30-format","read-only":false,"driver":"raw","file":"libvirt-30-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x12,drive=libvirt-30-format,id=virtio-disk496 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x12","drive":"libvirt-30-format","id":"virtio-disk496"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-d.img","node-name":"libvirt-29-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-29-format","read-only":false,"driver":"raw","file":"libvirt-29-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x13,drive=libvirt-29-format,id=virtio-disk497 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x13","drive":"libvirt-29-format","id":"virtio-disk497"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-a.img","node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-28-format","read-only":false,"driver":"raw","file":"libvirt-28-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x14,drive=libvirt-28-format,id=virtio-disk520 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x14","drive":"libvirt-28-format","id":"virtio-disk520"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-b.img","node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-27-format","read-only":false,"driver":"raw","file":"libvirt-27-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x15,drive=libvirt-27-format,id=virtio-disk521 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x15","drive":"libvirt-27-format","id":"virtio-disk521"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-c.img","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-26-format","read-only":false,"driver":"raw","file":"libvirt-26-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x16,drive=libvirt-26-format,id=virtio-disk522 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x16","drive":"libvirt-26-format","id":"virtio-disk522"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-d.img","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-25-format","read-only":false,"driver":"raw","file":"libvirt-25-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x17,drive=libvirt-25-format,id=virtio-disk523 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x17","drive":"libvirt-25-format","id":"virtio-disk523"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-a.img","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"raw","file":"libvirt-24-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x18,drive=libvirt-24-format,id=virtio-disk546 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x18","drive":"libvirt-24-format","id":"virtio-disk546"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-b.img","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-23-format","read-only":false,"driver":"raw","file":"libvirt-23-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x19,drive=libvirt-23-format,id=virtio-disk547 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x19","drive":"libvirt-23-format","id":"virtio-disk547"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-c.img","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-22-format","read-only":false,"driver":"raw","file":"libvirt-22-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=libvirt-22-format,id=virtio-disk548 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1a","drive":"libvirt-22-format","id":"virtio-disk548"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-d.img","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-21-format","read-only":false,"driver":"raw","file":"libvirt-21-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=libvirt-21-format,id=virtio-disk549 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1b","drive":"libvirt-21-format","id":"virtio-disk549"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-a.img","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-20-format","read-only":false,"driver":"raw","file":"libvirt-20-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=libvirt-20-format,id=virtio-disk572 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1c","drive":"libvirt-20-format","id":"virtio-disk572"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-b.img","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-19-format","read-only":false,"driver":"raw","file":"libvirt-19-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=libvirt-19-format,id=virtio-disk573 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1d","drive":"libvirt-19-format","id":"virtio-disk573"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-c.img","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-18-format","read-only":false,"driver":"raw","file":"libvirt-18-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=libvirt-18-format,id=virtio-disk574 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1e","drive":"libvirt-18-format","id":"virtio-disk574"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-d.img","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"raw","file":"libvirt-17-storage"}' \ --device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=libvirt-17-format,id=virtio-disk575 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1f","drive":"libvirt-17-format","id":"virtio-disk575"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-a.img","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"raw","file":"libvirt-16-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0x1,drive=libvirt-16-format,id=virtio-disk598 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x1","drive":"libvirt-16-format","id":"virtio-disk598"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-b.img","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-15-format","read-only":false,"driver":"raw","file":"libvirt-15-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0x2,drive=libvirt-15-format,id=virtio-disk599 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x2","drive":"libvirt-15-format","id":"virtio-disk599"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-c.img","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"raw","file":"libvirt-14-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0x3,drive=libvirt-14-format,id=virtio-disk600 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x3","drive":"libvirt-14-format","id":"virtio-disk600"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-d.img","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"raw","file":"libvirt-13-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0x4,drive=libvirt-13-format,id=virtio-disk601 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x4","drive":"libvirt-13-format","id":"virtio-disk601"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-a.img","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-12-format","read-only":false,"driver":"raw","file":"libvirt-12-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0x5,drive=libvirt-12-format,id=virtio-disk624 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x5","drive":"libvirt-12-format","id":"virtio-disk624"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-b.img","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-11-format","read-only":false,"driver":"raw","file":"libvirt-11-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0x6,drive=libvirt-11-format,id=virtio-disk625 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x6","drive":"libvirt-11-format","id":"virtio-disk625"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-c.img","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-10-format","read-only":false,"driver":"raw","file":"libvirt-10-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0x7,drive=libvirt-10-format,id=virtio-disk626 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x7","drive":"libvirt-10-format","id":"virtio-disk626"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-d.img","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-9-format","read-only":false,"driver":"raw","file":"libvirt-9-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0x8,drive=libvirt-9-format,id=virtio-disk627 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x8","drive":"libvirt-9-format","id":"virtio-disk627"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-a.img","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"raw","file":"libvirt-8-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0x9,drive=libvirt-8-format,id=virtio-disk650 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x9","drive":"libvirt-8-format","id":"virtio-disk650"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-b.img","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw","file":"libvirt-7-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0xa,drive=libvirt-7-format,id=virtio-disk651 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xa","drive":"libvirt-7-format","id":"virtio-disk651"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-c.img","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw","file":"libvirt-6-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0xb,drive=libvirt-6-format,id=virtio-disk652 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xb","drive":"libvirt-6-format","id":"virtio-disk652"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-d.img","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw","file":"libvirt-5-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0xc,drive=libvirt-5-format,id=virtio-disk653 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xc","drive":"libvirt-5-format","id":"virtio-disk653"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-a.img","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0xd,drive=libvirt-4-format,id=virtio-disk676 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xd","drive":"libvirt-4-format","id":"virtio-disk676"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-b.img","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0xe,drive=libvirt-3-format,id=virtio-disk677 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xe","drive":"libvirt-3-format","id":"virtio-disk677"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-c.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0xf,drive=libvirt-2-format,id=virtio-disk678 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xf","drive":"libvirt-2-format","id":"virtio-disk678"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-d.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=pci.3,addr=0x10,drive=libvirt-1-format,id=virtio-disk679 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x10","drive":"libvirt-1-format","id":"virtio-disk679"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args index 0740a887ba..1e1d4c30e2 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=fdr-br,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -23,79 +23,79 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --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 '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0","addr":"0x4"}' \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \ --netdev user,id=hostnet0 \ --device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.0,addr=0x5 \ --netdev user,id=hostnet1 \ --device e1000,netdev=hostnet1,id=net1,mac=52:54:00:5c:c6:1a,bus=pci.0,addr=0x7 \ --netdev user,id=hostnet2 \ --device e1000,netdev=hostnet2,id=net2,mac=52:54:00:39:97:ac,bus=pci.0,addr=0x8 \ --netdev user,id=hostnet3 \ --device e1000,netdev=hostnet3,id=net3,mac=52:54:00:45:28:cb,bus=pci.0,addr=0x9 \ --netdev user,id=hostnet4 \ --device e1000,netdev=hostnet4,id=net4,mac=52:54:00:ee:b9:a8,bus=pci.0,addr=0xa \ --netdev user,id=hostnet5 \ --device e1000,netdev=hostnet5,id=net5,mac=52:54:00:a9:f7:17,bus=pci.0,addr=0xb \ --netdev user,id=hostnet6 \ --device e1000,netdev=hostnet6,id=net6,mac=52:54:00:df:2b:f3,bus=pci.0,addr=0xc \ --netdev user,id=hostnet7 \ --device e1000,netdev=hostnet7,id=net7,mac=52:54:00:78:94:b4,bus=pci.0,addr=0xd \ --netdev user,id=hostnet8 \ --device e1000,netdev=hostnet8,id=net8,mac=52:54:00:6b:9b:06,bus=pci.0,addr=0xe \ --netdev user,id=hostnet9 \ --device e1000,netdev=hostnet9,id=net9,mac=52:54:00:17:df:bc,bus=pci.0,addr=0xf \ --netdev user,id=hostnet10 \ --device rtl8139,netdev=hostnet10,id=net10,mac=52:54:00:3b:d0:51,bus=pci.0,addr=0x10 \ --netdev user,id=hostnet11 \ --device e1000,netdev=hostnet11,id=net11,mac=52:54:00:8d:2d:17,bus=pci.0,addr=0x11 \ --netdev user,id=hostnet12 \ --device e1000,netdev=hostnet12,id=net12,mac=52:54:00:a7:66:af,bus=pci.0,addr=0x12 \ --netdev user,id=hostnet13 \ --device e1000,netdev=hostnet13,id=net13,mac=52:54:00:54:ab:d7,bus=pci.0,addr=0x13 \ --netdev user,id=hostnet14 \ --device e1000,netdev=hostnet14,id=net14,mac=52:54:00:1f:99:90,bus=pci.0,addr=0x14 \ --netdev user,id=hostnet15 \ --device e1000,netdev=hostnet15,id=net15,mac=52:54:00:c8:43:87,bus=pci.0,addr=0x15 \ --netdev user,id=hostnet16 \ --device e1000,netdev=hostnet16,id=net16,mac=52:54:00:df:22:b2,bus=pci.0,addr=0x16 \ --netdev user,id=hostnet17 \ --device e1000,netdev=hostnet17,id=net17,mac=52:54:00:d2:9a:47,bus=pci.0,addr=0x17 \ --netdev user,id=hostnet18 \ --device e1000,netdev=hostnet18,id=net18,mac=52:54:00:86:05:e2,bus=pci.0,addr=0x18 \ --netdev user,id=hostnet19 \ --device e1000,netdev=hostnet19,id=net19,mac=52:54:00:8c:1c:c2,bus=pci.0,addr=0x19 \ --netdev user,id=hostnet20 \ --device e1000,netdev=hostnet20,id=net20,mac=52:54:00:48:58:92,bus=pci.0,addr=0x1a \ --netdev user,id=hostnet21 \ --device e1000,netdev=hostnet21,id=net21,mac=52:54:00:99:e5:bf,bus=pci.0,addr=0x1b \ --netdev user,id=hostnet22 \ --device e1000,netdev=hostnet22,id=net22,mac=52:54:00:b1:8c:25,bus=pci.0,addr=0x1c \ --netdev user,id=hostnet23 \ --device e1000,netdev=hostnet23,id=net23,mac=52:54:00:60:e0:d0,bus=pci.0,addr=0x1d \ --netdev user,id=hostnet24 \ --device e1000,netdev=hostnet24,id=net24,mac=52:54:00:37:00:6a,bus=pci.0,addr=0x1e \ --netdev user,id=hostnet25 \ --device e1000,netdev=hostnet25,id=net25,mac=52:54:00:c7:c8:ad,bus=pci.0,addr=0x1f \ --netdev user,id=hostnet26 \ --device e1000,netdev=hostnet26,id=net26,mac=52:54:00:4e:a7:cf,bus=pci.1,addr=0x1 \ --netdev user,id=hostnet27 \ --device e1000,netdev=hostnet27,id=net27,mac=52:54:00:00:79:69,bus=pci.1,addr=0x2 \ --netdev user,id=hostnet28 \ --device e1000,netdev=hostnet28,id=net28,mac=52:54:00:47:00:6f,bus=pci.1,addr=0x3 \ --netdev user,id=hostnet29 \ --device e1000,netdev=hostnet29,id=net29,mac=52:54:00:2a:8c:8b,bus=pci.1,addr=0x4 \ --netdev user,id=hostnet30 \ --device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x5 \ --netdev user,id=hostnet31 \ --device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x6 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:f1:95:51","bus":"pci.0","addr":"0x5"}' \ +-netdev '{"type":"user","id":"hostnet1"}' \ +-device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"52:54:00:5c:c6:1a","bus":"pci.0","addr":"0x7"}' \ +-netdev '{"type":"user","id":"hostnet2"}' \ +-device '{"driver":"e1000","netdev":"hostnet2","id":"net2","mac":"52:54:00:39:97:ac","bus":"pci.0","addr":"0x8"}' \ +-netdev '{"type":"user","id":"hostnet3"}' \ +-device '{"driver":"e1000","netdev":"hostnet3","id":"net3","mac":"52:54:00:45:28:cb","bus":"pci.0","addr":"0x9"}' \ +-netdev '{"type":"user","id":"hostnet4"}' \ +-device '{"driver":"e1000","netdev":"hostnet4","id":"net4","mac":"52:54:00:ee:b9:a8","bus":"pci.0","addr":"0xa"}' \ +-netdev '{"type":"user","id":"hostnet5"}' \ +-device '{"driver":"e1000","netdev":"hostnet5","id":"net5","mac":"52:54:00:a9:f7:17","bus":"pci.0","addr":"0xb"}' \ +-netdev '{"type":"user","id":"hostnet6"}' \ +-device '{"driver":"e1000","netdev":"hostnet6","id":"net6","mac":"52:54:00:df:2b:f3","bus":"pci.0","addr":"0xc"}' \ +-netdev '{"type":"user","id":"hostnet7"}' \ +-device '{"driver":"e1000","netdev":"hostnet7","id":"net7","mac":"52:54:00:78:94:b4","bus":"pci.0","addr":"0xd"}' \ +-netdev '{"type":"user","id":"hostnet8"}' \ +-device '{"driver":"e1000","netdev":"hostnet8","id":"net8","mac":"52:54:00:6b:9b:06","bus":"pci.0","addr":"0xe"}' \ +-netdev '{"type":"user","id":"hostnet9"}' \ +-device '{"driver":"e1000","netdev":"hostnet9","id":"net9","mac":"52:54:00:17:df:bc","bus":"pci.0","addr":"0xf"}' \ +-netdev '{"type":"user","id":"hostnet10"}' \ +-device '{"driver":"rtl8139","netdev":"hostnet10","id":"net10","mac":"52:54:00:3b:d0:51","bus":"pci.0","addr":"0x10"}' \ +-netdev '{"type":"user","id":"hostnet11"}' \ +-device '{"driver":"e1000","netdev":"hostnet11","id":"net11","mac":"52:54:00:8d:2d:17","bus":"pci.0","addr":"0x11"}' \ +-netdev '{"type":"user","id":"hostnet12"}' \ +-device '{"driver":"e1000","netdev":"hostnet12","id":"net12","mac":"52:54:00:a7:66:af","bus":"pci.0","addr":"0x12"}' \ +-netdev '{"type":"user","id":"hostnet13"}' \ +-device '{"driver":"e1000","netdev":"hostnet13","id":"net13","mac":"52:54:00:54:ab:d7","bus":"pci.0","addr":"0x13"}' \ +-netdev '{"type":"user","id":"hostnet14"}' \ +-device '{"driver":"e1000","netdev":"hostnet14","id":"net14","mac":"52:54:00:1f:99:90","bus":"pci.0","addr":"0x14"}' \ +-netdev '{"type":"user","id":"hostnet15"}' \ +-device '{"driver":"e1000","netdev":"hostnet15","id":"net15","mac":"52:54:00:c8:43:87","bus":"pci.0","addr":"0x15"}' \ +-netdev '{"type":"user","id":"hostnet16"}' \ +-device '{"driver":"e1000","netdev":"hostnet16","id":"net16","mac":"52:54:00:df:22:b2","bus":"pci.0","addr":"0x16"}' \ +-netdev '{"type":"user","id":"hostnet17"}' \ +-device '{"driver":"e1000","netdev":"hostnet17","id":"net17","mac":"52:54:00:d2:9a:47","bus":"pci.0","addr":"0x17"}' \ +-netdev '{"type":"user","id":"hostnet18"}' \ +-device '{"driver":"e1000","netdev":"hostnet18","id":"net18","mac":"52:54:00:86:05:e2","bus":"pci.0","addr":"0x18"}' \ +-netdev '{"type":"user","id":"hostnet19"}' \ +-device '{"driver":"e1000","netdev":"hostnet19","id":"net19","mac":"52:54:00:8c:1c:c2","bus":"pci.0","addr":"0x19"}' \ +-netdev '{"type":"user","id":"hostnet20"}' \ +-device '{"driver":"e1000","netdev":"hostnet20","id":"net20","mac":"52:54:00:48:58:92","bus":"pci.0","addr":"0x1a"}' \ +-netdev '{"type":"user","id":"hostnet21"}' \ +-device '{"driver":"e1000","netdev":"hostnet21","id":"net21","mac":"52:54:00:99:e5:bf","bus":"pci.0","addr":"0x1b"}' \ +-netdev '{"type":"user","id":"hostnet22"}' \ +-device '{"driver":"e1000","netdev":"hostnet22","id":"net22","mac":"52:54:00:b1:8c:25","bus":"pci.0","addr":"0x1c"}' \ +-netdev '{"type":"user","id":"hostnet23"}' \ +-device '{"driver":"e1000","netdev":"hostnet23","id":"net23","mac":"52:54:00:60:e0:d0","bus":"pci.0","addr":"0x1d"}' \ +-netdev '{"type":"user","id":"hostnet24"}' \ +-device '{"driver":"e1000","netdev":"hostnet24","id":"net24","mac":"52:54:00:37:00:6a","bus":"pci.0","addr":"0x1e"}' \ +-netdev '{"type":"user","id":"hostnet25"}' \ +-device '{"driver":"e1000","netdev":"hostnet25","id":"net25","mac":"52:54:00:c7:c8:ad","bus":"pci.0","addr":"0x1f"}' \ +-netdev '{"type":"user","id":"hostnet26"}' \ +-device '{"driver":"e1000","netdev":"hostnet26","id":"net26","mac":"52:54:00:4e:a7:cf","bus":"pci.1","addr":"0x1"}' \ +-netdev '{"type":"user","id":"hostnet27"}' \ +-device '{"driver":"e1000","netdev":"hostnet27","id":"net27","mac":"52:54:00:00:79:69","bus":"pci.1","addr":"0x2"}' \ +-netdev '{"type":"user","id":"hostnet28"}' \ +-device '{"driver":"e1000","netdev":"hostnet28","id":"net28","mac":"52:54:00:47:00:6f","bus":"pci.1","addr":"0x3"}' \ +-netdev '{"type":"user","id":"hostnet29"}' \ +-device '{"driver":"e1000","netdev":"hostnet29","id":"net29","mac":"52:54:00:2a:8c:8b","bus":"pci.1","addr":"0x4"}' \ +-netdev '{"type":"user","id":"hostnet30"}' \ +-device '{"driver":"e1000","netdev":"hostnet30","id":"net30","mac":"52:54:00:ec:d5:e3","bus":"pci.1","addr":"0x5"}' \ +-netdev '{"type":"user","id":"hostnet31"}' \ +-device '{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:00:7e:6e:c8","bus":"pci.1","addr":"0x6"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=audio1 \ -k en-us \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args index 16622b8b83..e4c9bfead0 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=expander-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-expander-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-expander-test/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,72 +27,72 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --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=0x4 \ --netdev user,id=hostnet1 \ --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=0x7 \ --netdev user,id=hostnet3 \ --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=0x9 \ --netdev user,id=hostnet5 \ --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=0xb \ --netdev user,id=hostnet7 \ --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=0xd \ --netdev user,id=hostnet9 \ --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=0xf \ --netdev user,id=hostnet11 \ --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=0x11 \ --netdev user,id=hostnet13 \ --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=0x13 \ --netdev user,id=hostnet15 \ --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=0x15 \ --netdev user,id=hostnet17 \ --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=0x17 \ --netdev user,id=hostnet19 \ --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=0x19 \ --netdev user,id=hostnet21 \ --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=0x1b \ --netdev user,id=hostnet23 \ --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=0x1d \ --netdev user,id=hostnet25 \ --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.0,addr=0x1f \ --netdev user,id=hostnet27 \ --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=0x1 \ --netdev user,id=hostnet29 \ --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=0x3 \ --netdev user,id=hostnet31 \ --device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x4 \ +-device '{"driver":"pxb","bus_nr":254,"id":"pci.1","numa_node":1,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"pxb","bus_nr":252,"id":"pci.2","bus":"pci.0","addr":"0x3"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:f1:95:51","bus":"pci.0","addr":"0x4"}' \ +-netdev '{"type":"user","id":"hostnet1"}' \ +-device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"52:54:00:5c:c6:1a","bus":"pci.0","addr":"0x5"}' \ +-netdev '{"type":"user","id":"hostnet2"}' \ +-device '{"driver":"e1000","netdev":"hostnet2","id":"net2","mac":"52:54:00:39:97:ac","bus":"pci.0","addr":"0x7"}' \ +-netdev '{"type":"user","id":"hostnet3"}' \ +-device '{"driver":"e1000","netdev":"hostnet3","id":"net3","mac":"52:54:00:45:28:cb","bus":"pci.0","addr":"0x8"}' \ +-netdev '{"type":"user","id":"hostnet4"}' \ +-device '{"driver":"e1000","netdev":"hostnet4","id":"net4","mac":"52:54:00:ee:b9:a8","bus":"pci.0","addr":"0x9"}' \ +-netdev '{"type":"user","id":"hostnet5"}' \ +-device '{"driver":"e1000","netdev":"hostnet5","id":"net5","mac":"52:54:00:a9:f7:17","bus":"pci.0","addr":"0xa"}' \ +-netdev '{"type":"user","id":"hostnet6"}' \ +-device '{"driver":"e1000","netdev":"hostnet6","id":"net6","mac":"52:54:00:df:2b:f3","bus":"pci.0","addr":"0xb"}' \ +-netdev '{"type":"user","id":"hostnet7"}' \ +-device '{"driver":"e1000","netdev":"hostnet7","id":"net7","mac":"52:54:00:78:94:b4","bus":"pci.0","addr":"0xc"}' \ +-netdev '{"type":"user","id":"hostnet8"}' \ +-device '{"driver":"e1000","netdev":"hostnet8","id":"net8","mac":"52:54:00:6b:9b:06","bus":"pci.0","addr":"0xd"}' \ +-netdev '{"type":"user","id":"hostnet9"}' \ +-device '{"driver":"e1000","netdev":"hostnet9","id":"net9","mac":"52:54:00:17:df:bc","bus":"pci.0","addr":"0xe"}' \ +-netdev '{"type":"user","id":"hostnet10"}' \ +-device '{"driver":"e1000","netdev":"hostnet10","id":"net10","mac":"52:54:00:3b:d0:51","bus":"pci.0","addr":"0xf"}' \ +-netdev '{"type":"user","id":"hostnet11"}' \ +-device '{"driver":"e1000","netdev":"hostnet11","id":"net11","mac":"52:54:00:8d:2d:17","bus":"pci.0","addr":"0x10"}' \ +-netdev '{"type":"user","id":"hostnet12"}' \ +-device '{"driver":"e1000","netdev":"hostnet12","id":"net12","mac":"52:54:00:a7:66:af","bus":"pci.0","addr":"0x11"}' \ +-netdev '{"type":"user","id":"hostnet13"}' \ +-device '{"driver":"e1000","netdev":"hostnet13","id":"net13","mac":"52:54:00:54:ab:d7","bus":"pci.0","addr":"0x12"}' \ +-netdev '{"type":"user","id":"hostnet14"}' \ +-device '{"driver":"e1000","netdev":"hostnet14","id":"net14","mac":"52:54:00:1f:99:90","bus":"pci.0","addr":"0x13"}' \ +-netdev '{"type":"user","id":"hostnet15"}' \ +-device '{"driver":"e1000","netdev":"hostnet15","id":"net15","mac":"52:54:00:c8:43:87","bus":"pci.0","addr":"0x14"}' \ +-netdev '{"type":"user","id":"hostnet16"}' \ +-device '{"driver":"e1000","netdev":"hostnet16","id":"net16","mac":"52:54:00:df:22:b2","bus":"pci.0","addr":"0x15"}' \ +-netdev '{"type":"user","id":"hostnet17"}' \ +-device '{"driver":"e1000","netdev":"hostnet17","id":"net17","mac":"52:54:00:d2:9a:47","bus":"pci.0","addr":"0x16"}' \ +-netdev '{"type":"user","id":"hostnet18"}' \ +-device '{"driver":"e1000","netdev":"hostnet18","id":"net18","mac":"52:54:00:86:05:e2","bus":"pci.0","addr":"0x17"}' \ +-netdev '{"type":"user","id":"hostnet19"}' \ +-device '{"driver":"e1000","netdev":"hostnet19","id":"net19","mac":"52:54:00:8c:1c:c2","bus":"pci.0","addr":"0x18"}' \ +-netdev '{"type":"user","id":"hostnet20"}' \ +-device '{"driver":"e1000","netdev":"hostnet20","id":"net20","mac":"52:54:00:48:58:92","bus":"pci.0","addr":"0x19"}' \ +-netdev '{"type":"user","id":"hostnet21"}' \ +-device '{"driver":"e1000","netdev":"hostnet21","id":"net21","mac":"52:54:00:99:e5:bf","bus":"pci.0","addr":"0x1a"}' \ +-netdev '{"type":"user","id":"hostnet22"}' \ +-device '{"driver":"e1000","netdev":"hostnet22","id":"net22","mac":"52:54:00:b1:8c:25","bus":"pci.0","addr":"0x1b"}' \ +-netdev '{"type":"user","id":"hostnet23"}' \ +-device '{"driver":"e1000","netdev":"hostnet23","id":"net23","mac":"52:54:00:60:e0:d0","bus":"pci.0","addr":"0x1c"}' \ +-netdev '{"type":"user","id":"hostnet24"}' \ +-device '{"driver":"e1000","netdev":"hostnet24","id":"net24","mac":"52:54:00:37:00:6a","bus":"pci.0","addr":"0x1d"}' \ +-netdev '{"type":"user","id":"hostnet25"}' \ +-device '{"driver":"e1000","netdev":"hostnet25","id":"net25","mac":"52:54:00:c7:c8:ad","bus":"pci.0","addr":"0x1e"}' \ +-netdev '{"type":"user","id":"hostnet26"}' \ +-device '{"driver":"e1000","netdev":"hostnet26","id":"net26","mac":"52:54:00:4e:a7:cf","bus":"pci.0","addr":"0x1f"}' \ +-netdev '{"type":"user","id":"hostnet27"}' \ +-device '{"driver":"e1000","netdev":"hostnet27","id":"net27","mac":"52:54:00:00:79:69","bus":"pci.1","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet28"}' \ +-device '{"driver":"e1000","netdev":"hostnet28","id":"net28","mac":"52:54:00:47:00:6f","bus":"pci.1","addr":"0x1"}' \ +-netdev '{"type":"user","id":"hostnet29"}' \ +-device '{"driver":"e1000","netdev":"hostnet29","id":"net29","mac":"52:54:00:2a:8c:8b","bus":"pci.1","addr":"0x2"}' \ +-netdev '{"type":"user","id":"hostnet30"}' \ +-device '{"driver":"e1000","netdev":"hostnet30","id":"net30","mac":"52:54:00:ec:d5:e3","bus":"pci.1","addr":"0x3"}' \ +-netdev '{"type":"user","id":"hostnet31"}' \ +-device '{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:00:7e:6e:c8","bus":"pci.1","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args index 494451423d..028f4bf278 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=fdr-br,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -27,92 +27,92 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-29-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-29-format","read-only":true,"driver":"raw","file":"libvirt-29-storage"}' \ --device ide-cd,bus=ide.1,unit=0,drive=libvirt-29-format,id=ide0-1-0 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-29-format","id":"ide0-1-0"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img","node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-28-format","read-only":false,"driver":"raw","file":"libvirt-28-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-28-format,id=virtio-disk0,bootindex=1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-28-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test1.img","node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-27-format","read-only":false,"driver":"raw","file":"libvirt-27-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-27-format,id=virtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-27-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.img","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-26-format","read-only":false,"driver":"raw","file":"libvirt-26-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-26-format,id=virtio-disk26 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"libvirt-26-format","id":"virtio-disk26"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.img","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-25-format","read-only":false,"driver":"raw","file":"libvirt-25-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-25-format,id=virtio-disk27 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-25-format","id":"virtio-disk27"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.img","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"raw","file":"libvirt-24-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x8,drive=libvirt-24-format,id=virtio-disk28 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"libvirt-24-format","id":"virtio-disk28"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.img","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-23-format","read-only":false,"driver":"raw","file":"libvirt-23-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x9,drive=libvirt-23-format,id=virtio-disk29 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"libvirt-23-format","id":"virtio-disk29"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.img","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-22-format","read-only":false,"driver":"raw","file":"libvirt-22-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xa,drive=libvirt-22-format,id=virtio-disk52 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"libvirt-22-format","id":"virtio-disk52"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.img","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-21-format","read-only":false,"driver":"raw","file":"libvirt-21-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xb,drive=libvirt-21-format,id=virtio-disk53 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xb","drive":"libvirt-21-format","id":"virtio-disk53"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.img","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-20-format","read-only":false,"driver":"raw","file":"libvirt-20-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xc,drive=libvirt-20-format,id=virtio-disk54 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xc","drive":"libvirt-20-format","id":"virtio-disk54"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.img","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-19-format","read-only":false,"driver":"raw","file":"libvirt-19-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xd,drive=libvirt-19-format,id=virtio-disk55 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xd","drive":"libvirt-19-format","id":"virtio-disk55"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.img","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-18-format","read-only":false,"driver":"raw","file":"libvirt-18-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xe,drive=libvirt-18-format,id=virtio-disk78 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xe","drive":"libvirt-18-format","id":"virtio-disk78"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.img","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"raw","file":"libvirt-17-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0xf,drive=libvirt-17-format,id=virtio-disk79 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xf","drive":"libvirt-17-format","id":"virtio-disk79"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.img","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"raw","file":"libvirt-16-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x10,drive=libvirt-16-format,id=virtio-disk80 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x10","drive":"libvirt-16-format","id":"virtio-disk80"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.img","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-15-format","read-only":false,"driver":"raw","file":"libvirt-15-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x11,drive=libvirt-15-format,id=virtio-disk81 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x11","drive":"libvirt-15-format","id":"virtio-disk81"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.img","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"raw","file":"libvirt-14-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x12,drive=libvirt-14-format,id=virtio-disk104 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x12","drive":"libvirt-14-format","id":"virtio-disk104"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.img","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"raw","file":"libvirt-13-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x13,drive=libvirt-13-format,id=virtio-disk105 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x13","drive":"libvirt-13-format","id":"virtio-disk105"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.img","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-12-format","read-only":false,"driver":"raw","file":"libvirt-12-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x14,drive=libvirt-12-format,id=virtio-disk106 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x14","drive":"libvirt-12-format","id":"virtio-disk106"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.img","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-11-format","read-only":false,"driver":"raw","file":"libvirt-11-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x15,drive=libvirt-11-format,id=virtio-disk107 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x15","drive":"libvirt-11-format","id":"virtio-disk107"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.img","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-10-format","read-only":false,"driver":"raw","file":"libvirt-10-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x16,drive=libvirt-10-format,id=virtio-disk130 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x16","drive":"libvirt-10-format","id":"virtio-disk130"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.img","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-9-format","read-only":false,"driver":"raw","file":"libvirt-9-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x17,drive=libvirt-9-format,id=virtio-disk131 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x17","drive":"libvirt-9-format","id":"virtio-disk131"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.img","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"raw","file":"libvirt-8-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x18,drive=libvirt-8-format,id=virtio-disk132 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x18","drive":"libvirt-8-format","id":"virtio-disk132"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.img","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw","file":"libvirt-7-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x19,drive=libvirt-7-format,id=virtio-disk133 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x19","drive":"libvirt-7-format","id":"virtio-disk133"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.img","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw","file":"libvirt-6-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=libvirt-6-format,id=virtio-disk156 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1a","drive":"libvirt-6-format","id":"virtio-disk156"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.img","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw","file":"libvirt-5-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=libvirt-5-format,id=virtio-disk157 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1b","drive":"libvirt-5-format","id":"virtio-disk157"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.img","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=libvirt-4-format,id=virtio-disk158 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1c","drive":"libvirt-4-format","id":"virtio-disk158"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.img","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=libvirt-3-format,id=virtio-disk159 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1d","drive":"libvirt-3-format","id":"virtio-disk159"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=libvirt-2-format,id=virtio-disk182 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1e","drive":"libvirt-2-format","id":"virtio-disk182"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=libvirt-1-format,id=virtio-disk183 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1f","drive":"libvirt-1-format","id":"virtio-disk183"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.args index ecf638e182..2ddb190c66 100644 --- a/tests/qemuxml2argvdata/pci-rom-disabled.args +++ b/tests/qemuxml2argvdata/pci-rom-disabled.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=guest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --netdev user,id=hostnet0 \ --device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,romfile= \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:24:a5:9f","bus":"pci.0","addr":"0x2","romfile":""}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args index 886862eb98..cbc3fc950c 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,13 +28,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,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=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=0x3,romfile=/etc/fake/bootrom.bin \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:24:a5:9f","bus":"pci.0","addr":"0x2","rombar":1}' \ +-netdev '{"type":"user","id":"hostnet1"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"52:54:00:24:a5:9e","bus":"pci.0","addr":"0x3","romfile":"/etc/fake/bootrom.bin"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --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 \ +-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":"pci.0","addr":"0x4","rombar":0}' \ +-device '{"driver":"vfio-pci","host":"0000:06:12.6","id":"hostdev1","bus":"pci.0","addr":"0x5","rombar":1,"romfile":"/etc/fake/bootrom.bin"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args index e8f4dc1292..4cb85a0999 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=pcie-expander-bus-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,108 +27,108 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device pxb-pcie,bus_nr=254,id=pci.1,numa_node=0,bus=pcie.0,addr=0x4 \ --device ioh3420,port=0,chassis=2,id=pci.2,bus=pci.1,addr=0x0 \ --device x3130-upstream,id=pci.3,bus=pci.2,addr=0x0 \ --device xio3130-downstream,port=0,chassis=4,id=pci.4,bus=pci.3,addr=0x0 \ --device xio3130-downstream,port=1,chassis=5,id=pci.5,bus=pci.3,addr=0x1 \ --device xio3130-downstream,port=2,chassis=6,id=pci.6,bus=pci.3,addr=0x2 \ --device xio3130-downstream,port=3,chassis=7,id=pci.7,bus=pci.3,addr=0x3 \ --device xio3130-downstream,port=4,chassis=8,id=pci.8,bus=pci.3,addr=0x4 \ --device xio3130-downstream,port=5,chassis=9,id=pci.9,bus=pci.3,addr=0x5 \ --device xio3130-downstream,port=6,chassis=10,id=pci.10,bus=pci.3,addr=0x6 \ --device xio3130-downstream,port=7,chassis=11,id=pci.11,bus=pci.3,addr=0x7 \ --device xio3130-downstream,port=8,chassis=12,id=pci.12,bus=pci.3,addr=0x8 \ --device xio3130-downstream,port=9,chassis=13,id=pci.13,bus=pci.3,addr=0x9 \ --device xio3130-downstream,port=10,chassis=14,id=pci.14,bus=pci.3,addr=0xa \ --device xio3130-downstream,port=11,chassis=15,id=pci.15,bus=pci.3,addr=0xb \ --device xio3130-downstream,port=12,chassis=16,id=pci.16,bus=pci.3,addr=0xc \ --device xio3130-downstream,port=13,chassis=17,id=pci.17,bus=pci.3,addr=0xd \ --device xio3130-downstream,port=14,chassis=18,id=pci.18,bus=pci.3,addr=0xe \ --device xio3130-downstream,port=15,chassis=19,id=pci.19,bus=pci.3,addr=0xf \ --device xio3130-downstream,port=16,chassis=20,id=pci.20,bus=pci.3,addr=0x10 \ --device xio3130-downstream,port=17,chassis=21,id=pci.21,bus=pci.3,addr=0x11 \ --device xio3130-downstream,port=18,chassis=22,id=pci.22,bus=pci.3,addr=0x12 \ --device xio3130-downstream,port=19,chassis=23,id=pci.23,bus=pci.3,addr=0x13 \ --device xio3130-downstream,port=20,chassis=24,id=pci.24,bus=pci.3,addr=0x14 \ --device xio3130-downstream,port=21,chassis=25,id=pci.25,bus=pci.3,addr=0x15 \ --device xio3130-downstream,port=22,chassis=26,id=pci.26,bus=pci.3,addr=0x16 \ --device xio3130-downstream,port=23,chassis=27,id=pci.27,bus=pci.3,addr=0x17 \ --device xio3130-downstream,port=24,chassis=28,id=pci.28,bus=pci.3,addr=0x18 \ --device xio3130-downstream,port=25,chassis=29,id=pci.29,bus=pci.3,addr=0x19 \ --device xio3130-downstream,port=26,chassis=30,id=pci.30,bus=pci.3,addr=0x1a \ --device xio3130-downstream,port=27,chassis=31,id=pci.31,bus=pci.3,addr=0x1b \ --device xio3130-downstream,port=28,chassis=32,id=pci.32,bus=pci.3,addr=0x1c \ --device xio3130-downstream,port=29,chassis=33,id=pci.33,bus=pci.3,addr=0x1d \ --device xio3130-downstream,port=30,chassis=34,id=pci.34,bus=pci.3,addr=0x1e \ --device xio3130-downstream,port=31,chassis=35,id=pci.35,bus=pci.3,addr=0x1f \ +-device '{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","numa_node":0,"bus":"pcie.0","addr":"0x4"}' \ +-device '{"driver":"ioh3420","port":0,"chassis":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":0,"chassis":4,"id":"pci.4","bus":"pci.3","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":1,"chassis":5,"id":"pci.5","bus":"pci.3","addr":"0x1"}' \ +-device '{"driver":"xio3130-downstream","port":2,"chassis":6,"id":"pci.6","bus":"pci.3","addr":"0x2"}' \ +-device '{"driver":"xio3130-downstream","port":3,"chassis":7,"id":"pci.7","bus":"pci.3","addr":"0x3"}' \ +-device '{"driver":"xio3130-downstream","port":4,"chassis":8,"id":"pci.8","bus":"pci.3","addr":"0x4"}' \ +-device '{"driver":"xio3130-downstream","port":5,"chassis":9,"id":"pci.9","bus":"pci.3","addr":"0x5"}' \ +-device '{"driver":"xio3130-downstream","port":6,"chassis":10,"id":"pci.10","bus":"pci.3","addr":"0x6"}' \ +-device '{"driver":"xio3130-downstream","port":7,"chassis":11,"id":"pci.11","bus":"pci.3","addr":"0x7"}' \ +-device '{"driver":"xio3130-downstream","port":8,"chassis":12,"id":"pci.12","bus":"pci.3","addr":"0x8"}' \ +-device '{"driver":"xio3130-downstream","port":9,"chassis":13,"id":"pci.13","bus":"pci.3","addr":"0x9"}' \ +-device '{"driver":"xio3130-downstream","port":10,"chassis":14,"id":"pci.14","bus":"pci.3","addr":"0xa"}' \ +-device '{"driver":"xio3130-downstream","port":11,"chassis":15,"id":"pci.15","bus":"pci.3","addr":"0xb"}' \ +-device '{"driver":"xio3130-downstream","port":12,"chassis":16,"id":"pci.16","bus":"pci.3","addr":"0xc"}' \ +-device '{"driver":"xio3130-downstream","port":13,"chassis":17,"id":"pci.17","bus":"pci.3","addr":"0xd"}' \ +-device '{"driver":"xio3130-downstream","port":14,"chassis":18,"id":"pci.18","bus":"pci.3","addr":"0xe"}' \ +-device '{"driver":"xio3130-downstream","port":15,"chassis":19,"id":"pci.19","bus":"pci.3","addr":"0xf"}' \ +-device '{"driver":"xio3130-downstream","port":16,"chassis":20,"id":"pci.20","bus":"pci.3","addr":"0x10"}' \ +-device '{"driver":"xio3130-downstream","port":17,"chassis":21,"id":"pci.21","bus":"pci.3","addr":"0x11"}' \ +-device '{"driver":"xio3130-downstream","port":18,"chassis":22,"id":"pci.22","bus":"pci.3","addr":"0x12"}' \ +-device '{"driver":"xio3130-downstream","port":19,"chassis":23,"id":"pci.23","bus":"pci.3","addr":"0x13"}' \ +-device '{"driver":"xio3130-downstream","port":20,"chassis":24,"id":"pci.24","bus":"pci.3","addr":"0x14"}' \ +-device '{"driver":"xio3130-downstream","port":21,"chassis":25,"id":"pci.25","bus":"pci.3","addr":"0x15"}' \ +-device '{"driver":"xio3130-downstream","port":22,"chassis":26,"id":"pci.26","bus":"pci.3","addr":"0x16"}' \ +-device '{"driver":"xio3130-downstream","port":23,"chassis":27,"id":"pci.27","bus":"pci.3","addr":"0x17"}' \ +-device '{"driver":"xio3130-downstream","port":24,"chassis":28,"id":"pci.28","bus":"pci.3","addr":"0x18"}' \ +-device '{"driver":"xio3130-downstream","port":25,"chassis":29,"id":"pci.29","bus":"pci.3","addr":"0x19"}' \ +-device '{"driver":"xio3130-downstream","port":26,"chassis":30,"id":"pci.30","bus":"pci.3","addr":"0x1a"}' \ +-device '{"driver":"xio3130-downstream","port":27,"chassis":31,"id":"pci.31","bus":"pci.3","addr":"0x1b"}' \ +-device '{"driver":"xio3130-downstream","port":28,"chassis":32,"id":"pci.32","bus":"pci.3","addr":"0x1c"}' \ +-device '{"driver":"xio3130-downstream","port":29,"chassis":33,"id":"pci.33","bus":"pci.3","addr":"0x1d"}' \ +-device '{"driver":"xio3130-downstream","port":30,"chassis":34,"id":"pci.34","bus":"pci.3","addr":"0x1e"}' \ +-device '{"driver":"xio3130-downstream","port":31,"chassis":35,"id":"pci.35","bus":"pci.3","addr":"0x1f"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ --netdev user,id=hostnet0 \ --device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.4,addr=0x0 \ --netdev user,id=hostnet1 \ --device e1000,netdev=hostnet1,id=net1,mac=52:54:00:5c:c6:1a,bus=pci.5,addr=0x0 \ --netdev user,id=hostnet2 \ --device e1000,netdev=hostnet2,id=net2,mac=52:54:00:39:97:ac,bus=pci.6,addr=0x0 \ --netdev user,id=hostnet3 \ --device e1000,netdev=hostnet3,id=net3,mac=52:54:00:ee:b9:a8,bus=pci.7,addr=0x0 \ --netdev user,id=hostnet4 \ --device e1000,netdev=hostnet4,id=net4,mac=52:54:00:a9:f7:17,bus=pci.8,addr=0x0 \ --netdev user,id=hostnet5 \ --device e1000,netdev=hostnet5,id=net5,mac=52:54:00:df:2b:f3,bus=pci.9,addr=0x0 \ --netdev user,id=hostnet6 \ --device e1000,netdev=hostnet6,id=net6,mac=52:54:00:78:94:b4,bus=pci.10,addr=0x0 \ --netdev user,id=hostnet7 \ --device e1000,netdev=hostnet7,id=net7,mac=52:54:00:6b:9b:06,bus=pci.11,addr=0x0 \ --netdev user,id=hostnet8 \ --device e1000,netdev=hostnet8,id=net8,mac=52:54:00:17:df:bc,bus=pci.12,addr=0x0 \ --netdev user,id=hostnet9 \ --device e1000,netdev=hostnet9,id=net9,mac=52:54:00:3b:d0:51,bus=pci.13,addr=0x0 \ --netdev user,id=hostnet10 \ --device e1000,netdev=hostnet10,id=net10,mac=52:54:00:8d:2d:17,bus=pci.14,addr=0x0 \ --netdev user,id=hostnet11 \ --device e1000,netdev=hostnet11,id=net11,mac=52:54:00:a7:66:af,bus=pci.15,addr=0x0 \ --netdev user,id=hostnet12 \ --device e1000,netdev=hostnet12,id=net12,mac=52:54:00:54:ab:d7,bus=pci.16,addr=0x0 \ --netdev user,id=hostnet13 \ --device e1000,netdev=hostnet13,id=net13,mac=52:54:00:1f:99:90,bus=pci.17,addr=0x0 \ --netdev user,id=hostnet14 \ --device e1000,netdev=hostnet14,id=net14,mac=52:54:00:c8:43:87,bus=pci.18,addr=0x0 \ --netdev user,id=hostnet15 \ --device e1000,netdev=hostnet15,id=net15,mac=52:54:00:df:22:b2,bus=pci.19,addr=0x0 \ --netdev user,id=hostnet16 \ --device e1000,netdev=hostnet16,id=net16,mac=52:54:00:d2:9a:47,bus=pci.20,addr=0x0 \ --netdev user,id=hostnet17 \ --device e1000,netdev=hostnet17,id=net17,mac=52:54:00:86:05:e2,bus=pci.21,addr=0x0 \ --netdev user,id=hostnet18 \ --device e1000,netdev=hostnet18,id=net18,mac=52:54:00:8c:1c:c2,bus=pci.22,addr=0x0 \ --netdev user,id=hostnet19 \ --device e1000,netdev=hostnet19,id=net19,mac=52:54:00:48:58:92,bus=pci.23,addr=0x0 \ --netdev user,id=hostnet20 \ --device e1000,netdev=hostnet20,id=net20,mac=52:54:00:99:e5:bf,bus=pci.24,addr=0x0 \ --netdev user,id=hostnet21 \ --device e1000,netdev=hostnet21,id=net21,mac=52:54:00:b1:8c:25,bus=pci.25,addr=0x0 \ --netdev user,id=hostnet22 \ --device e1000,netdev=hostnet22,id=net22,mac=52:54:00:60:e0:d0,bus=pci.26,addr=0x0 \ --netdev user,id=hostnet23 \ --device e1000,netdev=hostnet23,id=net23,mac=52:54:00:37:00:6a,bus=pci.27,addr=0x0 \ --netdev user,id=hostnet24 \ --device e1000,netdev=hostnet24,id=net24,mac=52:54:00:c7:c8:ad,bus=pci.28,addr=0x0 \ --netdev user,id=hostnet25 \ --device e1000,netdev=hostnet25,id=net25,mac=52:54:00:4e:a7:cf,bus=pci.29,addr=0x0 \ --netdev user,id=hostnet26 \ --device e1000,netdev=hostnet26,id=net26,mac=52:54:00:00:79:69,bus=pci.30,addr=0x0 \ --netdev user,id=hostnet27 \ --device e1000,netdev=hostnet27,id=net27,mac=52:54:00:47:00:6f,bus=pci.31,addr=0x0 \ --netdev user,id=hostnet28 \ --device e1000,netdev=hostnet28,id=net28,mac=52:54:00:2a:8c:8b,bus=pci.32,addr=0x0 \ --netdev user,id=hostnet29 \ --device e1000,netdev=hostnet29,id=net29,mac=52:54:00:ec:d5:e3,bus=pci.33,addr=0x0 \ --netdev user,id=hostnet30 \ --device e1000,netdev=hostnet30,id=net30,mac=52:54:00:7e:6e:c8,bus=pci.34,addr=0x0 \ --netdev user,id=hostnet31 \ --device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6d:c9,bus=pci.35,addr=0x0 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:f1:95:51","bus":"pci.4","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet1"}' \ +-device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"52:54:00:5c:c6:1a","bus":"pci.5","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet2"}' \ +-device '{"driver":"e1000","netdev":"hostnet2","id":"net2","mac":"52:54:00:39:97:ac","bus":"pci.6","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet3"}' \ +-device '{"driver":"e1000","netdev":"hostnet3","id":"net3","mac":"52:54:00:ee:b9:a8","bus":"pci.7","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet4"}' \ +-device '{"driver":"e1000","netdev":"hostnet4","id":"net4","mac":"52:54:00:a9:f7:17","bus":"pci.8","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet5"}' \ +-device '{"driver":"e1000","netdev":"hostnet5","id":"net5","mac":"52:54:00:df:2b:f3","bus":"pci.9","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet6"}' \ +-device '{"driver":"e1000","netdev":"hostnet6","id":"net6","mac":"52:54:00:78:94:b4","bus":"pci.10","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet7"}' \ +-device '{"driver":"e1000","netdev":"hostnet7","id":"net7","mac":"52:54:00:6b:9b:06","bus":"pci.11","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet8"}' \ +-device '{"driver":"e1000","netdev":"hostnet8","id":"net8","mac":"52:54:00:17:df:bc","bus":"pci.12","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet9"}' \ +-device '{"driver":"e1000","netdev":"hostnet9","id":"net9","mac":"52:54:00:3b:d0:51","bus":"pci.13","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet10"}' \ +-device '{"driver":"e1000","netdev":"hostnet10","id":"net10","mac":"52:54:00:8d:2d:17","bus":"pci.14","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet11"}' \ +-device '{"driver":"e1000","netdev":"hostnet11","id":"net11","mac":"52:54:00:a7:66:af","bus":"pci.15","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet12"}' \ +-device '{"driver":"e1000","netdev":"hostnet12","id":"net12","mac":"52:54:00:54:ab:d7","bus":"pci.16","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet13"}' \ +-device '{"driver":"e1000","netdev":"hostnet13","id":"net13","mac":"52:54:00:1f:99:90","bus":"pci.17","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet14"}' \ +-device '{"driver":"e1000","netdev":"hostnet14","id":"net14","mac":"52:54:00:c8:43:87","bus":"pci.18","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet15"}' \ +-device '{"driver":"e1000","netdev":"hostnet15","id":"net15","mac":"52:54:00:df:22:b2","bus":"pci.19","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet16"}' \ +-device '{"driver":"e1000","netdev":"hostnet16","id":"net16","mac":"52:54:00:d2:9a:47","bus":"pci.20","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet17"}' \ +-device '{"driver":"e1000","netdev":"hostnet17","id":"net17","mac":"52:54:00:86:05:e2","bus":"pci.21","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet18"}' \ +-device '{"driver":"e1000","netdev":"hostnet18","id":"net18","mac":"52:54:00:8c:1c:c2","bus":"pci.22","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet19"}' \ +-device '{"driver":"e1000","netdev":"hostnet19","id":"net19","mac":"52:54:00:48:58:92","bus":"pci.23","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet20"}' \ +-device '{"driver":"e1000","netdev":"hostnet20","id":"net20","mac":"52:54:00:99:e5:bf","bus":"pci.24","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet21"}' \ +-device '{"driver":"e1000","netdev":"hostnet21","id":"net21","mac":"52:54:00:b1:8c:25","bus":"pci.25","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet22"}' \ +-device '{"driver":"e1000","netdev":"hostnet22","id":"net22","mac":"52:54:00:60:e0:d0","bus":"pci.26","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet23"}' \ +-device '{"driver":"e1000","netdev":"hostnet23","id":"net23","mac":"52:54:00:37:00:6a","bus":"pci.27","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet24"}' \ +-device '{"driver":"e1000","netdev":"hostnet24","id":"net24","mac":"52:54:00:c7:c8:ad","bus":"pci.28","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet25"}' \ +-device '{"driver":"e1000","netdev":"hostnet25","id":"net25","mac":"52:54:00:4e:a7:cf","bus":"pci.29","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet26"}' \ +-device '{"driver":"e1000","netdev":"hostnet26","id":"net26","mac":"52:54:00:00:79:69","bus":"pci.30","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet27"}' \ +-device '{"driver":"e1000","netdev":"hostnet27","id":"net27","mac":"52:54:00:47:00:6f","bus":"pci.31","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet28"}' \ +-device '{"driver":"e1000","netdev":"hostnet28","id":"net28","mac":"52:54:00:2a:8c:8b","bus":"pci.32","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet29"}' \ +-device '{"driver":"e1000","netdev":"hostnet29","id":"net29","mac":"52:54:00:ec:d5:e3","bus":"pci.33","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet30"}' \ +-device '{"driver":"e1000","netdev":"hostnet30","id":"net30","mac":"52:54:00:7e:6e:c8","bus":"pci.34","addr":"0x0"}' \ +-netdev '{"type":"user","id":"hostnet31"}' \ +-device '{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:00:7e:6d:c9","bus":"pci.35","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args index bd90434aaa..aa8c171594 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=guest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,9 +25,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \ --device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \ --device ioh3420,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"ioh3420","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index 3a353dc59a..fc5e591733 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=guest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,8 +25,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device ioh3420,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \ --device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \ +-device '{"driver":"ioh3420","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"ioh3420","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args index b8f1de42a1..a5342e8b70 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,13 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device ioh3420,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \ --device ioh3420,port=26,chassis=40,id=pci.2,bus=pcie.0,addr=0x2.0x1 \ +-device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"ioh3420","port":26,"chassis":40,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.args index 5a27ae86b0..169e73608b 100644 --- a/tests/qemuxml2argvdata/pcie-root.args +++ b/tests/qemuxml2argvdata/pcie-root.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args index f2f22c155b..0c3da6bd1a 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,21 +25,21 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device ioh3420,port=16,chassis=1,id=pci.1,bus=pcie.0,addr=0x2 \ --device x3130-upstream,id=pci.2,bus=pci.1,addr=0x0 \ --device xio3130-downstream,port=0,chassis=3,id=pci.3,bus=pci.2,addr=0x0 \ --device xio3130-downstream,port=1,chassis=4,id=pci.4,bus=pci.2,addr=0x1 \ --device xio3130-downstream,port=2,chassis=5,id=pci.5,bus=pci.2,addr=0x2 \ --device xio3130-downstream,port=39,chassis=30,id=pci.6,bus=pci.2,addr=0x3 \ --device x3130-upstream,id=pci.7,bus=pci.3,addr=0x0 \ --device xio3130-downstream,port=4,chassis=8,id=pci.8,bus=pci.2,addr=0x4 \ --device xio3130-downstream,port=5,chassis=9,id=pci.9,bus=pci.2,addr=0x5 \ --device xio3130-downstream,port=6,chassis=10,id=pci.10,bus=pci.2,addr=0x6 \ +-device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","addr":"0x2"}' \ +-device '{"driver":"x3130-upstream","id":"pci.2","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":0,"chassis":3,"id":"pci.3","bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":1,"chassis":4,"id":"pci.4","bus":"pci.2","addr":"0x1"}' \ +-device '{"driver":"xio3130-downstream","port":2,"chassis":5,"id":"pci.5","bus":"pci.2","addr":"0x2"}' \ +-device '{"driver":"xio3130-downstream","port":39,"chassis":30,"id":"pci.6","bus":"pci.2","addr":"0x3"}' \ +-device '{"driver":"x3130-upstream","id":"pci.7","bus":"pci.3","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":4,"chassis":8,"id":"pci.8","bus":"pci.2","addr":"0x4"}' \ +-device '{"driver":"xio3130-downstream","port":5,"chassis":9,"id":"pci.9","bus":"pci.2","addr":"0x5"}' \ +-device '{"driver":"xio3130-downstream","port":6,"chassis":10,"id":"pci.10","bus":"pci.2","addr":"0x6"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args index 6bdfba9fb5..aaae74d377 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,15 +25,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device ioh3420,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \ --device ioh3420,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \ --device x3130-upstream,id=pci.3,bus=pci.1,addr=0x0 \ --device x3130-upstream,id=pci.4,bus=pci.2,addr=0x0 \ +-device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"ioh3420","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.2","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args index e9d84d935e..86e5778b35 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -global q35-pcihost.pci-hole64-size=1048576K \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args index 224363f81d..43f5a6dbf0 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=foo,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -global i440FX-pcihost.pci-hole64-size=1048576K \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args index 4af05c4d9a..80d0ebb925 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -cpu qemu64,pmu=off \ diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args index 26296caedb..3531746845 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -cpu qemu64,pmu=on \ diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args index d3d04b1467..2c7b88f0d0 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,14 +25,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=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=8,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 '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"e1000e","netdev":"hostnet0","id":"net0","mac":"52:54:00:aa:bf:ef","bus":"pci.2","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device intel-hda,id=sound0,bus=pci.3,addr=0x0 \ --device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \ +-device '{"driver":"intel-hda","id":"sound0","bus":"pci.3","addr":"0x0"}' \ +-device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad":0,"audiodev":"audio1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args index bcaf3236f0..be6f4bbc5d 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,25 +25,25 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ --device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x0 \ --device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \ --device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \ --device ich9-usb-ehci1,id=usb1,bus=pcie.0,addr=0x1a.0x7 \ --device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1a \ --device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pcie.0,addr=0x1a.0x1 \ --device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pcie.0,addr=0x1a.0x2 \ --device ich9-usb-ehci1,id=usb2,bus=pci.2,addr=0x1.0x7 \ --device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1 \ --device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.2,addr=0x1.0x1 \ --device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pcie.0","addr":"0x1a.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1a"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bus":"pcie.0","addr":"0x1a.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bus":"pcie.0","addr":"0x1a.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.2","addr":"0x1.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bus":"pci.2","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.2","addr":"0x1.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.2","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args index 6236cb8a98..f0f32c80ed 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,25 +25,25 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ --device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x0 \ --device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \ --device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \ --device ich9-usb-ehci1,id=usb1,bus=pcie.0,addr=0x1a.0x7 \ --device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1a \ --device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pcie.0,addr=0x1a.0x2 \ --device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pcie.0,addr=0x1a.0x1 \ --device ich9-usb-ehci1,id=usb2,bus=pci.2,addr=0x1.0x7 \ --device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \ --device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.2,addr=0x1.0x1 \ --device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pcie.0","addr":"0x1a.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1a"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bus":"pcie.0","addr":"0x1a.0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bus":"pcie.0","addr":"0x1a.0x1"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.2","addr":"0x1.0x7"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.2","addr":"0x1.0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.2","addr":"0x1.0x1"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bus":"pci.2","multifunction":true,"addr":"0x1"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args index 3e24c0760d..4b7d83ba51 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,17 +25,17 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ --device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x0 \ --device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \ --device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args index 638c79d45f..3d4c93038c 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -global ICH9-LPC.disable_s3=1 \ -global ICH9-LPC.disable_s4=0 \ -boot strict=on \ --device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \ --device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args index 0af708dfe0..9eec4d266e 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -11,7 +11,7 @@ BAR='' \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -30,8 +30,8 @@ BAR='' \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -unknown parameter \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args index 1f4ef13cc3..75d46d2b6d 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args index 11a2a9b480..9f06ef5a80 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -unknown parameter \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args index 9dfd4cad5c..43150e9e15 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args index ce3712cdbc..c123cd9dce 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args index 1f41c61f72..b417f976af 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,10 +28,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-format","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=1,drive=libvirt-1-format,id=ide0-0-1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-format","id":"ide0-0-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args index 5078429e1b..86af73f198 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args index 5127fd07d5..6ff6005c39 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --device usb-ccid,id=ccid0,bus=usb.0,port=1 \ --device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args index 4e7be2c3dc..f7261da7fe 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -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 '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1","cert2":"cert2","cert3":"cert3","db":"/tmp/foo","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args index 3e1c0d4267..fcbeebb8fe 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -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 '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args index 5127fd07d5..6ff6005c39 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --device usb-ccid,id=ccid0,bus=usb.0,port=1 \ --device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args index 8f4da0c94b..6d74ded58c 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --device usb-ccid,id=ccid0,bus=usb.0,port=1 \ +-device '{"driver":"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 '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=0,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args index 53074a41e8..f9991c0a6b 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --device usb-ccid,id=ccid0,bus=usb.0,port=1 \ +-device '{"driver":"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 '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args index 54c7c361be..d510624693 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args index 1b73feb8a2..95f018af2e 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args index 1b090e9dbe..91c4a1eacc 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests/qemuxml2argvdata/usb-controller-default-q35.args index 22a6d4d20a..41110fc0d0 100644 --- a/tests/qemuxml2argvdata/usb-controller-default-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device piix3-usb-uhci,id=usb,bus=pcie.0,addr=0x1 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pcie.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args index 9fd3065308..ad421f5eb3 100644 --- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=q35-test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off \ -accel tcg \ -m size=2097152k \ @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 \ +-device '{"driver":"nec-usb-xhci","id":"usb","bus":"pcie.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args index 2f4bd5df0d..001af94982 100644 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,6 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device qemu-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \ +-device '{"driver":"qemu-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args index ca0b40ff28..2a39d7cdd3 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-xhci.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,6 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \ +-device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args index 4a49b33727..738e28c155 100644 --- a/tests/qemuxml2argvdata/usb-controller.args +++ b/tests/qemuxml2argvdata/usb-controller.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args index c1ce4d5327..da0a967d1e 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,25 +26,25 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --device usb-hub,id=hub0,bus=usb.0,port=1 \ --device usb-hub,id=hub1,bus=usb.0,port=2 \ --device usb-hub,id=hub2,bus=usb.0,port=1.1 \ --device usb-mouse,id=input0,bus=usb.0,port=1.2 \ --device usb-mouse,id=input1,bus=usb.0,port=1.3 \ --device usb-mouse,id=input2,bus=usb.0,port=1.4 \ --device usb-tablet,id=input3,bus=usb.0,port=1.5 \ --device usb-tablet,id=input4,bus=usb.0,port=1.6 \ --device usb-tablet,id=input5,bus=usb.0,port=1.7 \ --device usb-tablet,id=input6,bus=usb.0,port=1.8 \ --device usb-tablet,id=input7,bus=usb.0,port=1.1.1 \ --device usb-tablet,id=input8,bus=usb.0,port=1.1.2 \ --device usb-tablet,id=input9,bus=usb.0,port=1.1.3 \ --device usb-tablet,id=input10,bus=usb.0,port=1.1.4 \ --device usb-tablet,id=input11,bus=usb.0,port=1.1.5 \ --device usb-tablet,id=input12,bus=usb.0,port=1.1.6 \ --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 '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-hub","id":"hub2","bus":"usb.0","port":"1.1"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.2"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.3"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.4"}' \ +-device '{"driver":"usb-tablet","id":"input3","bus":"usb.0","port":"1.5"}' \ +-device '{"driver":"usb-tablet","id":"input4","bus":"usb.0","port":"1.6"}' \ +-device '{"driver":"usb-tablet","id":"input5","bus":"usb.0","port":"1.7"}' \ +-device '{"driver":"usb-tablet","id":"input6","bus":"usb.0","port":"1.8"}' \ +-device '{"driver":"usb-tablet","id":"input7","bus":"usb.0","port":"1.1.1"}' \ +-device '{"driver":"usb-tablet","id":"input8","bus":"usb.0","port":"1.1.2"}' \ +-device '{"driver":"usb-tablet","id":"input9","bus":"usb.0","port":"1.1.3"}' \ +-device '{"driver":"usb-tablet","id":"input10","bus":"usb.0","port":"1.1.4"}' \ +-device '{"driver":"usb-tablet","id":"input11","bus":"usb.0","port":"1.1.5"}' \ +-device '{"driver":"usb-tablet","id":"input12","bus":"usb.0","port":"1.1.6"}' \ +-device '{"driver":"usb-tablet","id":"input13","bus":"usb.0","port":"1.1.7"}' \ +-device '{"driver":"usb-tablet","id":"input14","bus":"usb.0","port":"1.1.8"}' \ +-device '{"driver":"usb-tablet","id":"input15","bus":"usb.0","port":"2.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args index 72a969ffff..ebbc82df50 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --device usb-hub,id=hub0,bus=usb.0,port=1 \ --device usb-mouse,id=input0,bus=usb.0,port=2 \ --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 '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.1"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.2"}' \ +-device '{"driver":"usb-tablet","id":"input3","bus":"usb.0","port":"1.3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args index df6912ecf8..c8614ed8de 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --device usb-hub,id=hub0,bus=usb.0,port=1 \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args index b30ef04710..263f645f67 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,15 +25,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -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 \ --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 \ --device usb-mouse,id=input1,bus=usb.0,port=4 \ --device usb-mouse,id=input2,bus=usb.0,port=5 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"3"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"4"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args index 03c5a04492..75c1c82600 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/usb-ich9-companion.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,10 +25,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -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 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args index 70b8cc7a3b..661e086c37 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,18 +25,18 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --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 '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x2.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x2.0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pci.0","addr":"0x2.0x1"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pci.0","addr":"0x3.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x3"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bus":"pci.0","addr":"0x3.0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bus":"pci.0","addr":"0x3.0x1"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.0","addr":"0x4.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args index 210a82bc9b..8f29017c8e 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --device usb-hub,id=hub0,bus=usb.0,port=1 \ --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 '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"1.1"}' \ +-device '{"driver":"usb-hub","id":"hub2","bus":"usb.0","port":"1.1.1"}' \ +-device '{"driver":"usb-hub","id":"hub3","bus":"usb.0","port":"1.1.1.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args index 755b7fcace..00470d4396 100644 --- a/tests/qemuxml2argvdata/usb-none.args +++ b/tests/qemuxml2argvdata/usb-none.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,5 +26,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args index fa2643e2fa..857577af38 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/usb-piix3-controller.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args index 2fbef8d060..4703a94715 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --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 usb-mouse,id=input1,bus=usb.0,port=1.2 \ --device usb-mouse,id=input2,bus=usb.0,port=1.3 \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.2"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args index 80713b27e4..4280ecef26 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --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 '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args index e3e5cb73ca..905d2fe4da 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --device usb-hub,id=hub0,bus=usb.0,port=1 \ --device usb-hub,id=hub1,bus=usb.0,port=1.2 \ --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 '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"1.2"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.2.1"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.2.2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args index 150e3c5008..9cc1f16529 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.args +++ b/tests/qemuxml2argvdata/usb-redir-boot.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -24,16 +24,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -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 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=0,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -chardev socket,id=charredir0,host=localhost,port=4000 \ --device usb-redir,chardev=charredir0,id=redir0,bootindex=1,bus=usb.0,port=1 \ +-device '{"driver":"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 '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bootindex":2,"bus":"usb.0","port":"4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args index 904c6f7842..3d9f9f7951 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=0,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -chardev spicevmc,id=charredir0,name=usbredir \ --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' \ +-device '{"driver":"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 '{"driver":"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 '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args index aba04c7485..92616b6e2d 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.args +++ b/tests/qemuxml2argvdata/usb-redir-filter.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -24,16 +24,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -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 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=0,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -chardev spicevmc,id=charredir0,name=usbredir \ --device 'usb-redir,chardev=charredir0,id=redir0,filter=0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0,bus=usb.0,port=4' \ +-device '{"driver":"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 '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","filter":"0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0","bus":"usb.0","port":"5"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args index 2729c7d8d1..20055947b0 100644 --- a/tests/qemuxml2argvdata/usb-redir.args +++ b/tests/qemuxml2argvdata/usb-redir.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -24,16 +24,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -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 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=0,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"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 \ +-device '{"driver":"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 '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":"usb.0","port":"4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args index 3f7720237a..43116f06f7 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --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 \ --device usb-mouse,id=input1,bus=usb.0,port=4 \ --device usb-mouse,id=input2,bus=usb.0,port=5 \ +-device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ +-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"3"}' \ +-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"4"}' \ +-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args index 56d0c52e06..caecedde68 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -25,19 +25,19 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ --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-uhci2,masterbus=usb1.0,firstport=2,bus=pci.0,addr=0x4.0x1 \ --device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pci.0,addr=0x4.0x2 \ --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-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x5.0x1 \ --device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x5.0x2 \ --device usb-hub,id=hub0,bus=usb1.0,port=1 \ --device usb-tablet,id=input0,bus=usb.0,port=2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pci.0","addr":"0x4.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.0","addr":"0x5.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x5"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.0","addr":"0x5.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.0","addr":"0x5.0x2"}' \ +-device '{"driver":"usb-hub","id":"hub0","bus":"usb1.0","port":"1"}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --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=0x2 \ +-device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","bus":"usb2.0","port":"1"}' \ +-device '{"driver":"usb-host","hostbus":14,"hostaddr":7,"id":"hostdev1","bus":"usb2.0","port":"2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args index ba4ba35f50..a00ee57660 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.0,addr=0x3 \ +-device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/input/event1234","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args index 4aa488a101..dc6aa53d9c 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -usb \ --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=0x4 \ +-device '{"driver":"virtio-mouse-pci","id":"input0","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-keyboard-pci","id":"input1","bus":"pci.0","addr":"0xa"}' \ +-device '{"driver":"virtio-tablet-pci","id":"input2","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args index a3a33be54f..5e035afeb9 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --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 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.0","addr":"0x7"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args index befc02c6e4..02c5bb0e66 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"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=0x3 \ +-object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args index 3dc689d25c..beb8a32c31 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --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 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \ +-device '{"driver":"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=0x3 \ +-object '{"qom-type":"rng-egd","id":"objrng1","chardev":"charrng1"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng1","id":"rng1","bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args index e4c87f9b86..f3473129e0 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ --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=0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes":123,"period":1234,"bus":"pci.0","addr":"0x3"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args index e9f0ec94e1..1e96abf12d 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -m size=219136k \ @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --device vmcoreinfo \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"vmcoreinfo"}' \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a6a1646efb..0a217949b8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -856,9 +856,22 @@ mymain(void) * at the end of the argument list, or the NONE placeholder. * */ # define DO_TEST(name, ...) \ - DO_TEST_FULL(name, "", ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) + DO_TEST_FULL(name, "", \ + ARG_QEMU_CAPS, \ + QEMU_CAPS_DEVICE_JSON, \ + QEMU_CAPS_OBJECT_JSON, \ + QEMU_CAPS_NETDEV_JSON, \ + __VA_ARGS__, \ + QEMU_CAPS_LAST, \ + ARG_END) # define DO_TEST_NOCAPS(name) \ - DO_TEST_FULL(name, "", ARG_END) + DO_TEST_FULL(name, "", \ + ARG_QEMU_CAPS, \ + QEMU_CAPS_DEVICE_JSON, \ + QEMU_CAPS_OBJECT_JSON, \ + QEMU_CAPS_NETDEV_JSON, \ + QEMU_CAPS_LAST, \ + ARG_END) # define DO_TEST_GIC(name, ver, gic) \ DO_TEST_CAPS_ARCH_VER_FULL(name, "aarch64", ver, ARG_GIC, gic, ARG_END) -- 2.41.0

'virQEMUCapsAddCPUDefinitions' is used solely to populate fake cpu models for the fake-caps tests. Note that and also populate the 'type' field so that default cpu type can be propagated properly. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 630be618bf..bd6a32b815 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2119,6 +2119,8 @@ bool virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) } +/* Note that this function is invoked only by test code for faking supported cpu + * models */ int virQEMUCapsAddCPUDefinitions(virQEMUCaps *qemuCaps, virDomainVirtType type, @@ -2149,6 +2151,8 @@ virQEMUCapsAddCPUDefinitions(virQEMUCaps *qemuCaps, cpu->usable = usable; cpu->name = g_strdup(name[i]); + /* while the type name doesn't correspond with reality, this is just for fake cpu models */ + cpu->type = g_strdup(name[i]); } return 0; -- 2.41.0

s/node/note/ in the commit summary On a Tuesday in 2023, Peter Krempa wrote:
'virQEMUCapsAddCPUDefinitions' is used solely to populate fake cpu models for the fake-caps tests. Note that and also populate the 'type' field so that default cpu type can be propagated properly.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 4 ++++ 1 file changed, 4 insertions(+)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano

Use proper version for negative case of 'hugepages-memaccess3' QEMU allowed to configure a memory backend for default ram since qemu-5.2. Fix the test to use real capability data. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...rr => hugepages-default-1G-nodeset-2M.x86_64-latest.err} | 0 ...id.err => hugepages-memaccess-invalid.x86_64-latest.err} | 0 ...memaccess3.err => hugepages-memaccess3.x86_64-5.1.0.err} | 0 tests/qemuxml2argvtest.c | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename tests/qemuxml2argvdata/{hugepages-default-1G-nodeset-2M.err => hugepages-default-1G-nodeset-2M.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-memaccess-invalid.err => hugepages-memaccess-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-memaccess3.err => hugepages-memaccess3.x86_64-5.1.0.err} (100%) diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.err b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.err rename to tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.err b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess-invalid.err rename to tests/qemuxml2argvdata/hugepages-memaccess-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.err b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-5.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess3.err rename to tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-5.1.0.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0a217949b8..a6d569e0c6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1137,7 +1137,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hugepages-default-2M"); DO_TEST_CAPS_LATEST("hugepages-default-system-size"); DO_TEST_CAPS_LATEST_FAILURE("hugepages-default-5M"); - DO_TEST_PARSE_ERROR_NOCAPS("hugepages-default-1G-nodeset-2M"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-default-1G-nodeset-2M"); DO_TEST_CAPS_LATEST("hugepages-nodeset"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-nodeset-nonexist"); DO_TEST_CAPS_LATEST("hugepages-numa-default"); @@ -1147,10 +1147,10 @@ mymain(void) DO_TEST_CAPS_LATEST("hugepages-numa-nodeset-part"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-numa-nodeset-nonexist"); DO_TEST_CAPS_LATEST("hugepages-shared"); - DO_TEST_PARSE_ERROR_NOCAPS("hugepages-memaccess-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-memaccess-invalid"); DO_TEST_CAPS_LATEST("hugepages-memaccess"); DO_TEST_CAPS_LATEST("hugepages-memaccess2"); - DO_TEST_PARSE_ERROR_NOCAPS("hugepages-memaccess3"); + DO_TEST_CAPS_VER_PARSE_ERROR("hugepages-memaccess3", "5.1.0"); DO_TEST_CAPS_LATEST("hugepages-memaccess3"); DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST_NOCAPS("nosharepages"); -- 2.41.0

The 'numatune-memory' case is completely dropped as it's sufficiently covered by 'numatune-memnode'. The positive fake-caps version of 'numatune-memnode' is dropped as it's covered by the two existing real caps invocations. 'numatune-memory-invalid-nodeset', 'numatune-memnode-invalid-mode', 'numatune-memnode-nocpu', 'numatune-memnodes-problematic' parsing error negative cases are converted to use latest capabilities. 'numatune-static-nodeset-exceed-hostnode' commandline generation failure negative case is converted to use latest capabilities. 'numatune-memnode-no-memory', 'numatune-distances', 'numatune-auto-nodeset-invalid', 'numatune-auto-prefer' positive cases are converted to use latest capabilities. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...e-auto-nodeset-invalid.x86_64-latest.args} | 10 +++-- ...> numatune-auto-prefer.x86_64-latest.args} | 10 +++-- ... => numatune-distances.x86_64-latest.args} | 24 ++++++++---- ...ne-memnode-invalid-mode.x86_64-latest.err} | 0 ...tune-memnode-no-memory.x86_64-latest.args} | 7 ++-- ... numatune-memnode-nocpu.x86_64-latest.err} | 0 tests/qemuxml2argvdata/numatune-memnode.args | 37 ------------------- ...ne-memnodes-problematic.x86_64-latest.err} | 0 ...-memory-invalid-nodeset.x86_64-latest.err} | 0 tests/qemuxml2argvdata/numatune-memory.args | 34 ----------------- tests/qemuxml2argvdata/numatune-memory.xml | 31 ---------------- ...nodeset-exceed-hostnode.x86_64-latest.err} | 0 tests/qemuxml2argvtest.c | 21 +++++------ 13 files changed, 42 insertions(+), 132 deletions(-) rename tests/qemuxml2argvdata/{numatune-auto-nodeset-invalid.args => numatune-auto-nodeset-invalid.x86_64-latest.args} (76%) rename tests/qemuxml2argvdata/{numatune-auto-prefer.args => numatune-auto-prefer.x86_64-latest.args} (71%) rename tests/qemuxml2argvdata/{numatune-distances.args => numatune-distances.x86_64-latest.args} (67%) rename tests/qemuxml2argvdata/{numatune-memnode-invalid-mode.err => numatune-memnode-invalid-mode.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numatune-memnode-no-memory.args => numatune-memnode-no-memory.x86_64-latest.args} (84%) rename tests/qemuxml2argvdata/{numatune-memnode-nocpu.err => numatune-memnode-nocpu.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.args rename tests/qemuxml2argvdata/{numatune-memnodes-problematic.err => numatune-memnodes-problematic.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numatune-memory-invalid-nodeset.err => numatune-memory-invalid-nodeset.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numatune-memory.args delete mode 100644 tests/qemuxml2argvdata/numatune-memory.xml rename tests/qemuxml2argvdata/{numatune-static-nodeset-exceed-hostnode.err => numatune-static-nodeset-exceed-hostnode.x86_64-latest.err} (100%) diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args similarity index 76% rename from tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args rename to tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args index d0703d283a..57a2b893f1 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args @@ -10,11 +10,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"preferred"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -23,12 +25,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args similarity index 71% rename from tests/qemuxml2argvdata/numatune-auto-prefer.args rename to tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args index 5f8db1b479..d67d0dbe15 100644 --- a/tests/qemuxml2argvdata/numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args @@ -10,12 +10,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -name guest=QEMUGuest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=65536k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ --numa node,nodeid=0,cpus=0,mem=64 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":67108864,"host-nodes":[0,1,2,3],"policy":"preferred"}' \ +-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ -no-user-config \ @@ -24,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/numatune-distances.args rename to tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args index f349b5639c..8eb4883ed1 100644 --- a/tests/qemuxml2argvdata/numatune-distances.args +++ b/tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args @@ -10,17 +10,24 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -name guest=QEMUGuest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=on \ -accel tcg \ +-cpu qemu64 \ -m size=12582912k \ -overcommit mem-lock=off \ -smp 12,sockets=12,cores=1,threads=1 \ --numa node,nodeid=0,cpus=0,cpus=11,mem=2048 \ --numa node,nodeid=1,cpus=1,cpus=10,mem=2048 \ --numa node,nodeid=2,cpus=2,cpus=9,mem=2048 \ --numa node,nodeid=3,cpus=3,cpus=8,mem=2048 \ --numa node,nodeid=4,cpus=4,cpus=7,mem=2048 \ --numa node,nodeid=5,cpus=5-6,mem=2048 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2147483648}' \ +-numa node,nodeid=0,cpus=0,cpus=11,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":2147483648}' \ +-numa node,nodeid=1,cpus=1,cpus=10,memdev=ram-node1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":2147483648}' \ +-numa node,nodeid=2,cpus=2,cpus=9,memdev=ram-node2 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node3","size":2147483648}' \ +-numa node,nodeid=3,cpus=3,cpus=8,memdev=ram-node3 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node4","size":2147483648}' \ +-numa node,nodeid=4,cpus=4,cpus=7,memdev=ram-node4 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node5","size":2147483648}' \ +-numa node,nodeid=5,cpus=5-6,memdev=ram-node5 \ -numa dist,src=0,dst=0,val=10 \ -numa dist,src=0,dst=1,val=21 \ -numa dist,src=0,dst=2,val=31 \ @@ -66,7 +73,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err b/tests/qemuxml2argvdata/numatune-memnode-invalid-mode.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err rename to tests/qemuxml2argvdata/numatune-memnode-invalid-mode.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args similarity index 84% rename from tests/qemuxml2argvdata/numatune-memnode-no-memory.args rename to tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args index efc9bb9476..a500dda611 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -name guest=QEMUGuest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=65536k \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ @@ -27,9 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-memnode-nocpu.err b/tests/qemuxml2argvdata/numatune-memnode-nocpu.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-nocpu.err rename to tests/qemuxml2argvdata/numatune-memnode-nocpu.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args deleted file mode 100644 index 163aa530da..0000000000 --- a/tests/qemuxml2argvdata/numatune-memnode.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=24683520k \ --overcommit mem-lock=off \ --smp 32,sockets=32,cores=1,threads=1 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520,"host-nodes":[3],"policy":"preferred"}' \ --numa node,nodeid=0,cpus=0,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":676331520,"host-nodes":[0,1,2,3],"policy":"bind"}' \ --numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621440,"host-nodes":[0,2],"policy":"bind"}' \ --numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \ --uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-memnodes-problematic.err b/tests/qemuxml2argvdata/numatune-memnodes-problematic.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnodes-problematic.err rename to tests/qemuxml2argvdata/numatune-memnodes-problematic.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.err b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.err rename to tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args deleted file mode 100644 index d0703d283a..0000000000 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-memory.xml b/tests/qemuxml2argvdata/numatune-memory.xml deleted file mode 100644 index ed86d5cf56..0000000000 --- a/tests/qemuxml2argvdata/numatune-memory.xml +++ /dev/null @@ -1,31 +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' cpuset='0-1'>2</vcpu> - <numatune> - <memory mode="strict" nodeset="0-5,^4"/> - </numatune> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu> - <topology sockets='2' dies='1' cores='1' threads='1'/> - </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> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.err b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.err rename to tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a6d569e0c6..04c7814dce 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1813,30 +1813,29 @@ mymain(void) DO_TEST_CAPS_LATEST("vcpu-placement-static"); DO_TEST_CAPS_LATEST("cputune-cpuset-big-id"); - DO_TEST_NOCAPS("numatune-memory"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memory-invalid-nodeset"); - DO_TEST_NOCAPS("numatune-memnode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memory-invalid-nodeset"); DO_TEST_CAPS_VER("numatune-memnode", "5.2.0"); DO_TEST_CAPS_LATEST("numatune-memnode"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-invalid-mode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-invalid-mode"); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-restrictive-mode-err-mixed"); DO_TEST_CAPS_LATEST("numatune-system-memory"); - DO_TEST_NOCAPS("numatune-memnode-no-memory"); + DO_TEST_CAPS_LATEST("numatune-memnode-no-memory"); - DO_TEST_NOCAPS("numatune-distances"); + DO_TEST_CAPS_LATEST("numatune-distances"); DO_TEST_CAPS_LATEST("numatune-no-vcpu"); DO_TEST_CAPS_LATEST("numatune-hmat"); DO_TEST_CAPS_LATEST("numatune-hmat-none"); - DO_TEST_NOCAPS("numatune-auto-nodeset-invalid"); - DO_TEST_NOCAPS("numatune-auto-prefer"); - DO_TEST_FAILURE_NOCAPS("numatune-static-nodeset-exceed-hostnode"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-nocpu"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnodes-problematic"); + DO_TEST_CAPS_LATEST("numatune-auto-nodeset-invalid"); + DO_TEST_CAPS_LATEST("numatune-auto-prefer"); + DO_TEST_CAPS_LATEST_FAILURE("numatune-static-nodeset-exceed-hostnode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-nocpu"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnodes-problematic"); DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-strict"); DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-restrictive"); + DO_TEST_NOCAPS("numad"); DO_TEST_NOCAPS("numad-auto-vcpu-static-numatune"); DO_TEST_PARSE_ERROR_NOCAPS("numad-auto-vcpu-static-numatune-no-nodeset"); -- 2.41.0

Enable a few defaults that will decrease churn when converting tests to real capabilities. Since the fake machines are added only for x86_64 at this point we can assume that ACPI is present via -machine. In case of the default ram id assume the same. Additionally the logic was broken as fake capabilities don't have a version so the default RAM was never actually populated into fake caps tests. For CPU we add 'qemu64' as that is the default picked by qemu. We also assume that qemu requires an explicit backend for -numa, which is the case for modern machines. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/acpi-table.args | 4 +++- tests/qemuxml2argvdata/autoindex.args | 5 ++-- .../qemuxml2argvdata/balloon-device-auto.args | 5 ++-- .../balloon-device-deflate-off.args | 5 ++-- .../balloon-device-deflate.args | 5 ++-- .../balloon-device-period.args | 5 ++-- tests/qemuxml2argvdata/balloon-device.args | 5 ++-- tests/qemuxml2argvdata/blkiotune-device.args | 5 ++-- tests/qemuxml2argvdata/blkiotune.args | 5 ++-- tests/qemuxml2argvdata/channel-guestfwd.args | 5 ++-- tests/qemuxml2argvdata/channel-spicevmc.args | 5 ++-- .../qemuxml2argvdata/channel-virtio-auto.args | 5 ++-- .../channel-virtio-autoadd.args | 5 ++-- .../channel-virtio-autoassign.args | 5 ++-- .../channel-virtio-default.args | 5 ++-- .../channel-virtio-state.args | 5 ++-- .../qemuxml2argvdata/channel-virtio-unix.args | 5 ++-- tests/qemuxml2argvdata/channel-virtio.args | 5 ++-- tests/qemuxml2argvdata/chardev-reconnect.args | 5 ++-- tests/qemuxml2argvdata/clock-catchup.args | 5 ++-- tests/qemuxml2argvdata/clock-france.args | 5 ++-- tests/qemuxml2argvdata/clock-hpet-off.args | 5 ++-- .../clock-localtime-basis-localtime.args | 5 ++-- tests/qemuxml2argvdata/clock-localtime.args | 5 ++-- .../clock-timer-hyperv-rtc.args | 4 ++-- tests/qemuxml2argvdata/clock-utc.args | 5 ++-- tests/qemuxml2argvdata/clock-variable.args | 5 ++-- .../qemuxml2argvdata/console-virtio-many.args | 5 ++-- tests/qemuxml2argvdata/console-virtio.args | 5 ++-- tests/qemuxml2argvdata/controller-order.args | 4 +++- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 4 ++-- tests/qemuxml2argvdata/cpu-Haswell.args | 4 ++-- tests/qemuxml2argvdata/cpu-Haswell2.args | 4 ++-- tests/qemuxml2argvdata/cpu-Haswell3.args | 4 ++-- tests/qemuxml2argvdata/cpu-cache-disable.args | 4 ++-- .../qemuxml2argvdata/cpu-cache-disable3.args | 4 ++-- .../cpu-cache-emulate-l3.args | 4 ++-- .../cpu-cache-passthrough.args | 4 ++-- .../cpu-check-default-none.args | 4 ++-- .../cpu-check-default-none2.args | 4 ++-- .../cpu-check-default-partial.args | 4 ++-- .../cpu-check-default-partial2.args | 4 ++-- tests/qemuxml2argvdata/cpu-check-none.args | 4 ++-- tests/qemuxml2argvdata/cpu-exact1.args | 4 ++-- .../cpu-exact2-nofallback.args | 4 ++-- tests/qemuxml2argvdata/cpu-exact2.args | 4 ++-- tests/qemuxml2argvdata/cpu-fallback.args | 4 ++-- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 4 ++-- .../qemuxml2argvdata/cpu-host-model-cmt.args | 4 ++-- .../cpu-host-model-vendor.args | 4 ++-- .../cpu-host-passthrough-features.args | 4 ++-- .../cpu-host-passthrough.args | 4 ++-- tests/qemuxml2argvdata/cpu-kvmclock.args | 4 ++-- tests/qemuxml2argvdata/cpu-minimum1.args | 4 ++-- tests/qemuxml2argvdata/cpu-minimum2.args | 4 ++-- .../cpu-no-removed-features.args | 4 ++-- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 10 ++++---- .../qemuxml2argvdata/cpu-numa-memshared.args | 4 ++-- .../cpu-numa-no-memory-element.args | 10 ++++---- tests/qemuxml2argvdata/cpu-numa1.args | 10 ++++---- tests/qemuxml2argvdata/cpu-numa2.args | 10 ++++---- .../cpu-phys-bits-emulate.args | 4 ++-- .../cpu-phys-bits-emulate2.args | 4 ++-- .../cpu-phys-bits-passthrough.args | 4 ++-- tests/qemuxml2argvdata/cpu-strict1.args | 4 ++-- tests/qemuxml2argvdata/cpu-topology1.args | 5 ++-- tests/qemuxml2argvdata/cpu-topology2.args | 4 ++-- tests/qemuxml2argvdata/cpu-topology3.args | 5 ++-- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 4 ++-- .../default-kvm-host-arch.args | 5 ++-- .../default-qemu-host-arch.args | 5 ++-- .../graphics-sdl-fullscreen.args | 5 ++-- tests/qemuxml2argvdata/graphics-sdl.args | 5 ++-- .../hostdev-mdev-precreated.args | 5 ++-- .../hostdev-pci-address-unassigned.args | 5 ++-- .../hostdev-pci-multifunction.args | 5 ++-- .../hostdev-scsi-vhost-scsi-pci.args | 5 ++-- .../hostdev-vfio-multidomain.args | 5 ++-- tests/qemuxml2argvdata/hostdev-vfio.args | 5 ++-- tests/qemuxml2argvdata/hotplug-base.args | 4 +++- .../qemuxml2argvdata/input-usbmouse-addr.args | 5 ++-- tests/qemuxml2argvdata/input-usbmouse.args | 5 ++-- tests/qemuxml2argvdata/input-usbtablet.args | 5 ++-- tests/qemuxml2argvdata/kvm-pit-delay.args | 5 ++-- tests/qemuxml2argvdata/kvm-pit-discard.args | 5 ++-- tests/qemuxml2argvdata/kvmclock.args | 4 ++-- tests/qemuxml2argvdata/machine-aliases1.args | 5 ++-- tests/qemuxml2argvdata/machine-aliases2.args | 5 ++-- tests/qemuxml2argvdata/machine-core-off.args | 5 ++-- tests/qemuxml2argvdata/machine-core-on.args | 5 ++-- .../qemuxml2argvdata/machine-vmport-opt.args | 5 ++-- .../qemuxml2argvdata/memory-hotplug-dimm.args | 7 +++--- tests/qemuxml2argvdata/memory-hotplug.args | 7 +++--- tests/qemuxml2argvdata/memtune-unlimited.args | 5 ++-- tests/qemuxml2argvdata/memtune.args | 5 ++-- .../migrate-numa-unaligned.args | 4 ++-- tests/qemuxml2argvdata/migrate.args | 5 ++-- tests/qemuxml2argvdata/minimal.args | 5 ++-- tests/qemuxml2argvdata/misc-acpi.args | 4 +++- tests/qemuxml2argvdata/misc-disable-s3.args | 5 ++-- .../misc-disable-suspends.args | 5 ++-- tests/qemuxml2argvdata/misc-enable-s4.args | 5 ++-- tests/qemuxml2argvdata/misc-uuid.args | 4 +++- .../multifunction-pci-device.args | 5 ++-- tests/qemuxml2argvdata/nosharepages.args | 5 ++-- .../numad-auto-memory-vcpu-cpuset.args | 5 ++-- ...o-memory-vcpu-no-cpuset-and-placement.args | 5 ++-- .../numad-auto-vcpu-static-numatune.args | 5 ++-- .../numad-static-memory-auto-vcpu.args | 5 ++-- tests/qemuxml2argvdata/numad.args | 5 ++-- tests/qemuxml2argvdata/pci-autoadd-addr.args | 4 +++- tests/qemuxml2argvdata/pci-autoadd-idx.args | 4 +++- tests/qemuxml2argvdata/pci-autofill-addr.args | 5 ++-- .../pci-bridge-many-disks.args | 3 ++- tests/qemuxml2argvdata/pci-bridge.args | 4 +++- tests/qemuxml2argvdata/pci-expander-bus.args | 10 ++++---- tests/qemuxml2argvdata/pci-many.args | 4 +++- tests/qemuxml2argvdata/pci-rom-disabled.args | 5 ++-- tests/qemuxml2argvdata/pci-rom.args | 5 ++-- tests/qemuxml2argvdata/pcie-expander-bus.args | 10 ++++---- .../pcie-root-port-model-generic.args | 5 ++-- .../pcie-root-port-model-ioh3420.args | 5 ++-- tests/qemuxml2argvdata/pcie-root-port.args | 5 ++-- tests/qemuxml2argvdata/pcie-root.args | 5 ++-- .../pcie-switch-downstream-port.args | 5 ++-- .../pcie-switch-upstream-port.args | 5 ++-- tests/qemuxml2argvdata/pcihole64-q35.args | 5 ++-- tests/qemuxml2argvdata/pcihole64.args | 5 ++-- tests/qemuxml2argvdata/pmu-feature-off.args | 3 ++- tests/qemuxml2argvdata/pmu-feature.args | 3 ++- .../q35-pci-force-address.args | 5 ++-- tests/qemuxml2argvdata/q35-usb2-multi.args | 5 ++-- tests/qemuxml2argvdata/q35-usb2-reorder.args | 5 ++-- tests/qemuxml2argvdata/q35-usb2.args | 5 ++-- tests/qemuxml2argvdata/q35.args | 5 ++-- tests/qemuxml2argvdata/qemu-ns-alt.args | 5 ++-- .../qemu-ns-commandline-ns0.args | 5 ++-- .../qemu-ns-commandline-ns1.args | 5 ++-- .../qemuxml2argvdata/qemu-ns-commandline.args | 5 ++-- .../qemu-ns-domain-commandline-ns0.args | 5 ++-- .../qemu-ns-domain-commandline.args | 5 ++-- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 5 ++-- tests/qemuxml2argvdata/qemu-ns-no-env.args | 5 ++-- .../reboot-timeout-disabled.args | 5 ++-- .../reboot-timeout-enabled.args | 5 ++-- tests/qemuxml2argvdata/restore-v2-fd.args | 5 ++-- tests/qemuxml2argvdata/restore-v2.args | 5 ++-- tests/qemuxml2argvdata/seclabel-dac-none.args | 5 ++-- .../seclabel-dynamic-baselabel.args | 5 ++-- .../seclabel-dynamic-labelskip.args | 5 ++-- .../seclabel-dynamic-override.args | 5 ++-- .../seclabel-dynamic-relabel.args | 5 ++-- tests/qemuxml2argvdata/seclabel-dynamic.args | 5 ++-- tests/qemuxml2argvdata/seclabel-none.args | 5 ++-- .../seclabel-static-labelskip.args | 5 ++-- .../seclabel-static-relabel.args | 5 ++-- tests/qemuxml2argvdata/seclabel-static.args | 5 ++-- .../smartcard-controller.args | 5 ++-- .../smartcard-host-certificates-database.args | 5 ++-- .../smartcard-host-certificates.args | 5 ++-- tests/qemuxml2argvdata/smartcard-host.args | 5 ++-- .../smartcard-passthrough-spicevmc.args | 5 ++-- .../smartcard-passthrough-tcp.args | 5 ++-- tests/qemuxml2argvdata/smbios.args | 5 ++-- tests/qemuxml2argvdata/smp-dies.args | 5 ++-- tests/qemuxml2argvdata/smp.args | 5 ++-- .../usb-controller-default-q35.args | 5 ++-- .../usb-controller-explicit-q35.args | 5 ++-- .../usb-controller-qemu-xhci.args | 5 ++-- .../qemuxml2argvdata/usb-controller-xhci.args | 5 ++-- tests/qemuxml2argvdata/usb-controller.args | 5 ++-- .../usb-hub-autoadd-deluxe.args | 5 ++-- tests/qemuxml2argvdata/usb-hub-autoadd.args | 5 ++-- tests/qemuxml2argvdata/usb-hub.args | 5 ++-- .../qemuxml2argvdata/usb-ich9-autoassign.args | 5 ++-- .../qemuxml2argvdata/usb-ich9-companion.args | 5 ++-- .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 5 ++-- .../qemuxml2argvdata/usb-long-port-path.args | 5 ++-- tests/qemuxml2argvdata/usb-none.args | 5 ++-- .../usb-piix3-controller.args | 5 ++-- .../qemuxml2argvdata/usb-port-autoassign.args | 5 ++-- tests/qemuxml2argvdata/usb-port-missing.args | 5 ++-- tests/qemuxml2argvdata/usb-ports.args | 5 ++-- tests/qemuxml2argvdata/usb-redir-boot.args | 5 ++-- .../usb-redir-filter-version.args | 5 ++-- tests/qemuxml2argvdata/usb-redir-filter.args | 5 ++-- tests/qemuxml2argvdata/usb-redir.args | 5 ++-- .../qemuxml2argvdata/usb-xhci-autoassign.args | 5 ++-- tests/qemuxml2argvdata/usb1-usb2.args | 5 ++-- .../virtio-input-passthrough.args | 5 ++-- tests/qemuxml2argvdata/virtio-input.args | 5 ++-- .../qemuxml2argvdata/virtio-rng-default.args | 5 ++-- tests/qemuxml2argvdata/virtio-rng-egd.args | 5 ++-- .../qemuxml2argvdata/virtio-rng-multiple.args | 5 ++-- tests/qemuxml2argvdata/virtio-rng-random.args | 5 ++-- tests/qemuxml2argvdata/vmcoreinfo.args | 5 ++-- tests/testutilsqemu.c | 23 +++++++------------ 197 files changed, 577 insertions(+), 409 deletions(-) diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.args index 88a9c97e79..339220c962 100644 --- a/tests/qemuxml2argvdata/acpi-table.args +++ b/tests/qemuxml2argvdata/acpi-table.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args index 3d7bffff7f..110a203de3 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args index dbee8dab7b..6936fa8958 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args index c7ed5f1698..d51bd5438c 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args index 5de1090233..57e56fc2bf 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args index 5de1090233..57e56fc2bf 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args index 147c54348f..043167931c 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args index 009abf0b09..0f211c5723 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args index d86ff6d6a0..424c191b5e 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":16,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args index d7a32b5b1d..07b7e2f202 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args index 8ee30c8c2a..c8d5a91a59 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args index 032938afca..db44038462 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args index 27113716ad..1b7a8af721 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args index 12ef286573..bb2f3e1898 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args index 11c899376a..766c08e28c 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args index ee84969f73..27c2d37514 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args index 717e39de4b..0ee37cae47 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc,driftfix=slew \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args index ebaf3983f2..1aac60b73e 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -11,9 +11,11 @@ TZ=Europe/Paris \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ TZ=Europe/Paris \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=localtime \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args index 349685854d..1ade114f84 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc,driftfix=slew \ -no-hpet \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index cfb65c94b3..2d100be581 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=2009-02-14T00:01:30 \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args index 2f27165702..2b127d8eb3 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=localtime \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args index 629091aba2..5a7b6df7eb 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu qemu64,hv-time=on \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args index 7b0d7e31af..4ed1fe72a5 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args index 7faefe3464..061697f057 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=2009-02-15T09:49:06 \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args index d45a1b4eb0..8196f3039b 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args index 20a6eb9c45..12d846bc3d 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args index 58222e601f..8ea076ce51 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr/.config \ -name guest=fdr,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel kvm \ +-cpu qemu64 \ -m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}' \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args index 6b4e0aa6cb..ee856da83c 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu Haswell-noTSX \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args index c36c67a8b8..3a19cd7e7d 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell.args +++ b/tests/qemuxml2argvdata/cpu-Haswell.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu Haswell \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args index 280d48f76f..7989bb54f1 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/cpu-Haswell2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu Haswell,hle=off,rtm=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args index f66a637bbe..9a198712ee 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/cpu-Haswell3.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu Haswell,rtm=on,hle=on \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args index 6bab5d64a5..341e2c9aff 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -name guest=foo,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu host,host-cache-info=off,l3-cache=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args index dd9227de22..1ea6896a8e 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -name guest=foo,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,l3-cache=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args index 38f1d93973..603f0ea0a2 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -name guest=foo,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu host,l3-cache=on,host-cache-info=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args index 4bf1305f16..1c7325e32a 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -name guest=foo,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu host,host-cache-info=on,l3-cache=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args index 65fc3e1bad..5b75657eea 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu host \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args index cd55fad737..6348b15672 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ -cpu core2duo \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args index 959a421741..0416205d82 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args index 48ad817176..d43bc435e1 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args index 48ad817176..d43bc435e1 100644 --- a/tests/qemuxml2argvdata/cpu-check-none.args +++ b/tests/qemuxml2argvdata/cpu-check-none.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args index bd452e017e..45e15c91ce 100644 --- a/tests/qemuxml2argvdata/cpu-exact1.args +++ b/tests/qemuxml2argvdata/cpu-exact1.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu qemu64,mca=off,pse36=off,clflush=off,syscall=off,nx=off,lm=off,svm=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args index 2916d10b23..acae725f2e 100644 --- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo,ds=on,ht=on,tm=on,ds-cpl=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args index 2916d10b23..acae725f2e 100644 --- a/tests/qemuxml2argvdata/cpu-exact2.args +++ b/tests/qemuxml2argvdata/cpu-exact2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo,ds=on,ht=on,tm=on,ds-cpl=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args index ef6c3b29f3..d6e2611cde 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu Conroe,cx16=on,sse4.1=off,sse4.2=off,popcnt=off,aes=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args index 836fe208a0..e8f4f4d5c5 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu host,kvmclock=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args index 97b7b9fda6..634a06e34a 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ -cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args index 8bece6f8da..d39564cb89 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ -cpu 'core2duo,vendor=Libvirt QEMU,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on' \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args index b8e0734d7d..6cce7f9aee 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu host,abm=on,ds=on,invtsc=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args index 65fc3e1bad..5b75657eea 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu host \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args index ef469a1e5a..b2c18d17ba 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo,kvmclock=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args index 959a421741..0416205d82 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args index de2c6f4fe5..99ffab88d7 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,syscall=off,nx=off,lm=off,svm=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.args index 48ad817176..d43bc435e1 100644 --- a/tests/qemuxml2argvdata/cpu-no-removed-features.args +++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args index 5fc82723eb..cb8581257a 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ -smp 16,sockets=2,cores=4,threads=2 \ --numa node,nodeid=0,cpus=0-3,cpus=8-11,mem=107 \ --numa node,nodeid=1,cpus=4-7,cpus=12-15,mem=107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ +-numa node,nodeid=0,cpus=0-3,cpus=8-11,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ +-numa node,nodeid=1,cpus=4-7,cpus=12-15,memdev=ram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args index fc4c03f1a6..1e07b930fe 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ -smp 16,sockets=2,cores=4,threads=2 \ @@ -27,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args index 3cf5b44742..ca93709c64 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ -smp 16,sockets=2,cores=4,threads=2 \ --numa node,nodeid=0,cpus=0-7,mem=107 \ --numa node,nodeid=1,cpus=8-15,mem=107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ +-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ +-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args index 3cf5b44742..ca93709c64 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ -smp 16,sockets=2,cores=4,threads=2 \ --numa node,nodeid=0,cpus=0-7,mem=107 \ --numa node,nodeid=1,cpus=8-15,mem=107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ +-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ +-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args index 3cf5b44742..ca93709c64 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ -smp 16,sockets=2,cores=4,threads=2 \ --numa node,nodeid=0,cpus=0-7,mem=107 \ --numa node,nodeid=1,cpus=8-15,mem=107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ +-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ +-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args index 6710c3edc5..b85ccebfc0 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -name guest=foo,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu host,phys-bits=42 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args index f4fdaab483..0b08d7e145 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -name guest=foo,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,phys-bits=42 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args index 0ae7743b5a..b85ce46a20 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -name guest=foo,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu host,host-phys-bits=on \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args index f865d7557a..65749b9611 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu core2duo,ds=on,acpi=on,ht=on,tm=on,ds-cpl=on,vmx=on,est=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args index 52e36d0de5..ee3ea3cb75 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=3,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args index 6f8f674859..64372f05d7 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ -cpu core2duo \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=1,cores=2,threads=3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args index 52e36d0de5..ee3ea3cb75 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=3,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args index f3a8a62c00..33ec51af4b 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,invtsc=on,tsc-frequency=4567890000 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args index 07ee740065..1554f13ba0 100644 --- a/tests/qemuxml2argvdata/default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \ -name guest=kvm,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-kvm/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ +-cpu qemu64 \ -m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}' \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args index a54dc14136..a88774dc86 100644 --- a/tests/qemuxml2argvdata/default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu-host/.config \ -name guest=qemu-host,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-qemu-host/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}' \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu-host/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args index 33ad2bd5da..cdec35daf7 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -12,9 +12,11 @@ DISPLAY=:0.1 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ DISPLAY=:0.1 \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args index bd6f994856..1ac0995a24 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -12,9 +12,11 @@ DISPLAY=:0.1 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ DISPLAY=:0.1 \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args index 8f51127035..97424f3c56 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args index b59083cb3c..879deef04b 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ -name guest=delete,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-delete/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ +-cpu qemu64 \ -m size=262144k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":268435456}' \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 583a8e8e-f0ce-4f53-89ab-092862148b25 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args index b0110be8b1..823112a276 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args +++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ -name guest=delete,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-delete/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ +-cpu qemu64 \ -m size=262144k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":268435456}' \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid 583a8e8e-f0ce-4f53-89ab-092862148b25 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index 972a023d5b..62e24de6e0 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x3"}' \ -usb \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args index 909f65ecae..09b213afda 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args index a52b705099..3d436c046d 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.args index 030552411e..3c2703d735 100644 --- a/tests/qemuxml2argvdata/hotplug-base.args +++ b/tests/qemuxml2argvdata/hotplug-base.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-hotplug/.config \ -name guest=hotplug,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-hotplug/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel kvm \ +-cpu qemu64 \ -m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}' \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args index 1d7e8f29aa..6b1c787d4b 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args index fdf0cd14c5..77af8a128f 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args index 18f484fc0a..9182426b07 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args index fd7a2b306a..871a066e37 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -global kvm-pit.lost_tick_policy=delay \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args index c3cdc71020..ffaed42bd9 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -global kvm-pit.lost_tick_policy=discard \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args index df9ab68537..84232c96b3 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ -cpu qemu64,kvmclock=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -24,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args index 6501e5e417..2fdb43c621 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args index 7b0d7e31af..4ed1fe72a5 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args index a1b9905d5c..30a6ebf0b5 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=on \ +-machine pc,usb=off,dump-guest-core=on,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args index c7cdb0c85f..7e309f5d09 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,vmport=off,dump-guest-core=off \ +-machine pc,usb=off,vmport=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index b84efa4556..18c0316775 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -10,12 +10,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ --numa node,nodeid=0,cpus=0-1,mem=214 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ +-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -24,7 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -object '{"qom-type":"memory-backend-ram","id":"memdimm0","size":536870912}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args index 62600fefe2..1e38bb58c2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -10,12 +10,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ --numa node,nodeid=0,cpus=0-1,mem=214 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ +-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -24,7 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qemuxml2argvdata/migrate-numa-unaligned.args index 35d665f20b..76e1dfedde 100644 --- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args +++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -name guest=QEMUGuest,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=14682112k \ -overcommit mem-lock=off \ -smp 32,sockets=32,cores=1,threads=1 \ @@ -29,7 +30,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args index e46b190249..55f528a7d9 100644 --- a/tests/qemuxml2argvdata/migrate.args +++ b/tests/qemuxml2argvdata/migrate.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object memory-backend-ram,id=pc.ram,size=224395264 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args index 15343c68b0..01bd000e48 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args index 3dc66e443e..6323b763ed 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -global PIIX4_PM.disable_s3=1 \ -boot strict=on \ -usb \ diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args index 314612c229..c91c97b023 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -global PIIX4_PM.disable_s3=1 \ -global PIIX4_PM.disable_s4=1 \ -boot strict=on \ diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args index f2e9fcc0a6..af5ece2df0 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -global PIIX4_PM.disable_s4=0 \ -boot strict=on \ -usb \ diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args index 15343c68b0..01bd000e48 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args index 40c38dea48..e12a9a7441 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"lsi","id":"scsi0","bus":"pci.0","multifunction":false,"addr":"0x3"}' \ -device '{"driver":"lsi","id":"scsi1","bus":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args index 7bcd073c98..cde8d709d3 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off,mem-merge=off \ +-machine pc,usb=off,dump-guest-core=off,mem-merge=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=220160k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":225443840}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index d0703d283a..955b0233f4 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ 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 d0703d283a..955b0233f4 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 @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index d0703d283a..755c6d7ba1 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0],"policy":"interleave"}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index d0703d283a..955b0233f4 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args index d0703d283a..955b0233f4 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args index ec75429384..7772f468f2 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -name guest=fdr-br,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args index 5c6377d619..e8ea698e9c 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -name guest=fdr-br,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args index f43a1da7ab..6f226370ec 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -name guest=fdr-br,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args index 7d990296c7..c84f98e9e8 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-lots-of-disks/.config \ -name guest=lots-of-disks,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-lots-of-disks/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64,kvmclock=off \ -m size=4000768k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4096786432}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 04872dc1-e1de-434b-ab21-e3e80e416349 \ diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args index 1e1d4c30e2..db93c647aa 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -name guest=fdr-br,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args index e4c9bfead0..85634f4377 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \ -name guest=expander-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-expander-test/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ -smp 16,sockets=2,cores=4,threads=2 \ --numa node,nodeid=0,cpus=0-7,mem=107 \ --numa node,nodeid=1,cpus=8-15,mem=107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ +-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ +-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"pxb","bus_nr":254,"id":"pci.1","numa_node":1,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"pxb","bus_nr":252,"id":"pci.2","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args index 028f4bf278..0f69ce9f5a 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -name guest=fdr-br,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.args index 2ddb190c66..ea34132861 100644 --- a/tests/qemuxml2argvdata/pci-rom-disabled.args +++ b/tests/qemuxml2argvdata/pci-rom-disabled.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"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 cbc3fc950c..e3bf06a1ae 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args index 4cb85a0999..acddaea4f5 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -10,13 +10,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -name guest=pcie-expander-bus-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ -smp 16,sockets=2,cores=4,threads=2 \ --numa node,nodeid=0,cpus=0-7,mem=107 \ --numa node,nodeid=1,cpus=8-15,mem=107 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ +-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ +-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -display none \ -no-user-config \ @@ -25,7 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","numa_node":0,"bus":"pcie.0","addr":"0x4"}' \ -device '{"driver":"ioh3420","port":0,"chassis":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args index aa8c171594..750b132e7a 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index fc5e591733..5e838ba2f4 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"ioh3420","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"ioh3420","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args index a5342e8b70..c15270294a 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"ioh3420","port":26,"chassis":40,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.args index 169e73608b..afc072da93 100644 --- a/tests/qemuxml2argvdata/pcie-root.args +++ b/tests/qemuxml2argvdata/pcie-root.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args index 0c3da6bd1a..77057d94d5 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","addr":"0x2"}' \ -device '{"driver":"x3130-upstream","id":"pci.2","bus":"pci.1","addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args index aaae74d377..f9a4dcc051 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"ioh3420","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args index 86e5778b35..18d584e895 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -global q35-pcihost.pci-hole64-size=1048576K \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args index 43f5a6dbf0..c3821eed8f 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -name guest=foo,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 3c7c30b5-7866-4b05-8a29-efebccba52a0 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -global i440FX-pcihost.pci-hole64-size=1048576K \ -usb \ diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args index 80d0ebb925..869560c07f 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64,pmu=off \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args index 3531746845..01b75e94fd 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64,pmu=on \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args index 2c7b88f0d0..d8f0d2e282 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args index be6f4bbc5d..23cc5aa775 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args index f0f32c80ed..e6c0c1e20e 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args index 4b7d83ba51..51d50f7673 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args index 3d4c93038c..b778f874d6 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -global ICH9-LPC.disable_s3=1 \ -global ICH9-LPC.disable_s4=0 \ -boot strict=on \ diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args index 9eec4d266e..b62ad8f47f 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -12,9 +12,11 @@ BAR='' \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,7 +27,6 @@ BAR='' \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args index 75d46d2b6d..f3ca25ee90 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args index 9f06ef5a80..2dc4c55ca3 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args index 43150e9e15..00eb1321eb 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot reboot-timeout=-1,strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args index c123cd9dce..a7c63c3bd0 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot reboot-timeout=128,strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args index 61c3521103..060a6cfafb 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.args +++ b/tests/qemuxml2argvdata/restore-v2-fd.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object memory-backend-ram,id=pc.ram,size=224395264 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args index d6247264df..2acb08e1e3 100644 --- a/tests/qemuxml2argvdata/restore-v2.args +++ b/tests/qemuxml2argvdata/restore-v2.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object memory-backend-ram,id=pc.ram,size=224395264 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args index b417f976af..20820924bc 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args index 86af73f198..b8d7a87cf2 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args index 6ff6005c39..a03929ba37 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args index f7261da7fe..740c59caaf 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args index fcbeebb8fe..7d04cff1a6 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args index 6ff6005c39..a03929ba37 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args index 6d74ded58c..9ce691d6d7 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args index f9991c0a6b..6bda6a08c7 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args index d510624693..100725e572 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -28,7 +30,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args index 95f018af2e..7cc3538ddf 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,maxcpus=4,sockets=2,dies=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args index 91c4a1eacc..8933b62a9f 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests/qemuxml2argvdata/usb-controller-default-q35.args index 41110fc0d0..f4be0cbc26 100644 --- a/tests/qemuxml2argvdata/usb-controller-default-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pcie.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args index ad421f5eb3..39e88ccaa5 100644 --- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -name guest=q35-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=2097152k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"nec-usb-xhci","id":"usb","bus":"pcie.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args index 001af94982..fe331a489c 100644 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"qemu-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args index 2a39d7cdd3..fd6fc0a10e 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-xhci.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args index 738e28c155..9c60eb502f 100644 --- a/tests/qemuxml2argvdata/usb-controller.args +++ b/tests/qemuxml2argvdata/usb-controller.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args index da0a967d1e..d29e39bb77 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args index ebbc82df50..f0ffc1595d 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args index c8614ed8de..4a0b2513a8 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args index 263f645f67..c444e4c940 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args index 75c1c82600..828d938af8 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/usb-ich9-companion.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args index 661e086c37..7f605a1d9c 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x2.0x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args index 8f29017c8e..40184c3919 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args index 00470d4396..721417ae35 100644 --- a/tests/qemuxml2argvdata/usb-none.args +++ b/tests/qemuxml2argvdata/usb-none.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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 857577af38..55c20b4d59 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/usb-piix3-controller.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args index 4703a94715..b92a30aea1 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args index 4280ecef26..3022160377 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args index 905d2fe4da..e2d3eb7be9 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args index 9cc1f16529..04f18dffd5 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.args +++ b/tests/qemuxml2argvdata/usb-redir-boot.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args index 3d9f9f7951..b79daf5023 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args index 92616b6e2d..d231b28901 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.args +++ b/tests/qemuxml2argvdata/usb-redir-filter.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args index 20055947b0..c304c11194 100644 --- a/tests/qemuxml2argvdata/usb-redir.args +++ b/tests/qemuxml2argvdata/usb-redir.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -22,7 +24,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args index 43116f06f7..abc1b9c0d8 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args index caecedde68..9f6a5d67f5 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pci.0","addr":"0x4.0x7"}' \ diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args index a00ee57660..42c1447fc6 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/input/event1234","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args index dc6aa53d9c..d41b6ebb15 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -device '{"driver":"virtio-mouse-pci","id":"input0","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args index 5e035afeb9..c9ef5e5c82 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args index 02c5bb0e66..e35a93caa5 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args index beb8a32c31..89e39c777e 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args index f3473129e0..95b34b6810 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args index 1e96abf12d..4a27a21a15 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -10,9 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -23,7 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ -usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index fdbad16abe..8996f846bc 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -302,13 +302,6 @@ qemuTestCapsPopulateFakeMachines(virQEMUCaps *caps, virArch arch) { size_t i; - const char *defaultRAMid = NULL; - - /* default-ram-id appeared in QEMU 5.2.0. Reflect - * this in our capabilities, i.e. set it for new - * enough versions only. */ - if (virQEMUCapsGetVersion(caps) >= 5002000) - defaultRAMid = qemu_default_ram_id[arch]; virQEMUCapsSetArch(caps, arch); @@ -317,28 +310,28 @@ qemuTestCapsPopulateFakeMachines(virQEMUCaps *caps, VIR_DOMAIN_VIRT_QEMU, qemu_machines[arch][i], NULL, - NULL, + "qemu64", 0, false, false, - true, - defaultRAMid, false, - VIR_TRISTATE_BOOL_ABSENT); + qemu_default_ram_id[arch], + false, + VIR_TRISTATE_BOOL_YES); virQEMUCapsSet(caps, QEMU_CAPS_TCG); virQEMUCapsAddMachine(caps, VIR_DOMAIN_VIRT_KVM, qemu_machines[arch][i], NULL, - NULL, + "qemu64", 0, false, false, - true, - defaultRAMid, false, - VIR_TRISTATE_BOOL_ABSENT); + qemu_default_ram_id[arch], + false, + VIR_TRISTATE_BOOL_YES); virQEMUCapsSet(caps, QEMU_CAPS_KVM); } } -- 2.41.0

In order to minimize further churn, make all fake-caps test assume that the seccomp sandbox is supported. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/acpi-table.args | 1 + tests/qemuxml2argvdata/autoindex.args | 1 + tests/qemuxml2argvdata/balloon-device-auto.args | 1 + tests/qemuxml2argvdata/balloon-device-deflate-off.args | 1 + tests/qemuxml2argvdata/balloon-device-deflate.args | 1 + tests/qemuxml2argvdata/balloon-device-period.args | 1 + tests/qemuxml2argvdata/balloon-device.args | 1 + tests/qemuxml2argvdata/blkiotune-device.args | 1 + tests/qemuxml2argvdata/blkiotune.args | 1 + tests/qemuxml2argvdata/channel-guestfwd.args | 1 + tests/qemuxml2argvdata/channel-spicevmc.args | 1 + tests/qemuxml2argvdata/channel-virtio-auto.args | 1 + tests/qemuxml2argvdata/channel-virtio-autoadd.args | 1 + tests/qemuxml2argvdata/channel-virtio-autoassign.args | 1 + tests/qemuxml2argvdata/channel-virtio-default.args | 1 + tests/qemuxml2argvdata/channel-virtio-state.args | 1 + tests/qemuxml2argvdata/channel-virtio-unix.args | 1 + tests/qemuxml2argvdata/channel-virtio.args | 1 + tests/qemuxml2argvdata/chardev-reconnect.args | 1 + tests/qemuxml2argvdata/clock-catchup.args | 1 + tests/qemuxml2argvdata/clock-france.args | 1 + tests/qemuxml2argvdata/clock-hpet-off.args | 1 + tests/qemuxml2argvdata/clock-localtime-basis-localtime.args | 1 + tests/qemuxml2argvdata/clock-localtime.args | 1 + tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 1 + tests/qemuxml2argvdata/clock-utc.args | 1 + tests/qemuxml2argvdata/clock-variable.args | 1 + tests/qemuxml2argvdata/console-virtio-many.args | 1 + tests/qemuxml2argvdata/console-virtio.args | 1 + tests/qemuxml2argvdata/controller-order.args | 1 + tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 1 + tests/qemuxml2argvdata/cpu-Haswell.args | 1 + tests/qemuxml2argvdata/cpu-Haswell2.args | 1 + tests/qemuxml2argvdata/cpu-Haswell3.args | 1 + tests/qemuxml2argvdata/cpu-cache-disable.args | 1 + tests/qemuxml2argvdata/cpu-cache-disable3.args | 1 + tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 1 + tests/qemuxml2argvdata/cpu-cache-passthrough.args | 1 + tests/qemuxml2argvdata/cpu-check-default-none.args | 1 + tests/qemuxml2argvdata/cpu-check-default-none2.args | 1 + tests/qemuxml2argvdata/cpu-check-default-partial.args | 1 + tests/qemuxml2argvdata/cpu-check-default-partial2.args | 1 + tests/qemuxml2argvdata/cpu-check-none.args | 1 + tests/qemuxml2argvdata/cpu-exact1.args | 1 + tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 1 + tests/qemuxml2argvdata/cpu-exact2.args | 1 + tests/qemuxml2argvdata/cpu-fallback.args | 1 + tests/qemuxml2argvdata/cpu-host-kvmclock.args | 1 + tests/qemuxml2argvdata/cpu-host-model-cmt.args | 1 + tests/qemuxml2argvdata/cpu-host-model-vendor.args | 1 + tests/qemuxml2argvdata/cpu-host-passthrough-features.args | 1 + tests/qemuxml2argvdata/cpu-host-passthrough.args | 1 + tests/qemuxml2argvdata/cpu-kvmclock.args | 1 + tests/qemuxml2argvdata/cpu-minimum1.args | 1 + tests/qemuxml2argvdata/cpu-minimum2.args | 1 + tests/qemuxml2argvdata/cpu-no-removed-features.args | 1 + tests/qemuxml2argvdata/cpu-numa-disjoint.args | 1 + tests/qemuxml2argvdata/cpu-numa-memshared.args | 1 + tests/qemuxml2argvdata/cpu-numa-no-memory-element.args | 1 + tests/qemuxml2argvdata/cpu-numa1.args | 1 + tests/qemuxml2argvdata/cpu-numa2.args | 1 + tests/qemuxml2argvdata/cpu-phys-bits-emulate.args | 1 + tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args | 1 + tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args | 1 + tests/qemuxml2argvdata/cpu-strict1.args | 1 + tests/qemuxml2argvdata/cpu-topology1.args | 1 + tests/qemuxml2argvdata/cpu-topology2.args | 1 + tests/qemuxml2argvdata/cpu-topology3.args | 1 + tests/qemuxml2argvdata/cpu-tsc-frequency.args | 1 + tests/qemuxml2argvdata/default-kvm-host-arch.args | 1 + tests/qemuxml2argvdata/default-qemu-host-arch.args | 1 + tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 1 + tests/qemuxml2argvdata/graphics-sdl.args | 1 + tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 1 + tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args | 1 + tests/qemuxml2argvdata/hostdev-pci-multifunction.args | 1 + tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args | 1 + tests/qemuxml2argvdata/hostdev-vfio-multidomain.args | 1 + tests/qemuxml2argvdata/hostdev-vfio.args | 1 + tests/qemuxml2argvdata/hotplug-base.args | 1 + tests/qemuxml2argvdata/input-usbmouse-addr.args | 1 + tests/qemuxml2argvdata/input-usbmouse.args | 1 + tests/qemuxml2argvdata/input-usbtablet.args | 1 + tests/qemuxml2argvdata/kvm-pit-delay.args | 1 + tests/qemuxml2argvdata/kvm-pit-discard.args | 1 + tests/qemuxml2argvdata/kvmclock.args | 1 + tests/qemuxml2argvdata/machine-aliases1.args | 1 + tests/qemuxml2argvdata/machine-aliases2.args | 1 + tests/qemuxml2argvdata/machine-core-off.args | 1 + tests/qemuxml2argvdata/machine-core-on.args | 1 + tests/qemuxml2argvdata/machine-vmport-opt.args | 1 + tests/qemuxml2argvdata/memory-hotplug-dimm.args | 1 + tests/qemuxml2argvdata/memory-hotplug.args | 1 + tests/qemuxml2argvdata/memtune-unlimited.args | 1 + tests/qemuxml2argvdata/memtune.args | 1 + tests/qemuxml2argvdata/minimal.args | 1 + tests/qemuxml2argvdata/misc-acpi.args | 1 + tests/qemuxml2argvdata/misc-disable-s3.args | 1 + tests/qemuxml2argvdata/misc-disable-suspends.args | 1 + tests/qemuxml2argvdata/misc-enable-s4.args | 1 + tests/qemuxml2argvdata/misc-uuid.args | 1 + tests/qemuxml2argvdata/multifunction-pci-device.args | 1 + tests/qemuxml2argvdata/nosharepages.args | 1 + tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args | 1 + .../numad-auto-memory-vcpu-no-cpuset-and-placement.args | 1 + tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args | 1 + tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args | 1 + tests/qemuxml2argvdata/numad.args | 1 + tests/qemuxml2argvdata/pci-autoadd-addr.args | 1 + tests/qemuxml2argvdata/pci-autoadd-idx.args | 1 + tests/qemuxml2argvdata/pci-autofill-addr.args | 1 + tests/qemuxml2argvdata/pci-bridge-many-disks.args | 1 + tests/qemuxml2argvdata/pci-bridge.args | 1 + tests/qemuxml2argvdata/pci-expander-bus.args | 1 + tests/qemuxml2argvdata/pci-many.args | 1 + tests/qemuxml2argvdata/pci-rom-disabled.args | 1 + tests/qemuxml2argvdata/pci-rom.args | 1 + tests/qemuxml2argvdata/pcie-expander-bus.args | 1 + tests/qemuxml2argvdata/pcie-root-port-model-generic.args | 1 + tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args | 1 + tests/qemuxml2argvdata/pcie-root-port.args | 1 + tests/qemuxml2argvdata/pcie-root.args | 1 + tests/qemuxml2argvdata/pcie-switch-downstream-port.args | 1 + tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 1 + tests/qemuxml2argvdata/pcihole64-q35.args | 1 + tests/qemuxml2argvdata/pcihole64.args | 1 + tests/qemuxml2argvdata/pmu-feature-off.args | 1 + tests/qemuxml2argvdata/pmu-feature.args | 1 + tests/qemuxml2argvdata/q35-pci-force-address.args | 1 + tests/qemuxml2argvdata/q35-usb2-multi.args | 1 + tests/qemuxml2argvdata/q35-usb2-reorder.args | 1 + tests/qemuxml2argvdata/q35-usb2.args | 1 + tests/qemuxml2argvdata/q35.args | 1 + tests/qemuxml2argvdata/qemu-ns-alt.args | 1 + tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args | 1 + tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args | 1 + tests/qemuxml2argvdata/qemu-ns-commandline.args | 1 + tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args | 1 + tests/qemuxml2argvdata/qemu-ns-domain-commandline.args | 1 + tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 1 + tests/qemuxml2argvdata/qemu-ns-no-env.args | 1 + tests/qemuxml2argvdata/reboot-timeout-disabled.args | 1 + tests/qemuxml2argvdata/reboot-timeout-enabled.args | 1 + tests/qemuxml2argvdata/seclabel-dac-none.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic-override.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic-relabel.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic.args | 1 + tests/qemuxml2argvdata/seclabel-none.args | 1 + tests/qemuxml2argvdata/seclabel-static-labelskip.args | 1 + tests/qemuxml2argvdata/seclabel-static-relabel.args | 1 + tests/qemuxml2argvdata/seclabel-static.args | 1 + tests/qemuxml2argvdata/smartcard-controller.args | 1 + .../qemuxml2argvdata/smartcard-host-certificates-database.args | 1 + tests/qemuxml2argvdata/smartcard-host-certificates.args | 1 + tests/qemuxml2argvdata/smartcard-host.args | 1 + tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args | 1 + tests/qemuxml2argvdata/smartcard-passthrough-tcp.args | 1 + tests/qemuxml2argvdata/smbios.args | 1 + tests/qemuxml2argvdata/smp-dies.args | 1 + tests/qemuxml2argvdata/smp.args | 1 + tests/qemuxml2argvdata/usb-controller-default-q35.args | 1 + tests/qemuxml2argvdata/usb-controller-explicit-q35.args | 1 + tests/qemuxml2argvdata/usb-controller-qemu-xhci.args | 1 + tests/qemuxml2argvdata/usb-controller-xhci.args | 1 + tests/qemuxml2argvdata/usb-controller.args | 1 + tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 1 + tests/qemuxml2argvdata/usb-hub-autoadd.args | 1 + tests/qemuxml2argvdata/usb-hub.args | 1 + tests/qemuxml2argvdata/usb-ich9-autoassign.args | 1 + tests/qemuxml2argvdata/usb-ich9-companion.args | 1 + tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 1 + tests/qemuxml2argvdata/usb-long-port-path.args | 1 + tests/qemuxml2argvdata/usb-none.args | 1 + tests/qemuxml2argvdata/usb-piix3-controller.args | 1 + tests/qemuxml2argvdata/usb-port-autoassign.args | 1 + tests/qemuxml2argvdata/usb-port-missing.args | 1 + tests/qemuxml2argvdata/usb-ports.args | 1 + tests/qemuxml2argvdata/usb-redir-boot.args | 1 + tests/qemuxml2argvdata/usb-redir-filter-version.args | 1 + tests/qemuxml2argvdata/usb-redir-filter.args | 1 + tests/qemuxml2argvdata/usb-redir.args | 1 + tests/qemuxml2argvdata/usb-xhci-autoassign.args | 1 + tests/qemuxml2argvdata/usb1-usb2.args | 1 + tests/qemuxml2argvdata/virtio-input-passthrough.args | 1 + tests/qemuxml2argvdata/virtio-input.args | 1 + tests/qemuxml2argvdata/virtio-rng-default.args | 1 + tests/qemuxml2argvdata/virtio-rng-egd.args | 1 + tests/qemuxml2argvdata/virtio-rng-multiple.args | 1 + tests/qemuxml2argvdata/virtio-rng-random.args | 1 + tests/qemuxml2argvdata/vmcoreinfo.args | 1 + tests/qemuxml2argvtest.c | 2 ++ 193 files changed, 194 insertions(+) diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.args index 339220c962..216a207860 100644 --- a/tests/qemuxml2argvdata/acpi-table.args +++ b/tests/qemuxml2argvdata/acpi-table.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -acpitable sig=SLIC,file=/var/lib/libvirt/acpi/slic.dat \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args index 110a203de3..e0c7471f3a 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -61,4 +61,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args index 6936fa8958..2e2dfe69af 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":false,"bus":"pci.0","addr":"0x12"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args index d51bd5438c..1aac88ba43 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":true,"bus":"pci.0","addr":"0x12"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args index 57e56fc2bf..a3587435cf 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x12"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args index 57e56fc2bf..a3587435cf 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x12"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args index 043167931c..d1370ade86 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:charchannel0"}],"id":"channel0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args index 0f211c5723..fa6a95985e 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -36,4 +36,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args index 424c191b5e..17eb241e0b 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -47,4 +47,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial2.0","nr":1,"chardev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args index 07b7e2f202..0f48ad41bc 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -46,4 +46,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args index c8d5a91a59..20460f718b 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -46,4 +46,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args index db44038462..fe0a9a9635 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -39,4 +39,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -spice port=0,seamless-migration=on \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args index 1b7a8af721..7cb3ee8e2d 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -39,4 +39,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":5,"chardev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.foo2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args index bb2f3e1898..9e5631a42d 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev socket,id=charchannel3,fd=1729,server=on,wait=off \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chardev":"charchannel3","id":"channel3","name":"fdsa"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args index 766c08e28c..fe467db7d5 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.foo"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args index 27c2d37514..186fe49746 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -42,4 +42,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev socket,id=charrng0,host=localhost,port=2345,reconnect=5 \ -object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args index 0ee37cae47..2c5e597b63 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args index 1aac60b73e..d14a923aa2 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -33,4 +33,5 @@ TZ=Europe/Paris \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args index 1ade114f84..9b98d4d9ae 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index 2d100be581..6798dfb4d6 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args index 2b127d8eb3..5878a79725 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args index 5a7b6df7eb..f40f1d5588 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args index 4ed1fe72a5..b3adaac533 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args index 061697f057..fc9255beb8 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args index 8196f3039b..df4adeaa50 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtconsole","chardev":"charconsole3","id":"console3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args index 12d846bc3d..a81368bd48 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args index 8ea076ce51..8f676e58fe 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -51,4 +51,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr/.config \ -device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad":0,"audiodev":"audio1"}' \ -device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","bus":"usb.0","port":"2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args index ee856da83c..32d8054f4e 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args index 3a19cd7e7d..9c732ad4bb 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell.args +++ b/tests/qemuxml2argvdata/cpu-Haswell.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args index 7989bb54f1..51e6cf99bf 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/cpu-Haswell2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args index 9a198712ee..ede85300c3 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/cpu-Haswell3.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args index 341e2c9aff..b920ad022f 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args index 1ea6896a8e..557d9c5ac4 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args index 603f0ea0a2..f7f9403885 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args index 1c7325e32a..e3911bea27 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args index 5b75657eea..67f11be4bf 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args index 6348b15672..e01ac72a16 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args index 0416205d82..90712d2eb7 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args index d43bc435e1..45c130849d 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args index d43bc435e1..45c130849d 100644 --- a/tests/qemuxml2argvdata/cpu-check-none.args +++ b/tests/qemuxml2argvdata/cpu-check-none.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args index 45e15c91ce..17e0ea1a1f 100644 --- a/tests/qemuxml2argvdata/cpu-exact1.args +++ b/tests/qemuxml2argvdata/cpu-exact1.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args index acae725f2e..3c2a166ecd 100644 --- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args index acae725f2e..3c2a166ecd 100644 --- a/tests/qemuxml2argvdata/cpu-exact2.args +++ b/tests/qemuxml2argvdata/cpu-exact2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args index d6e2611cde..76961da609 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args index e8f4f4d5c5..9f3f3dc7a4 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args index 634a06e34a..499d485600 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args index d39564cb89..b3cf8c4aa9 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args index 6cce7f9aee..4cd3c83700 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args index 5b75657eea..67f11be4bf 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args index b2c18d17ba..b25e51d580 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args index 0416205d82..90712d2eb7 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args index 99ffab88d7..41b0e1fd91 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.args index d43bc435e1..45c130849d 100644 --- a/tests/qemuxml2argvdata/cpu-no-removed-features.args +++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args index cb8581257a..6f13b9de0f 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args index 1e07b930fe..4132bee971 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args index ca93709c64..b28ad67612 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args index ca93709c64..b28ad67612 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args index ca93709c64..b28ad67612 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args index b85ccebfc0..96efce2507 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args index 0b08d7e145..e8a3bf58f0 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args index b85ce46a20..a3b9ddea01 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args index 65749b9611..ef44967621 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args index ee3ea3cb75..83f1a45c9b 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args index 64372f05d7..3ebc709634 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args index ee3ea3cb75..83f1a45c9b 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args index 33ec51af4b..08252d7a74 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args index 1554f13ba0..fab4e53bb3 100644 --- a/tests/qemuxml2argvdata/default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args index a88774dc86..900da74fa5 100644 --- a/tests/qemuxml2argvdata/default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu-host/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args index cdec35daf7..7f73f2e364 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -34,4 +34,5 @@ DISPLAY=:0.1 \ -full-screen \ -display sdl \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args index 1ac0995a24..f771948f4a 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -33,4 +33,5 @@ DISPLAY=:0.1 \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -display sdl \ -device '{"driver":"VGA","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args index 97424f3c56..b4a0092493 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"off","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args index 879deef04b..30c52bf3a5 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ -device '{"driver":"vfio-pci","host":"0005:90:01.2","id":"hostdev2","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"vfio-pci","host":"0005:90:01.3","id":"hostdev3","bus":"pci.0","addr":"0x4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args index 823112a276..073db68293 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args +++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args @@ -36,4 +36,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ -device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev5","bus":"pci.0","addr":"0x7"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.2","id":"hostdev6","bus":"pci.0","addr":"0x8"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x9"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index 62e24de6e0..f8d4c6db21 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vhost-scsi-pci","wwpn":"naa.5123456789abcde0","vhostfd":"3","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args index 09b213afda..643d54f7cf 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0021:de:1f.1","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args index 3d436c046d..e722f6e0ff 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.args index 3c2703d735..24f2e79228 100644 --- a/tests/qemuxml2argvdata/hotplug-base.args +++ b/tests/qemuxml2argvdata/hotplug-base.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-hotplug/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x4"}' \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args index 6b1c787d4b..1c4e751547 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args index 77af8a128f..b6eab126b7 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args index 9182426b07..34b982c024 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args index 871a066e37..bc517cbb79 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args index ffaed42bd9..c926618742 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args index 84232c96b3..217527c731 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args index 2fdb43c621..f785eb07a3 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args index 4ed1fe72a5..b3adaac533 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args index 30a6ebf0b5..19caffadfb 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args index 7e309f5d09..d77df81b08 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index 18c0316775..c163442363 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args index 1e38bb58c2..78d5307ee6 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args index 01bd000e48..ac30ed91a4 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args index 6323b763ed..e229371a48 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args index c91c97b023..515beb8dec 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args index af5ece2df0..f8b2873c2d 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args index 01bd000e48..ac30ed91a4 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args index e12a9a7441..49dad593a3 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"drive-scsi0-0-0","drive":"libvirt-1-format","id":"scsi0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args index cde8d709d3..7bcc71d565 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index 955b0233f4..2e0c83d169 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on 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 955b0233f4..2e0c83d169 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 @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index 755c6d7ba1..9f71a0150c 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index 955b0233f4..2e0c83d169 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args index 955b0233f4..2e0c83d169 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args index 7772f468f2..5f7f1b458e 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -40,4 +40,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.7","addr":"0x6"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args index e8ea698e9c..eacf56c25b 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","addr":"0x6"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args index 6f226370ec..bf07b1174a 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args index c84f98e9e8..d3e90b5309 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -346,4 +346,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-lots-of-disks/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x10","drive":"libvirt-1-format","id":"virtio-disk679"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args index db93c647aa..aafb60b7c0 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -100,4 +100,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -k en-us \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args index 85634f4377..8bf472d386 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -97,4 +97,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \ -device '{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:00:7e:6e:c8","bus":"pci.1","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args index 0f69ce9f5a..d64aa49985 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -117,4 +117,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.args index ea34132861..dbc18d1f38 100644 --- a/tests/qemuxml2argvdata/pci-rom-disabled.args +++ b/tests/qemuxml2argvdata/pci-rom-disabled.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:24:a5:9f","bus":"pci.0","addr":"0x2","romfile":""}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args index e3bf06a1ae..18e3290740 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -38,4 +38,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":"pci.0","addr":"0x4","rombar":0}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.6","id":"hostdev1","bus":"pci.0","addr":"0x5","rombar":1,"romfile":"/etc/fake/bootrom.bin"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args index acddaea4f5..64b7d5d7df 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -134,4 +134,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args index 750b132e7a..86307c9bd8 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index 5e838ba2f4..271bfab93c 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args index c15270294a..cee54df33c 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.args index afc072da93..656cd80665 100644 --- a/tests/qemuxml2argvdata/pcie-root.args +++ b/tests/qemuxml2argvdata/pcie-root.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args index 77057d94d5..3a346a1697 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -43,4 +43,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args index f9a4dcc051..c4670c674e 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args index 18d584e895..624cfc9264 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args index c3821eed8f..127e76b680 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args index 869560c07f..b711a3b79f 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args index 01b75e94fd..e0fa5a290e 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args index d8f0d2e282..33171a4d87 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -36,4 +36,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad":0,"audiodev":"audio1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args index 23cc5aa775..f5d39447dc 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -47,4 +47,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args index e6c0c1e20e..6641391bae 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -47,4 +47,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args index 51d50f7673..a5a6aa300b 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -39,4 +39,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args index b778f874d6..bd37012eb0 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -39,4 +39,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args index b62ad8f47f..1eb331073c 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -35,4 +35,5 @@ BAR='' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -unknown parameter \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args index f3ca25ee90..9edde492ae 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' ARGUMENT \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args index 2dc4c55ca3..f8733cb900 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -unknown parameter \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args index 00eb1321eb..da669f6ee1 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot reboot-timeout=-1,strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args index a7c63c3bd0..d26bde8fa3 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot reboot-timeout=128,strict=on \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args index 20820924bc..682aa14b67 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-format","id":"ide0-0-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args index b8d7a87cf2..e6364a8e65 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args index a03929ba37..779d5a424c 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args index 740c59caaf..eb7a13cdfe 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1","cert2":"cert2","cert3":"cert3","db":"/tmp/foo","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args index 7d04cff1a6..f3b6c50f76 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args index a03929ba37..779d5a424c 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args index 9ce691d6d7..016be5321e 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -spice port=0,seamless-migration=on \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args index 6bda6a08c7..4acd0204f1 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args index 100725e572..8450149b25 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args index 7cc3538ddf..4601db602e 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args index 8933b62a9f..fa91ee5721 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests/qemuxml2argvdata/usb-controller-default-q35.args index f4be0cbc26..23bdedef6c 100644 --- a/tests/qemuxml2argvdata/usb-controller-default-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args index 39e88ccaa5..5c6eed22d1 100644 --- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args index fe331a489c..852574e17f 100644 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"qemu-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args index fd6fc0a10e..f3eac45c57 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-xhci.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args index 9c60eb502f..c8de26e4ee 100644 --- a/tests/qemuxml2argvdata/usb-controller.args +++ b/tests/qemuxml2argvdata/usb-controller.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args index d29e39bb77..b3d9be2409 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -48,4 +48,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-tablet","id":"input15","bus":"usb.0","port":"2.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args index f0ffc1595d..d419faa726 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-tablet","id":"input3","bus":"usb.0","port":"1.3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args index 4a0b2513a8..02ec29b63e 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args index c444e4c940..59d8430a40 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args index 828d938af8..b935a43647 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/usb-ich9-companion.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args index 7f605a1d9c..68b512e94b 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args @@ -40,4 +40,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args index 40184c3919..242a39f6cd 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-hub","id":"hub3","bus":"usb.0","port":"1.1.1.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args index 721417ae35..ba1e6d550f 100644 --- a/tests/qemuxml2argvdata/usb-none.args +++ b/tests/qemuxml2argvdata/usb-none.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args index 55c20b4d59..b2d71ccb60 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/usb-piix3-controller.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args index b92a30aea1..35bddfc442 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args index 3022160377..f849fa2062 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args index e2d3eb7be9..70b15ef466 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.2.2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args index 04f18dffd5..edbd32dd09 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.args +++ b/tests/qemuxml2argvdata/usb-redir-boot.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev spicevmc,id=charredir1,name=usbredir \ -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bootindex":2,"bus":"usb.0","port":"4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args index b79daf5023..b1ac8d3980 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev spicevmc,id=charredir1,name=usbredir \ -device '{"driver":"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 '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args index d231b28901..714a983c62 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.args +++ b/tests/qemuxml2argvdata/usb-redir-filter.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev spicevmc,id=charredir1,name=usbredir \ -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","filter":"0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0","bus":"usb.0","port":"5"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args index c304c11194..3fa6875a39 100644 --- a/tests/qemuxml2argvdata/usb-redir.args +++ b/tests/qemuxml2argvdata/usb-redir.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev spicevmc,id=charredir1,name=usbredir \ -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":"usb.0","port":"4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args index abc1b9c0d8..14e62871ca 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"4"}' \ -device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args index 9f6a5d67f5..cf84b7279e 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","bus":"usb2.0","port":"1"}' \ -device '{"driver":"usb-host","hostbus":14,"hostaddr":7,"id":"hostdev1","bus":"usb2.0","port":"2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args index 42c1447fc6..495d14b4b7 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/input/event1234","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args index d41b6ebb15..273c475905 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-tablet-pci","id":"input2","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args index c9ef5e5c82..243716bcc1 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.0","addr":"0x7"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args index e35a93caa5..fc6ecb1118 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev socket,id=charrng0,host=1.2.3.4,port=1234 \ -object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args index 89e39c777e..30a0ecd92c 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev socket,id=charrng1,host=1.2.3.4,port=1234 \ -object '{"qom-type":"rng-egd","id":"objrng1","chardev":"charrng1"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng1","id":"rng1","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args index 95b34b6810..7cacfedce5 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes":123,"period":1234,"bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args index 4a27a21a15..040feca15f 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"vmcoreinfo"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 04c7814dce..00cde55b5a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -861,6 +861,7 @@ mymain(void) QEMU_CAPS_DEVICE_JSON, \ QEMU_CAPS_OBJECT_JSON, \ QEMU_CAPS_NETDEV_JSON, \ + QEMU_CAPS_SECCOMP_SANDBOX, \ __VA_ARGS__, \ QEMU_CAPS_LAST, \ ARG_END) @@ -870,6 +871,7 @@ mymain(void) QEMU_CAPS_DEVICE_JSON, \ QEMU_CAPS_OBJECT_JSON, \ QEMU_CAPS_NETDEV_JSON, \ + QEMU_CAPS_SECCOMP_SANDBOX, \ QEMU_CAPS_LAST, \ ARG_END) -- 2.41.0

Move all controller related tests together and consolidate naming of the test cases. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...gs => usb-controller-ich9-autoassign.args} | 0 ...xml => usb-controller-ich9-autoassign.xml} | 0 ...rgs => usb-controller-ich9-companion.args} | 0 ....xml => usb-controller-ich9-companion.xml} | 0 ...rgs => usb-controller-ich9-ehci-addr.args} | 0 ....xml => usb-controller-ich9-ehci-addr.xml} | 0 ...r => usb-controller-ich9-no-companion.err} | 0 ...l => usb-controller-ich9-no-companion.xml} | 0 ...troller.args => usb-controller-piix3.args} | 0 ...ontroller.xml => usb-controller-piix3.xml} | 0 tests/qemuxml2argvtest.c | 89 ++++++++++--------- ...ntroller-ich9-ehci-addr.x86_64-latest.xml} | 0 ...=> usb-controller-piix3.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 4 +- 14 files changed, 48 insertions(+), 45 deletions(-) rename tests/qemuxml2argvdata/{usb-ich9-autoassign.args => usb-controller-ich9-autoassign.args} (100%) rename tests/qemuxml2argvdata/{usb-ich9-autoassign.xml => usb-controller-ich9-autoassign.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-companion.args => usb-controller-ich9-companion.args} (100%) rename tests/qemuxml2argvdata/{usb-ich9-companion.xml => usb-controller-ich9-companion.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-ehci-addr.args => usb-controller-ich9-ehci-addr.args} (100%) rename tests/qemuxml2argvdata/{usb-ich9-ehci-addr.xml => usb-controller-ich9-ehci-addr.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-no-companion.err => usb-controller-ich9-no-companion.err} (100%) rename tests/qemuxml2argvdata/{usb-ich9-no-companion.xml => usb-controller-ich9-no-companion.xml} (100%) rename tests/qemuxml2argvdata/{usb-piix3-controller.args => usb-controller-piix3.args} (100%) rename tests/qemuxml2argvdata/{usb-piix3-controller.xml => usb-controller-piix3.xml} (100%) rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.x86_64-latest.xml => usb-controller-ich9-ehci-addr.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{usb-piix3-controller.x86_64-latest.xml => usb-controller-piix3.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-autoassign.args rename to tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml b/tests/qemuxml2argvdata/usb-controller-ich9-autoassign.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-autoassign.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-autoassign.xml diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-controller-ich9-companion.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-companion.args rename to tests/qemuxml2argvdata/usb-controller-ich9-companion.args diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.xml b/tests/qemuxml2argvdata/usb-controller-ich9-companion.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-companion.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-companion.xml diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-ehci-addr.args rename to tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.xml diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.err b/tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-no-companion.err rename to tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml b/tests/qemuxml2argvdata/usb-controller-ich9-no-companion.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ich9-no-companion.xml rename to tests/qemuxml2argvdata/usb-controller-ich9-no-companion.xml diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-controller-piix3.args similarity index 100% rename from tests/qemuxml2argvdata/usb-piix3-controller.args rename to tests/qemuxml2argvdata/usb-controller-piix3.args diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.xml b/tests/qemuxml2argvdata/usb-controller-piix3.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-piix3-controller.xml rename to tests/qemuxml2argvdata/usb-controller-piix3.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 00cde55b5a..6c10af0ec2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1500,19 +1500,59 @@ mymain(void) DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", QEMU_CAPS_CHARDEV_RECONNECT); + DO_TEST_NOCAPS("usb-none"); + DO_TEST_NOCAPS("usb-controller"); - DO_TEST("usb-piix3-controller", + DO_TEST("usb-controller-piix3", QEMU_CAPS_PIIX3_USB_UHCI); - DO_TEST("usb-ich9-ehci-addr", + DO_TEST("usb-controller-ich9-ehci-addr", QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_NOCAPS("input-usbmouse-addr"); - DO_TEST("usb-ich9-companion", + DO_TEST("usb-controller-ich9-companion", QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_PARSE_ERROR("usb-ich9-no-companion", + DO_TEST_PARSE_ERROR("usb-controller-ich9-no-companion", QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST("usb-ich9-autoassign", + DO_TEST("usb-controller-ich9-autoassign", QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_HUB); + DO_TEST("usb1-usb2", + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_USB_HUB, + QEMU_CAPS_ICH9_USB_EHCI1); + + DO_TEST("usb-controller-default-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_FAILURE("usb-controller-default-unavailable-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST("usb-controller-explicit-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI); + DO_TEST("usb-controller-xhci", + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST("usb-xhci-autoassign", + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI, + QEMU_CAPS_USB_HUB); + DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); + DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI); + DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable"); + DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", + QEMU_CAPS_DEVICE_QEMU_XHCI); + + DO_TEST_NOCAPS("input-usbmouse-addr"); DO_TEST("usb-hub", QEMU_CAPS_USB_HUB); DO_TEST("usb-hub-autoadd", @@ -1558,47 +1598,10 @@ mymain(void) QEMU_CAPS_USB_REDIR_FILTER, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST_CAPS_LATEST("usb-redir-unix"); - DO_TEST("usb1-usb2", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_NOCAPS("usb-none"); DO_TEST_PARSE_ERROR_NOCAPS("usb-none-other"); DO_TEST_PARSE_ERROR("usb-none-hub", QEMU_CAPS_USB_HUB); DO_TEST_PARSE_ERROR_NOCAPS("usb-none-usbtablet"); - DO_TEST("usb-controller-default-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST_FAILURE("usb-controller-default-unavailable-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("usb-controller-explicit-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI); - DO_TEST("usb-controller-xhci", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("usb-xhci-autoassign", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI, - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI); - DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable"); - DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", - QEMU_CAPS_DEVICE_QEMU_XHCI); DO_TEST_NOCAPS("smbios"); DO_TEST_PARSE_ERROR_NOCAPS("smbios-date"); diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/usb-controller-piix3.x86_64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 87bd6389a6..a958daf56d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -483,7 +483,8 @@ mymain(void) DO_TEST_CAPS_LATEST("usb-none"); DO_TEST_CAPS_LATEST("usb-controller"); - DO_TEST_CAPS_LATEST("usb-piix3-controller"); + DO_TEST_CAPS_LATEST("usb-controller-piix3"); + DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr"); DO_TEST_CAPS_LATEST("usb-controller-default-q35"); DO_TEST_CAPS_LATEST("usb-controller-explicit-q35"); DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64"); @@ -573,7 +574,6 @@ mymain(void) DO_TEST_CAPS_LATEST("numad-auto-vcpu-no-numatune"); DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement"); DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset"); - DO_TEST_CAPS_LATEST("usb-ich9-ehci-addr"); DO_TEST_CAPS_LATEST("disk-copy_on_read"); DO_TEST_CAPS_LATEST("tpm-passthrough"); DO_TEST_CAPS_LATEST("tpm-passthrough-crb"); -- 2.41.0

There are per-machine type variations on which usb controller will be picked on an x86_64 machine. Add test cases where a USB controller is completely missing to cover all 3 cases ('isapc', 'pc', 'q35') when an USB controller is not explicitly requested by the user. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...troller-implicit-i440fx.x86_64-latest.args | 32 ++++++++++++++ .../usb-controller-implicit-i440fx.xml | 15 +++++++ ...ntroller-implicit-isapc.x86_64-latest.args | 32 ++++++++++++++ .../usb-controller-implicit-isapc.xml | 15 +++++++ ...controller-implicit-q35.x86_64-latest.args | 36 ++++++++++++++++ .../usb-controller-implicit-q35.xml | 15 +++++++ tests/qemuxml2argvtest.c | 3 ++ ...ntroller-implicit-i440fx.x86_64-latest.xml | 29 +++++++++++++ ...ontroller-implicit-isapc.x86_64-latest.xml | 25 +++++++++++ ...-controller-implicit-q35.x86_64-latest.xml | 43 +++++++++++++++++++ tests/qemuxml2xmltest.c | 3 ++ 11 files changed, 248 insertions(+) create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-i440fx.xml create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.xml create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-isapc.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x86_64-latest.xml diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-latest.args b/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-latest.args new file mode 100644 index 0000000000..e4be4266bb --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-latest.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.xml b/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.xml new file mode 100644 index 0000000000..fc48ea3cde --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.xml @@ -0,0 +1,15 @@ +<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'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-latest.args b/tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-latest.args new file mode 100644 index 0000000000..62dc26ee8b --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-latest.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine isapc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu 486 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-usb \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml b/tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml new file mode 100644 index 0000000000..21be5b8cdf --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml @@ -0,0 +1,15 @@ +<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='isapc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args b/tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args new file mode 100644 index 0000000000..9a660060a9 --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-global ICH9-LPC.noreboot=off \ +-watchdog-action reset \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-q35.xml b/tests/qemuxml2argvdata/usb-controller-implicit-q35.xml new file mode 100644 index 0000000000..ddeeadca97 --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-implicit-q35.xml @@ -0,0 +1,15 @@ +<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='q35'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6c10af0ec2..45df4f4bae 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1500,6 +1500,9 @@ mymain(void) DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", QEMU_CAPS_CHARDEV_RECONNECT); + DO_TEST_CAPS_LATEST("usb-controller-implicit-isapc"); + DO_TEST_CAPS_LATEST("usb-controller-implicit-i440fx"); + DO_TEST_CAPS_LATEST("usb-controller-implicit-q35"); DO_TEST_NOCAPS("usb-none"); DO_TEST_NOCAPS("usb-controller"); diff --git a/tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_64-latest.xml new file mode 100644 index 0000000000..89631180ac --- /dev/null +++ b/tests/qemuxml2xmloutdata/usb-controller-implicit-i440fx.x86_64-latest.xml @@ -0,0 +1,29 @@ +<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'>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='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </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='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/usb-controller-implicit-isapc.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-implicit-isapc.x86_64-latest.xml new file mode 100644 index 0000000000..6331aade72 --- /dev/null +++ b/tests/qemuxml2xmloutdata/usb-controller-implicit-isapc.x86_64-latest.xml @@ -0,0 +1,25 @@ +<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='isapc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>486</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> + <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/usb-controller-implicit-q35.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x86_64-latest.xml new file mode 100644 index 0000000000..8368fe57ba --- /dev/null +++ b/tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x86_64-latest.xml @@ -0,0 +1,43 @@ +<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='q35'>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='usb' index='0' model='qemu-xhci'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </controller> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <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='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='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <watchdog model='itco' action='reset'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a958daf56d..3157072c5c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -482,6 +482,9 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-lun"); DO_TEST_CAPS_LATEST("usb-none"); + DO_TEST_CAPS_LATEST("usb-controller-implicit-isapc"); + DO_TEST_CAPS_LATEST("usb-controller-implicit-i440fx"); + DO_TEST_CAPS_LATEST("usb-controller-implicit-q35"); DO_TEST_CAPS_LATEST("usb-controller"); DO_TEST_CAPS_LATEST("usb-controller-piix3"); DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr"); -- 2.41.0

Improve testing of an explicitly requested USB controller without a model being provided. For this purpose the 'usb-controller' case is renamed to 'usb-controller-default-i440fx'; 'usb-controller-default-q35' is moved up to form a group. In both cases tests are covnerted to use DO_TEST_CAPS_LATEST. A new 'usb-controller-default-isapc' negative test case is added for symmetry. The negative test case 'usb-controller-default-unavailable-q35' is converted to use latest caps, but stripping the default controller instead of using fake caps. Additionally for symmetry 'usb-controller-default-unavailable-i440fx' is added although that doesn't cause failure, but rather a graceful downgrade to use '-usb'. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...ntroller-default-i440fx.x86_64-latest.args | 33 +++++++++++++++++++ ....xml => usb-controller-default-i440fx.xml} | 0 ...controller-default-isapc.x86_64-latest.err | 1 + .../usb-controller-default-isapc.xml | 16 +++++++++ ...controller-default-q35.x86_64-latest.args} | 0 ...ult-unavailable-i440fx.x86_64-latest.args} | 0 ...-controller-default-unavailable-i440fx.xml | 1 + ...default-unavailable-q35.x86_64-latest.err} | 0 tests/qemuxml2argvtest.c | 26 +++++++++------ ...ntroller-default-i440fx.x86_64-latest.xml} | 0 ...fault-unavailable-i440fx.x86_64-latest.xml | 31 +++++++++++++++++ tests/qemuxml2xmltest.c | 6 ++-- 12 files changed, 102 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/usb-controller-default-i440fx.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-controller.xml => usb-controller-default-i440fx.xml} (100%) create mode 100644 tests/qemuxml2argvdata/usb-controller-default-isapc.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/usb-controller-default-isapc.xml rename tests/qemuxml2argvdata/{usb-controller-default-q35.args => usb-controller-default-q35.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-controller.args => usb-controller-default-unavailable-i440fx.x86_64-latest.args} (100%) create mode 120000 tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.xml rename tests/qemuxml2argvdata/{usb-controller-default-unavailable-q35.err => usb-controller-default-unavailable-q35.x86_64-latest.err} (100%) rename tests/qemuxml2xmloutdata/{usb-controller.x86_64-latest.xml => usb-controller-default-i440fx.x86_64-latest.xml} (100%) create mode 100644 tests/qemuxml2xmloutdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml diff --git a/tests/qemuxml2argvdata/usb-controller-default-i440fx.x86_64-latest.args b/tests/qemuxml2argvdata/usb-controller-default-i440fx.x86_64-latest.args new file mode 100644 index 0000000000..b2d71ccb60 --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-default-i440fx.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller.xml b/tests/qemuxml2argvdata/usb-controller-default-i440fx.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller.xml rename to tests/qemuxml2argvdata/usb-controller-default-i440fx.xml diff --git a/tests/qemuxml2argvdata/usb-controller-default-isapc.x86_64-latest.err b/tests/qemuxml2argvdata/usb-controller-default-isapc.x86_64-latest.err new file mode 100644 index 0000000000..a0ca4fba5d --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-default-isapc.x86_64-latest.err @@ -0,0 +1 @@ +XML error: No PCI buses available diff --git a/tests/qemuxml2argvdata/usb-controller-default-isapc.xml b/tests/qemuxml2argvdata/usb-controller-default-isapc.xml new file mode 100644 index 0000000000..fa87acbdff --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-default-isapc.xml @@ -0,0 +1,16 @@ +<domain type='qemu'> + <name>q35-test</name> + <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='isapc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests/qemuxml2argvdata/usb-controller-default-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-q35.args rename to tests/qemuxml2argvdata/usb-controller-default-q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller.args rename to tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.xml b/tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.xml new file mode 120000 index 0000000000..d3d865ea0c --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.xml @@ -0,0 +1 @@ +usb-controller-default-i440fx.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.err b/tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.err rename to tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.x86_64-latest.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 45df4f4bae..6d7c60ba9d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1503,9 +1503,24 @@ mymain(void) DO_TEST_CAPS_LATEST("usb-controller-implicit-isapc"); DO_TEST_CAPS_LATEST("usb-controller-implicit-i440fx"); DO_TEST_CAPS_LATEST("usb-controller-implicit-q35"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-default-isapc"); + DO_TEST_CAPS_LATEST("usb-controller-default-i440fx"); + DO_TEST_CAPS_LATEST("usb-controller-default-q35"); + /* i440fx downgrades to use '-usb' if the explicit controller is not present */ + DO_TEST_FULL("usb-controller-default-unavailable-i440fx", ".x86_64-latest", + ARG_CAPS_ARCH, "x86_64", + ARG_CAPS_VER, "latest", + ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LAST, + ARG_END); + DO_TEST_FULL("usb-controller-default-unavailable-q35", ".x86_64-latest", + ARG_CAPS_ARCH, "x86_64", + ARG_CAPS_VER, "latest", + ARG_FLAGS, FLAG_EXPECT_FAILURE, + ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LAST, + ARG_END); + DO_TEST_NOCAPS("usb-none"); - DO_TEST_NOCAPS("usb-controller"); DO_TEST("usb-controller-piix3", QEMU_CAPS_PIIX3_USB_UHCI); DO_TEST("usb-controller-ich9-ehci-addr", @@ -1522,15 +1537,6 @@ mymain(void) QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST("usb-controller-default-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST_FAILURE("usb-controller-default-unavailable-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_NEC_USB_XHCI); DO_TEST("usb-controller-explicit-q35", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_PCI_OHCI, diff --git a/tests/qemuxml2xmloutdata/usb-controller.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-default-i440fx.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/usb-controller.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/usb-controller-default-i440fx.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml new file mode 100644 index 0000000000..183cfe3b9a --- /dev/null +++ b/tests/qemuxml2xmloutdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml @@ -0,0 +1,31 @@ +<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'>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='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </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='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3157072c5c..d65fb1f200 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -485,11 +485,13 @@ mymain(void) DO_TEST_CAPS_LATEST("usb-controller-implicit-isapc"); DO_TEST_CAPS_LATEST("usb-controller-implicit-i440fx"); DO_TEST_CAPS_LATEST("usb-controller-implicit-q35"); - DO_TEST_CAPS_LATEST("usb-controller"); + DO_TEST_CAPS_LATEST("usb-controller-default-i440fx"); + DO_TEST_CAPS_LATEST("usb-controller-default-q35"); DO_TEST_CAPS_LATEST("usb-controller-piix3"); DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr"); - DO_TEST_CAPS_LATEST("usb-controller-default-q35"); DO_TEST_CAPS_LATEST("usb-controller-explicit-q35"); + DO_TEST_CAPS_ARCH_LATEST_FULL("usb-controller-default-unavailable-i440fx", "x86_64", + ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LAST); DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller-legacy", "ppc64"); DO_TEST_CAPS_LATEST("usb-port-missing"); -- 2.41.0

Rename the 'usb-controller-explicit-(unavailable-)q35' test case to 'usb-controller-nec-xhci'. Since this also covers what 'usb-controller-xhci' was testing the latter is removed. Other 'usb-xhci' test cases which were using the NEC controller are also renamed to contain the name. In case of 'usb-controller-qemu-xhci' the negative test case is deleted as we don't need two cases for missing explicitly specified controller and the positive case is modernized to use real capabilities. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...sb-controller-explicit-unavailable-q35.xml | 1 - ...ntroller-nec-xhci-limit.x86_64-latest.err} | 0 ....xml => usb-controller-nec-xhci-limit.xml} | 0 ...er-nec-xhci-unavailable.x86_64-latest.err} | 0 .../usb-controller-nec-xhci-unavailable.xml | 1 + ...sb-controller-nec-xhci.x86_64-latest.args} | 0 ...it-q35.xml => usb-controller-nec-xhci.xml} | 0 ...er-nex-xhci-autoassign.x86_64-latest.args} | 0 ...=> usb-controller-nex-xhci-autoassign.xml} | 0 ...troller-qemu-xhci-limit.x86_64-latest.err} | 0 .../usb-controller-qemu-xhci-unavailable.err | 1 - .../usb-controller-qemu-xhci-unavailable.xml | 1 - ...b-controller-qemu-xhci.x86_64-latest.args} | 0 .../qemuxml2argvdata/usb-controller-xhci.args | 32 ----------------- .../qemuxml2argvdata/usb-controller-xhci.xml | 16 --------- tests/qemuxml2argvtest.c | 34 ++++++------------- ...usb-controller-nec-xhci.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 2 +- 18 files changed, 13 insertions(+), 75 deletions(-) delete mode 120000 tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.err => usb-controller-nec-xhci-limit.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.xml => usb-controller-nec-xhci-limit.xml} (100%) rename tests/qemuxml2argvdata/{usb-controller-explicit-unavailable-q35.err => usb-controller-nec-xhci-unavailable.x86_64-latest.err} (100%) create mode 120000 tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.args => usb-controller-nec-xhci.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.xml => usb-controller-nec-xhci.xml} (100%) rename tests/qemuxml2argvdata/{usb-xhci-autoassign.args => usb-controller-nex-xhci-autoassign.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-xhci-autoassign.xml => usb-controller-nex-xhci-autoassign.xml} (100%) rename tests/qemuxml2argvdata/{usb-controller-qemu-xhci-limit.err => usb-controller-qemu-xhci-limit.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.err delete mode 120000 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml rename tests/qemuxml2argvdata/{usb-controller-qemu-xhci.args => usb-controller-qemu-xhci.x86_64-latest.args} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-controller-xhci.args delete mode 100644 tests/qemuxml2argvdata/usb-controller-xhci.xml rename tests/qemuxml2xmloutdata/{usb-controller-explicit-q35.x86_64-latest.xml => usb-controller-nec-xhci.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml b/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml deleted file mode 120000 index bc747bb653..0000000000 --- a/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml +++ /dev/null @@ -1 +0,0 @@ -usb-controller-explicit-q35.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/usb-controller-xhci-limit.err b/tests/qemuxml2argvdata/usb-controller-nec-xhci-limit.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-xhci-limit.err rename to tests/qemuxml2argvdata/usb-controller-nec-xhci-limit.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml b/tests/qemuxml2argvdata/usb-controller-nec-xhci-limit.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-xhci-limit.xml rename to tests/qemuxml2argvdata/usb-controller-nec-xhci-limit.xml diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.err b/tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.err rename to tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml b/tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml new file mode 120000 index 0000000000..faad458454 --- /dev/null +++ b/tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml @@ -0,0 +1 @@ +usb-controller-nec-xhci.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/usb-controller-nec-xhci.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-explicit-q35.args rename to tests/qemuxml2argvdata/usb-controller-nec-xhci.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.xml b/tests/qemuxml2argvdata/usb-controller-nec-xhci.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-explicit-q35.xml rename to tests/qemuxml2argvdata/usb-controller-nec-xhci.xml diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-xhci-autoassign.args rename to tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.xml b/tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-xhci-autoassign.xml rename to tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.xml diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.err b/tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.err rename to tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.err b/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.err deleted file mode 100644 index aec91f7559..0000000000 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: USB controller model 'qemu-xhci' not supported in this QEMU binary diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml b/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml deleted file mode 120000 index f00efadeb9..0000000000 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml +++ /dev/null @@ -1 +0,0 @@ -usb-controller-qemu-xhci.xml \ No newline at end of file diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-qemu-xhci.args rename to tests/qemuxml2argvdata/usb-controller-qemu-xhci.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args deleted file mode 100644 index f3eac45c57..0000000000 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ --accel tcg \ --cpu qemu64 \ --m size=219136k \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ --overcommit mem-lock=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,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot strict=on \ --device '{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.xml b/tests/qemuxml2argvdata/usb-controller-xhci.xml deleted file mode 100644 index 5ee73c9bcf..0000000000 --- a/tests/qemuxml2argvdata/usb-controller-xhci.xml +++ /dev/null @@ -1,16 +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'>hvm</type> - <boot dev='hd'/> - </os> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='usb' index='0' model='nec-xhci' ports='8'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6d7c60ba9d..98d07aee66 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1537,29 +1537,17 @@ mymain(void) QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST("usb-controller-explicit-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI); - DO_TEST("usb-controller-xhci", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("usb-xhci-autoassign", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI, - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI); - DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable"); - DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", - QEMU_CAPS_DEVICE_QEMU_XHCI); + DO_TEST_CAPS_LATEST("usb-controller-nec-xhci"); + DO_TEST_FULL("usb-controller-nec-xhci-unavailable", ".x86_64-latest", + ARG_CAPS_ARCH, "x86_64", + ARG_CAPS_VER, "latest", + ARG_FLAGS, FLAG_EXPECT_FAILURE, + ARG_QEMU_CAPS_DEL, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_LAST, + ARG_END); + DO_TEST_CAPS_LATEST("usb-controller-nex-xhci-autoassign"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-nec-xhci-limit"); + DO_TEST_CAPS_LATEST("usb-controller-qemu-xhci"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-qemu-xhci-limit"); DO_TEST_NOCAPS("input-usbmouse-addr"); DO_TEST("usb-hub", diff --git a/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-nec-xhci.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/usb-controller-explicit-q35.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/usb-controller-nec-xhci.x86_64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d65fb1f200..3b8eab6346 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -489,7 +489,7 @@ mymain(void) DO_TEST_CAPS_LATEST("usb-controller-default-q35"); DO_TEST_CAPS_LATEST("usb-controller-piix3"); DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr"); - DO_TEST_CAPS_LATEST("usb-controller-explicit-q35"); + DO_TEST_CAPS_LATEST("usb-controller-nec-xhci"); DO_TEST_CAPS_ARCH_LATEST_FULL("usb-controller-default-unavailable-i440fx", "x86_64", ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LAST); DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64"); -- 2.41.0

To minimize further churn when coverting to real capabilities, assume that all fake-caps machines support the piix3 USB controller. Since we already have solid testing of USB controllers, this will have effect only in cases when it's not relevant to the test itself. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/acpi-table.args | 2 +- tests/qemuxml2argvdata/balloon-device-auto.args | 2 +- tests/qemuxml2argvdata/balloon-device-deflate-off.args | 2 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 2 +- tests/qemuxml2argvdata/balloon-device-period.args | 2 +- tests/qemuxml2argvdata/balloon-device.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.args | 2 +- tests/qemuxml2argvdata/blkiotune.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 2 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 2 +- tests/qemuxml2argvdata/channel-virtio-autoassign.args | 2 +- tests/qemuxml2argvdata/channel-virtio-default.args | 2 +- tests/qemuxml2argvdata/channel-virtio-state.args | 2 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 2 +- tests/qemuxml2argvdata/channel-virtio.args | 2 +- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- tests/qemuxml2argvdata/clock-catchup.args | 2 +- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-hpet-off.args | 2 +- tests/qemuxml2argvdata/clock-localtime-basis-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime.args | 2 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/clock-utc.args | 2 +- tests/qemuxml2argvdata/clock-variable.args | 2 +- tests/qemuxml2argvdata/console-virtio-many.args | 2 +- tests/qemuxml2argvdata/console-virtio.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 +- tests/qemuxml2argvdata/cpu-cache-disable3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-none.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-none2.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-partial.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-partial2.args | 2 +- tests/qemuxml2argvdata/cpu-check-none.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- tests/qemuxml2argvdata/cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- tests/qemuxml2argvdata/cpu-no-removed-features.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +- tests/qemuxml2argvdata/cpu-numa-memshared.args | 2 +- tests/qemuxml2argvdata/cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.args | 2 +- tests/qemuxml2argvdata/cpu-phys-bits-emulate.args | 2 +- tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args | 2 +- tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- tests/qemuxml2argvdata/default-kvm-host-arch.args | 2 +- tests/qemuxml2argvdata/default-qemu-host-arch.args | 2 +- tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 2 +- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +- tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args | 2 +- tests/qemuxml2argvdata/hostdev-pci-multifunction.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hotplug-base.args | 2 +- tests/qemuxml2argvdata/input-usbmouse-addr.args | 2 +- tests/qemuxml2argvdata/input-usbmouse.args | 2 +- tests/qemuxml2argvdata/input-usbtablet.args | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- tests/qemuxml2argvdata/machine-aliases1.args | 2 +- tests/qemuxml2argvdata/machine-aliases2.args | 2 +- tests/qemuxml2argvdata/machine-core-off.args | 2 +- tests/qemuxml2argvdata/machine-core-on.args | 2 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/memtune.args | 2 +- tests/qemuxml2argvdata/minimal.args | 2 +- tests/qemuxml2argvdata/misc-acpi.args | 2 +- tests/qemuxml2argvdata/misc-disable-s3.args | 2 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 2 +- tests/qemuxml2argvdata/misc-enable-s4.args | 2 +- tests/qemuxml2argvdata/misc-uuid.args | 2 +- tests/qemuxml2argvdata/multifunction-pci-device.args | 2 +- tests/qemuxml2argvdata/nosharepages.args | 2 +- tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args | 2 +- .../numad-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args | 2 +- tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +- tests/qemuxml2argvdata/pci-bridge-many-disks.args | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 2 +- tests/qemuxml2argvdata/pci-many.args | 2 +- tests/qemuxml2argvdata/pci-rom.args | 2 +- tests/qemuxml2argvdata/pcihole64.args | 2 +- tests/qemuxml2argvdata/pmu-feature-off.args | 2 +- tests/qemuxml2argvdata/pmu-feature.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-commandline.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-disabled.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-override.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +- tests/qemuxml2argvdata/seclabel-none.args | 2 +- tests/qemuxml2argvdata/seclabel-static-labelskip.args | 2 +- tests/qemuxml2argvdata/seclabel-static-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-static.args | 2 +- tests/qemuxml2argvdata/smartcard-controller.args | 2 +- .../qemuxml2argvdata/smartcard-host-certificates-database.args | 2 +- tests/qemuxml2argvdata/smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args | 2 +- tests/qemuxml2argvdata/smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/smbios.args | 2 +- tests/qemuxml2argvdata/smp-dies.args | 2 +- tests/qemuxml2argvdata/smp.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +- tests/qemuxml2argvdata/usb-hub.args | 2 +- tests/qemuxml2argvdata/usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/usb-port-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-port-missing.args | 2 +- tests/qemuxml2argvdata/usb-ports.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter-version.args | 2 +- tests/qemuxml2argvdata/virtio-input-passthrough.args | 2 +- tests/qemuxml2argvdata/virtio-input.args | 2 +- tests/qemuxml2argvdata/virtio-rng-default.args | 2 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +- tests/qemuxml2argvdata/virtio-rng-multiple.args | 2 +- tests/qemuxml2argvdata/virtio-rng-random.args | 2 +- tests/qemuxml2argvdata/vmcoreinfo.args | 2 +- tests/qemuxml2argvtest.c | 2 ++ 161 files changed, 162 insertions(+), 160 deletions(-) diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.args index 216a207860..78cb1c90ee 100644 --- a/tests/qemuxml2argvdata/acpi-table.args +++ b/tests/qemuxml2argvdata/acpi-table.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=on \ -acpitable sig=SLIC,file=/var/lib/libvirt/acpi/slic.dat \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args index 2e2dfe69af..ac7af1019f 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args index 1aac88ba43..474d0f8b8d 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args index a3587435cf..b597723509 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args index a3587435cf..b597723509 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args index d1370ade86..98a7b2435b 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args index fa6a95985e..c2b657ee80 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -25,8 +25,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args index 17eb241e0b..17365abcd9 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":16,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial2","bus":"pci.0","addr":"0x3"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args index 0f48ad41bc..6c134b2d88 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0x3"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args index 20460f718b..389509a1fb 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args index fe0a9a9635..aec67fe1ae 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -25,9 +25,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x3"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args index 7cb3ee8e2d..840f62591a 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args index 9e5631a42d..131508cd9a 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args index fe467db7d5..e6bd85ef41 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args index 186fe49746..4f6ab7d2b9 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ --usb \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -chardev socket,id=charsmartcard0,path=/var/lib/libvirt/qemu/channel/target/asdf,reconnect=20 \ -device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}' \ diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args index 2c5e597b63..05f88d296b 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc,driftfix=slew \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args index d14a923aa2..a4ed6011fd 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -27,7 +27,7 @@ TZ=Europe/Paris \ -rtc base=localtime \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args index 9b98d4d9ae..f0869f45b7 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-hpet \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index 6798dfb4d6..e130f7fdbe 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=2009-02-14T00:01:30 \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args index 5878a79725..367855a784 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=localtime \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args index f40f1d5588..c85a433da0 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args index b3adaac533..38145b85d2 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args index fc9255beb8..df000ead6e 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=2009-02-15T09:49:06 \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args index df4adeaa50..8578fd003b 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args index a81368bd48..bdfc636f1c 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args index 32d8054f4e..41e7045dad 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args index 9c732ad4bb..bfbb2d8700 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell.args +++ b/tests/qemuxml2argvdata/cpu-Haswell.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args index 51e6cf99bf..84e9e86127 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/cpu-Haswell2.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args index ede85300c3..4c2cdf0484 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/cpu-Haswell3.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args index b920ad022f..7f62c5c52e 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args index 557d9c5ac4..70fbf70e57 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args index f7f9403885..ccc04d0691 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args index e3911bea27..31f9002006 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args index 67f11be4bf..71b3fedf8f 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args index e01ac72a16..3de38f2a61 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args index 90712d2eb7..e6454e5870 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args index 45c130849d..a0cbbdd040 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args index 45c130849d..a0cbbdd040 100644 --- a/tests/qemuxml2argvdata/cpu-check-none.args +++ b/tests/qemuxml2argvdata/cpu-check-none.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args index 17e0ea1a1f..bdc50b229f 100644 --- a/tests/qemuxml2argvdata/cpu-exact1.args +++ b/tests/qemuxml2argvdata/cpu-exact1.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args index 3c2a166ecd..20b0306268 100644 --- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args index 3c2a166ecd..20b0306268 100644 --- a/tests/qemuxml2argvdata/cpu-exact2.args +++ b/tests/qemuxml2argvdata/cpu-exact2.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args index 76961da609..995c006347 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args index 9f3f3dc7a4..9cb0ca84c4 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args index 499d485600..510e19bba6 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args index b3cf8c4aa9..72c108ab88 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args index 4cd3c83700..8604ce1586 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args index 67f11be4bf..71b3fedf8f 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args index b25e51d580..bde2ee047d 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args index 90712d2eb7..e6454e5870 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args index 41b0e1fd91..6e87b6be88 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.args index 45c130849d..a0cbbdd040 100644 --- a/tests/qemuxml2argvdata/cpu-no-removed-features.args +++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args index 6f13b9de0f..938a3ef3e2 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args index 4132bee971..4d33efb8e6 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args index b28ad67612..80fc7306f7 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args index b28ad67612..80fc7306f7 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args index b28ad67612..80fc7306f7 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-phys-bits-emulate.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args index 96efce2507..921dc891e3 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-phys-bits-emulate2.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args index e8a3bf58f0..11c60a4d8a 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-phys-bits-passthrough.args b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args index a3b9ddea01..12d5e59505 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args index ef44967621..7e33e9dd62 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args index 83f1a45c9b..1f81bc2149 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args index 3ebc709634..b11f49db05 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args index 83f1a45c9b..1f81bc2149 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args index 08252d7a74..4353d65ac2 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args index fab4e53bb3..fc060fefb3 100644 --- a/tests/qemuxml2argvdata/default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args index 900da74fa5..6d1154f9e5 100644 --- a/tests/qemuxml2argvdata/default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu-host/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args index 7f73f2e364..d219893190 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -27,7 +27,7 @@ DISPLAY=:0.1 \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args index f771948f4a..fe4a5efb05 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -27,7 +27,7 @@ DISPLAY=:0.1 \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args index b4a0092493..18e59f7520 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"off","bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args index 30c52bf3a5..1247ff547b 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0005:90:01.0","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"vfio-pci","host":"0005:90:01.2","id":"hostdev2","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args index 073db68293..f3bcec0983 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args +++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0005:90:01.0","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"vfio-pci","host":"0001:01:00.1","id":"hostdev1","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index f8d4c6db21..e4f9fe26a1 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x3"}' \ --usb \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args index 643d54f7cf..cad29ba6e1 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args index e722f6e0ff..c1f9258844 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.args index 24f2e79228..ecbf02ac3a 100644 --- a/tests/qemuxml2argvdata/hotplug-base.args +++ b/tests/qemuxml2argvdata/hotplug-base.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-hotplug/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x4"}' \ --usb \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args index 1c4e751547..dbbbab5541 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args index b6eab126b7..cf82d4f852 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args index 34b982c024..fa7e8ccf50 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args index bc517cbb79..a8a2f92aba 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -global kvm-pit.lost_tick_policy=delay \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args index c926618742..ee46d0698f 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -global kvm-pit.lost_tick_policy=discard \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args index 217527c731..f24504b43e 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args index f785eb07a3..be6040c0dd 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args index b3adaac533..38145b85d2 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args index 19caffadfb..38b6fcec4f 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args index d77df81b08..93fe6e7f45 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index c163442363..5c53800af4 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -object '{"qom-type":"memory-backend-ram","id":"memdimm0","size":536870912}' \ -device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","slot":0}' \ -object '{"qom-type":"memory-backend-file","id":"memdimm1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":536870912,"host-nodes":[1,2,3],"policy":"bind"}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args index 78d5307ee6..5cc5608944 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args index ac30ed91a4..01ba4f69b3 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args index e229371a48..2602394562 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -global PIIX4_PM.disable_s3=1 \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args index 515beb8dec..668951a215 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -global PIIX4_PM.disable_s3=1 \ -global PIIX4_PM.disable_s4=1 \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args index f8b2873c2d..68aa8860ee 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -global PIIX4_PM.disable_s4=0 \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args index ac30ed91a4..01ba4f69b3 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args index 49dad593a3..c76b9aacdd 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -26,6 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"lsi","id":"scsi0","bus":"pci.0","multifunction":false,"addr":"0x3"}' \ -device '{"driver":"lsi","id":"scsi1","bus":"pci.0","multifunction":true,"addr":"0x4"}' \ -device '{"driver":"lsi","id":"scsi2","bus":"pci.0","multifunction":true,"addr":"0x4.0x1"}' \ @@ -35,7 +36,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"lsi","id":"scsi6","bus":"pci.0","addr":"0x4.0x5"}' \ -device '{"driver":"lsi","id":"scsi7","bus":"pci.0","addr":"0x4.0x6"}' \ -device '{"driver":"lsi","id":"scsi8","bus":"pci.0","addr":"0x4.0x7"}' \ --usb \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"drive-scsi0-0-0","drive":"libvirt-1-format","id":"scsi0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args index 7bcc71d565..4618ea0cf5 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index 2e0c83d169..261b3804be 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ 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 2e0c83d169..261b3804be 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,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index 9f71a0150c..a9e61c403f 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index 2e0c83d169..261b3804be 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args index 2e0c83d169..261b3804be 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args index 5f7f1b458e..cc3f6a59f9 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -device '{"driver":"pci-bridge","chassis_nr":5,"id":"pci.5","bus":"pci.0","addr":"0x7"}' \ -device '{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0","addr":"0x8"}' \ -device '{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0","addr":"0x9"}' \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}' \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args index eacf56c25b..c4731e8e56 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -device '{"driver":"pci-bridge","chassis_nr":5,"id":"pci.5","bus":"pci.0","addr":"0x8"}' \ -device '{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0","addr":"0x9"}' \ -device '{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0","addr":"0xa"}' \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}' \ diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args index bf07b1174a..16304a76ef 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args index d3e90b5309..cd39dbcaa1 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-lots-of-disks/.config \ -device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0","addr":"0x4"}' \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img","node-name":"libvirt-105-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-105-format","read-only":false,"driver":"raw","file":"libvirt-105-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"libvirt-105-format","id":"virtio-disk0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args index aafb60b7c0..e8ddb921cd 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -boot strict=on \ -device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0","addr":"0x4"}' \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}' \ diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args index d64aa49985..8ef64242a7 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-29-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-29-format","read-only":true,"driver":"raw","file":"libvirt-29-storage"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-29-format","id":"ide0-1-0"}' \ diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args index 18e3290740..b2d21a497d 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args index 127e76b680..9f765a7816 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -no-shutdown \ -boot strict=on \ -global i440FX-pcihost.pci-hole64-size=1048576K \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args index b711a3b79f..b623627542 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args index e0fa5a290e..25e35f9711 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args index 1eb331073c..eaba61ce8b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -28,7 +28,7 @@ BAR='' \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args index 9edde492ae..97f7fc8c9b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args index 9edde492ae..97f7fc8c9b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args index 9edde492ae..97f7fc8c9b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index 9edde492ae..97f7fc8c9b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args index 9edde492ae..97f7fc8c9b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args index 9edde492ae..97f7fc8c9b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args index f8733cb900..c7a599b24f 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args index da669f6ee1..0a2a024edb 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot reboot-timeout=-1,strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args index d26bde8fa3..59dbfd7152 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot reboot-timeout=128,strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args index 682aa14b67..82b7e38fe2 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args index e6364a8e65..486a07b157 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args index 779d5a424c..89406ff729 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args index eb7a13cdfe..47210c66fe 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1","cert2":"cert2","cert3":"cert3","db":"/tmp/foo","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args index f3b6c50f76..49c58929bf 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args index 779d5a424c..89406ff729 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"smartcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args index 016be5321e..d776270688 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -chardev spicevmc,id=charsmartcard0,name=smartcard \ -device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}' \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args index 4acd0204f1..26bb0b9bbf 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"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 '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}' \ diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args index 8450149b25..8ef15be66a 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args index 4601db602e..a4d5fc3372 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args index fa91ee5721..7a589e5a36 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args index b3d9be2409..6c98dfc021 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ -device '{"driver":"usb-hub","id":"hub2","bus":"usb.0","port":"1.1"}' \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args index d419faa726..d8fc231f89 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"2"}' \ -device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.1"}' \ diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args index 02ec29b63e..b01bbbe463 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args index 242a39f6cd..6aeb776c8d 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"1.1"}' \ -device '{"driver":"usb-hub","id":"hub2","bus":"usb.0","port":"1.1.1"}' \ diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args index 35bddfc442..8a8f747c1a 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args index f849fa2062..5f06d7a229 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args index 70b15ef466..c8ed29e53d 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"1.2"}' \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args index b1ac8d3980..c8af5e2caf 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=0,seamless-migration=on \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args index 495d14b4b7..31f434b150 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/input/event1234","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"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 273c475905..20439c7de1 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -device '{"driver":"virtio-mouse-pci","id":"input0","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"virtio-keyboard-pci","id":"input1","bus":"pci.0","addr":"0xa"}' \ -device '{"driver":"virtio-tablet-pci","id":"input2","bus":"pci.0","addr":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args index 243716bcc1..48e845fec0 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args index fc6ecb1118..5e2f9c928d 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -chardev socket,id=charrng0,host=1.2.3.4,port=1234 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args index 30a0ecd92c..4eae536074 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args index 7cacfedce5..252730c85b 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \ diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args index 040feca15f..e037f73164 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 98d07aee66..d18962d614 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -862,6 +862,7 @@ mymain(void) QEMU_CAPS_OBJECT_JSON, \ QEMU_CAPS_NETDEV_JSON, \ QEMU_CAPS_SECCOMP_SANDBOX, \ + QEMU_CAPS_PIIX3_USB_UHCI, \ __VA_ARGS__, \ QEMU_CAPS_LAST, \ ARG_END) @@ -872,6 +873,7 @@ mymain(void) QEMU_CAPS_OBJECT_JSON, \ QEMU_CAPS_NETDEV_JSON, \ QEMU_CAPS_SECCOMP_SANDBOX, \ + QEMU_CAPS_PIIX3_USB_UHCI, \ QEMU_CAPS_LAST, \ ARG_END) -- 2.41.0

Assume the support for the 'pcie-root-port' all modern qemus have to bring the test data closer to the 'latest' real-caps versions. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/autoindex.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +- tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- tests/qemuxml2argvdata/pcie-switch-downstream-port.args | 2 +- tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 4 ++-- tests/qemuxml2argvdata/q35-pci-force-address.args | 2 +- tests/qemuxml2argvtest.c | 2 ++ 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args index e0c7471f3a..e712a324d8 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -boot strict=on \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ --device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \ -device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.3","addr":"0x0"}' \ -device '{"driver":"xio3130-downstream","port":0,"chassis":5,"id":"pci.5","bus":"pci.4","addr":"0x0"}' \ -device '{"driver":"xio3130-downstream","port":1,"chassis":6,"id":"pci.6","bus":"pci.4","addr":"0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args index 64b7d5d7df..c14303213d 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -no-shutdown \ -boot strict=on \ -device '{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","numa_node":0,"bus":"pcie.0","addr":"0x4"}' \ --device '{"driver":"ioh3420","port":0,"chassis":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-root-port","port":0,"chassis":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.2","addr":"0x0"}' \ -device '{"driver":"xio3130-downstream","port":0,"chassis":4,"id":"pci.4","bus":"pci.3","addr":"0x0"}' \ -device '{"driver":"xio3130-downstream","port":1,"chassis":5,"id":"pci.5","bus":"pci.3","addr":"0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index 271bfab93c..430bedd7d8 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device '{"driver":"ioh3420","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"ioh3420","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args index cee54df33c..a48d65b8eb 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"ioh3420","port":26,"chassis":40,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args index 3a346a1697..4e39017179 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","addr":"0x2"}' \ -device '{"driver":"x3130-upstream","id":"pci.2","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"xio3130-downstream","port":0,"chassis":3,"id":"pci.3","bus":"pci.2","addr":"0x0"}' \ -device '{"driver":"xio3130-downstream","port":1,"chassis":4,"id":"pci.4","bus":"pci.2","addr":"0x1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args index c4670c674e..4b2b99ba0a 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device '{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ --device '{"driver":"ioh3420","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ -device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.2","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args index 33171a4d87..484de9ad27 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -boot strict=on \ -device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ -device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ --device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"e1000e","netdev":"hostnet0","id":"net0","mac":"52:54:00:aa:bf:ef","bus":"pci.2","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d18962d614..7e1d132bf6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -863,6 +863,7 @@ mymain(void) QEMU_CAPS_NETDEV_JSON, \ QEMU_CAPS_SECCOMP_SANDBOX, \ QEMU_CAPS_PIIX3_USB_UHCI, \ + QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ __VA_ARGS__, \ QEMU_CAPS_LAST, \ ARG_END) @@ -874,6 +875,7 @@ mymain(void) QEMU_CAPS_NETDEV_JSON, \ QEMU_CAPS_SECCOMP_SANDBOX, \ QEMU_CAPS_PIIX3_USB_UHCI, \ + QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ QEMU_CAPS_LAST, \ ARG_END) -- 2.41.0

Assume the two features modern qemus have to bring the test data closer to the 'latest' real-caps versions. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +- tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-none.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +- tests/qemuxml2argvdata/cpu-numa-memshared.args | 2 +- tests/qemuxml2argvdata/cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.args | 2 +- tests/qemuxml2argvdata/cpu-phys-bits-emulate.args | 2 +- tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args | 2 +- .../numad-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args | 2 +- tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad.args | 2 +- tests/qemuxml2argvdata/pci-expander-bus.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +- tests/qemuxml2argvdata/smp.args | 2 +- tests/qemuxml2argvtest.c | 4 ++++ 28 files changed, 31 insertions(+), 27 deletions(-) diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args index 7f62c5c52e..f4b2fc51d6 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu host,host-cache-info=off,l3-cache=off \ +-cpu host,migratable=on,host-cache-info=off,l3-cache=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args index ccc04d0691..15ca76b6ab 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu host,l3-cache=on,host-cache-info=off \ +-cpu host,migratable=on,l3-cache=on,host-cache-info=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args index 31f9002006..90261c5e5a 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu host,host-cache-info=on,l3-cache=off \ +-cpu host,migratable=on,host-cache-info=on,l3-cache=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args index 71b3fedf8f..2f81053374 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu host \ +-cpu host,migratable=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args index 9cb0ca84c4..4201ea331c 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu host,kvmclock=off \ +-cpu host,migratable=on,kvmclock=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args index 8604ce1586..2eedf77cad 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu host,abm=on,ds=on,invtsc=off \ +-cpu host,migratable=on,abm=on,ds=on,invtsc=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args index 71b3fedf8f..2f81053374 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu host \ +-cpu host,migratable=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args index 938a3ef3e2..3b12934425 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-3,cpus=8-11,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args index 4d33efb8e6..0c9ec88b8b 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":true,"size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1","share":false,"size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args index 80fc7306f7..31a61f023e 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args index 80fc7306f7..31a61f023e 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args index 80fc7306f7..31a61f023e 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args index 921dc891e3..3bf7649161 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu host,phys-bits=42 \ +-cpu host,migratable=on,phys-bits=42 \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args index 12d5e59505..9dea8a3b1b 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu host,host-phys-bits=on \ +-cpu host,migratable=on,host-phys-bits=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args index 1f81bc2149..c11b4cd307 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 6,sockets=3,cores=2,threads=1 \ +-smp 6,sockets=3,dies=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args index b11f49db05..4639d34c56 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 6,sockets=1,cores=2,threads=3 \ +-smp 6,sockets=1,dies=1,cores=2,threads=3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args index 1f81bc2149..c11b4cd307 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 6,sockets=3,cores=2,threads=1 \ +-smp 6,sockets=3,dies=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index 5c53800af4..71817da309 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args index 5cc5608944..53f0fbc68f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index 261b3804be..d4238f3d9e 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ 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 261b3804be..d4238f3d9e 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 @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index a9e61c403f..9ddfb286b5 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index 261b3804be..d4238f3d9e 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args index 261b3804be..d4238f3d9e 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args index 8bf472d386..bf553a8e32 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args index c14303213d..674beca027 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args index 7a589e5a36..352b1d3d6e 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \ +-smp 1,maxcpus=2,sockets=2,dies=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7e1d132bf6..872a26c6dd 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -864,6 +864,8 @@ mymain(void) QEMU_CAPS_SECCOMP_SANDBOX, \ QEMU_CAPS_PIIX3_USB_UHCI, \ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ + QEMU_CAPS_CPU_MIGRATABLE, \ + QEMU_CAPS_SMP_DIES, \ __VA_ARGS__, \ QEMU_CAPS_LAST, \ ARG_END) @@ -876,6 +878,8 @@ mymain(void) QEMU_CAPS_SECCOMP_SANDBOX, \ QEMU_CAPS_PIIX3_USB_UHCI, \ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ + QEMU_CAPS_CPU_MIGRATABLE, \ + QEMU_CAPS_SMP_DIES, \ QEMU_CAPS_LAST, \ ARG_END) -- 2.41.0

Assume the two features modern qemus have to bring the test data closer to the 'latest' real-caps versions. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 ++ tests/qemuxml2argvdata/pcie-root-port-model-generic.args | 1 + tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args | 1 + tests/qemuxml2argvdata/pcie-root-port.args | 1 + tests/qemuxml2argvdata/pcie-root.args | 3 +++ tests/qemuxml2argvdata/pcie-switch-downstream-port.args | 1 + tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 2 ++ tests/qemuxml2argvdata/pcihole64-q35.args | 3 +++ tests/qemuxml2argvdata/q35.args | 7 +++---- tests/qemuxml2argvdata/usb1-usb2.args | 4 ++-- tests/qemuxml2argvtest.c | 4 ++++ 12 files changed, 24 insertions(+), 7 deletions(-) diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args index 8f676e58fe..884e651b8e 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -49,7 +49,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr/.config \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"intel-hda","id":"sound0","bus":"pci.0","addr":"0x4"}' \ -device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad":0,"audiodev":"audio1"}' \ --device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","bus":"usb.0","port":"2"}' \ +-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bus":"usb.0","port":"2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args index 674beca027..3fb86c29c2 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -64,6 +64,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -device '{"driver":"xio3130-downstream","port":29,"chassis":33,"id":"pci.33","bus":"pci.3","addr":"0x1d"}' \ -device '{"driver":"xio3130-downstream","port":30,"chassis":34,"id":"pci.34","bus":"pci.3","addr":"0x1e"}' \ -device '{"driver":"xio3130-downstream","port":31,"chassis":35,"id":"pci.35","bus":"pci.3","addr":"0x1f"}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":36,"id":"pci.36","bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.36","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args index 86307c9bd8..dac9c0fd24 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args @@ -29,6 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ -device '{"driver":"ioh3420","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index 430bedd7d8..e44f95a165 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -28,6 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -boot strict=on \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"ioh3420","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args index a48d65b8eb..27d3daff5b 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -28,6 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -boot strict=on \ -device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"ioh3420","port":26,"chassis":40,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.args index 656cd80665..24bdf4b998 100644 --- a/tests/qemuxml2argvdata/pcie-root.args +++ b/tests/qemuxml2argvdata/pcie-root.args @@ -26,6 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args index 4e39017179..f5bc558d5b 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -36,6 +36,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"xio3130-downstream","port":4,"chassis":8,"id":"pci.8","bus":"pci.2","addr":"0x4"}' \ -device '{"driver":"xio3130-downstream","port":5,"chassis":9,"id":"pci.9","bus":"pci.2","addr":"0x5"}' \ -device '{"driver":"xio3130-downstream","port":6,"chassis":10,"id":"pci.10","bus":"pci.2","addr":"0x6"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.4","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args index 4b2b99ba0a..ed9e9b2ca0 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -30,6 +30,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ -device '{"driver":"x3130-upstream","id":"pci.3","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"pcie-root-port","port":18,"chassis":5,"id":"pci.5","bus":"pcie.0","addr":"0x2.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.5","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args index 624cfc9264..91b70559f9 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -27,6 +27,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -no-shutdown \ -boot strict=on \ -global q35-pcihost.pci-hole64-size=1048576K \ +-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args index bd37012eb0..a8d711a42b 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -28,10 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -global ICH9-LPC.disable_s3=1 \ -global ICH9-LPC.disable_s4=0 \ -boot strict=on \ --device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}' \ --device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}' \ --device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}' \ --device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}' \ +-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args index cf84b7279e..e112a90ad3 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -38,8 +38,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb1.0","port":"1"}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","bus":"usb2.0","port":"1"}' \ --device '{"driver":"usb-host","hostbus":14,"hostaddr":7,"id":"hostdev1","bus":"usb2.0","port":"2"}' \ +-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bus":"usb2.0","port":"1"}' \ +-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/007","id":"hostdev1","bus":"usb2.0","port":"2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 872a26c6dd..1774a50f3f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -866,6 +866,8 @@ mymain(void) QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ QEMU_CAPS_CPU_MIGRATABLE, \ QEMU_CAPS_SMP_DIES, \ + QEMU_CAPS_USB_HOST_HOSTDEVICE, \ + QEMU_CAPS_DEVICE_QEMU_XHCI, \ __VA_ARGS__, \ QEMU_CAPS_LAST, \ ARG_END) @@ -880,6 +882,8 @@ mymain(void) QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ QEMU_CAPS_CPU_MIGRATABLE, \ QEMU_CAPS_SMP_DIES, \ + QEMU_CAPS_USB_HOST_HOSTDEVICE, \ + QEMU_CAPS_DEVICE_QEMU_XHCI, \ QEMU_CAPS_LAST, \ ARG_END) -- 2.41.0

Assume the features modern qemus have to bring the test data closer to the 'latest' real-caps versions. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- tests/qemuxml2argvdata/pcie-switch-downstream-port.args | 2 +- tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvtest.c | 6 ++++++ 10 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args index fe4a5efb05..255c72aca7 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -32,6 +32,6 @@ DISPLAY=:0.1 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -display sdl \ --device '{"driver":"VGA","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args index 27d3daff5b..a7b855f935 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args index f5bc558d5b..6483c26322 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -41,7 +41,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args index ed9e9b2ca0..8ea8d6fc55 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args index 91b70559f9..5351a68091 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args index f5d39447dc..8ec54eafc2 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -44,7 +44,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args index 6641391bae..feb109d939 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -44,7 +44,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args index a5a6aa300b..83eb7d7b4e 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args index a8d711a42b..e6a915420c 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1774a50f3f..03c426e34e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -868,6 +868,9 @@ mymain(void) QEMU_CAPS_SMP_DIES, \ QEMU_CAPS_USB_HOST_HOSTDEVICE, \ QEMU_CAPS_DEVICE_QEMU_XHCI, \ + QEMU_CAPS_QXL_VRAM64,\ + QEMU_CAPS_QXL_VGAMEM, \ + QEMU_CAPS_VGA_VGAMEM, \ __VA_ARGS__, \ QEMU_CAPS_LAST, \ ARG_END) @@ -884,6 +887,9 @@ mymain(void) QEMU_CAPS_SMP_DIES, \ QEMU_CAPS_USB_HOST_HOSTDEVICE, \ QEMU_CAPS_DEVICE_QEMU_XHCI, \ + QEMU_CAPS_QXL_VRAM64,\ + QEMU_CAPS_QXL_VGAMEM, \ + QEMU_CAPS_VGA_VGAMEM, \ QEMU_CAPS_LAST, \ ARG_END) -- 2.41.0

Since qemu-8.0 a new way to disable 'hpet' via -machine was added. Properly test both branches with real capabilities. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../clock-hpet-off.x86_64-7.2.0.args | 39 +++++++++++++++++++ ...args => clock-hpet-off.x86_64-latest.args} | 4 +- tests/qemuxml2argvtest.c | 3 +- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args rename tests/qemuxml2argvdata/{clock-hpet-off.args => clock-hpet-off.x86_64-latest.args} (93%) diff --git a/tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args b/tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args new file mode 100644 index 0000000000..47bff8d51c --- /dev/null +++ b/tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc,driftfix=slew \ +-global kvm-pit.lost_tick_policy=delay \ +-no-hpet \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args similarity index 93% rename from tests/qemuxml2argvdata/clock-hpet-off.args rename to tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args index f0869f45b7..bbaae52aff 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,hpet=off,acpi=off \ -accel tcg \ -cpu qemu64 \ -m size=219136k \ @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc,driftfix=slew \ --no-hpet \ +-global kvm-pit.lost_tick_policy=delay \ -no-shutdown \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 03c426e34e..bfb116e45d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1107,7 +1107,8 @@ mymain(void) DO_TEST_NOCAPS("clock-localtime-basis-localtime"); DO_TEST_NOCAPS("clock-variable"); DO_TEST_NOCAPS("clock-france"); - DO_TEST_NOCAPS("clock-hpet-off"); + DO_TEST_CAPS_VER("clock-hpet-off", "7.2.0"); + DO_TEST_CAPS_LATEST("clock-hpet-off"); DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY); DO_TEST_NOCAPS("cpu-kvmclock"); DO_TEST_NOCAPS("cpu-host-kvmclock"); -- 2.41.0

As these were using DO_TEST_FULL the churn-reducing patches didn't influence these. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...migrate-numa-unaligned.x86_64-latest.args} | 13 +++---- ...igrate.args => migrate.x86_64-latest.args} | 9 ++--- ....args => restore-v2-fd.x86_64-latest.args} | 11 +++--- ...-v2.args => restore-v2.x86_64-latest.args} | 9 ++--- tests/qemuxml2argvtest.c | 34 ++++++++----------- 5 files changed, 37 insertions(+), 39 deletions(-) rename tests/qemuxml2argvdata/{migrate-numa-unaligned.args => migrate-numa-unaligned.x86_64-latest.args} (58%) rename tests/qemuxml2argvdata/{migrate.args => migrate.x86_64-latest.args} (70%) rename tests/qemuxml2argvdata/{restore-v2-fd.args => restore-v2-fd.x86_64-latest.args} (66%) rename tests/qemuxml2argvdata/{restore-v2.args => restore-v2.x86_64-latest.args} (70%) diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qemuxml2argvdata/migrate-numa-unaligned.x86_64-latest.args similarity index 58% rename from tests/qemuxml2argvdata/migrate-numa-unaligned.args rename to tests/qemuxml2argvdata/migrate-numa-unaligned.x86_64-latest.args index 76e1dfedde..434753d96d 100644 --- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args +++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.x86_64-latest.args @@ -9,18 +9,18 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ -cpu qemu64 \ -m size=14682112k \ -overcommit mem-lock=off \ -smp 32,sockets=32,cores=1,threads=1 \ --object memory-backend-ram,id=ram-node0,size=20482048,host-nodes=3,policy=preferred \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20482048,"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ --object memory-backend-ram,id=ram-node1,size=675907584,host-nodes=0-3,policy=bind \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":675907584,"host-nodes":[0,1,2,3],"policy":"bind"}' \ -numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \ --object memory-backend-ram,id=ram-node2,size=24578457600,host-nodes=0,host-nodes=2,policy=bind \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578457600,"host-nodes":[0,2],"policy":"bind"}' \ -numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ @@ -31,8 +31,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -incoming fd:7 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.x86_64-latest.args similarity index 70% rename from tests/qemuxml2argvdata/migrate.args rename to tests/qemuxml2argvdata/migrate.x86_64-latest.args index 55f528a7d9..7cbd26463a 100644 --- a/tests/qemuxml2argvdata/migrate.args +++ b/tests/qemuxml2argvdata/migrate.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ -cpu qemu64 \ -m size=219136k \ --object memory-backend-ram,id=pc.ram,size=224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -26,10 +26,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -incoming tcp:10.0.0.1:5000 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.x86_64-latest.args similarity index 66% rename from tests/qemuxml2argvdata/restore-v2-fd.args rename to tests/qemuxml2argvdata/restore-v2-fd.x86_64-latest.args index 060a6cfafb..e5e2b50b75 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.args +++ b/tests/qemuxml2argvdata/restore-v2-fd.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ -cpu qemu64 \ -m size=219136k \ --object memory-backend-ram,id=pc.ram,size=224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -26,11 +26,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -incoming fd:7 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.x86_64-latest.args similarity index 70% rename from tests/qemuxml2argvdata/restore-v2.args rename to tests/qemuxml2argvdata/restore-v2.x86_64-latest.args index 2acb08e1e3..d130a94157 100644 --- a/tests/qemuxml2argvdata/restore-v2.args +++ b/tests/qemuxml2argvdata/restore-v2.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ -cpu qemu64 \ -m size=219136k \ --object memory-backend-ram,id=pc.ram,size=224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -26,10 +26,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -incoming exec:cat \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index bfb116e45d..ec06a734a1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1704,26 +1704,20 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ap", "s390x"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ap-boot-fail", "s390x"); - DO_TEST_FULL("restore-v2", "", - ARG_MIGRATE_FROM, "exec:cat", - ARG_MIGRATE_FD, 7, - ARG_END); - DO_TEST_FULL("restore-v2-fd", "", - ARG_MIGRATE_FROM, "stdio", - ARG_MIGRATE_FD, 7, - ARG_END); - DO_TEST_FULL("restore-v2-fd", "", - ARG_MIGRATE_FROM, "fd:7", - ARG_MIGRATE_FD, 7, ARG_END); - DO_TEST_FULL("migrate", "", - ARG_MIGRATE_FROM, "tcp:10.0.0.1:5000", ARG_END); - - DO_TEST_FULL("migrate-numa-unaligned", "", - ARG_MIGRATE_FROM, "stdio", - ARG_MIGRATE_FD, 7, - ARG_QEMU_CAPS, - QEMU_CAPS_LAST, - ARG_END); + DO_TEST_CAPS_ARCH_LATEST_FULL("restore-v2", "x86_64", + ARG_MIGRATE_FROM, "exec:cat", + ARG_MIGRATE_FD, 7); + DO_TEST_CAPS_ARCH_LATEST_FULL("restore-v2-fd", "x86_64", + ARG_MIGRATE_FROM, "stdio", + ARG_MIGRATE_FD, 7); + DO_TEST_CAPS_ARCH_LATEST_FULL("restore-v2-fd", "x86_64", + ARG_MIGRATE_FROM, "fd:7", + ARG_MIGRATE_FD, 7); + DO_TEST_CAPS_ARCH_LATEST_FULL("migrate", "x86_64", + ARG_MIGRATE_FROM, "tcp:10.0.0.1:5000"); + DO_TEST_CAPS_ARCH_LATEST_FULL("migrate-numa-unaligned", "x86_64", + ARG_MIGRATE_FROM, "stdio", + ARG_MIGRATE_FD, 7); DO_TEST_CAPS_LATEST("qemu-ns"); DO_TEST_NOCAPS("qemu-ns-no-env"); -- 2.41.0

Move the 'smp-dies' test case into 'cpu-topology4' and remove unnecessary cruft. Remove cpu definition from 'cpu-topology2' as it's not relevant to the test case. Remove 'smp' case as it's covered by the rest. Use real capabilities for all of them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ....args => cpu-topology1.x86_64-latest.args} | 2 +- tests/qemuxml2argvdata/cpu-topology1.xml | 4 +- ....args => cpu-topology2.x86_64-latest.args} | 2 +- tests/qemuxml2argvdata/cpu-topology2.xml | 5 +-- ....args => cpu-topology3.x86_64-latest.args} | 0 tests/qemuxml2argvdata/cpu-topology3.xml | 2 +- ....args => cpu-topology4.x86_64-latest.args} | 6 +-- tests/qemuxml2argvdata/cpu-topology4.xml | 21 ++++++++++ tests/qemuxml2argvdata/smp-dies.xml | 33 ---------------- tests/qemuxml2argvdata/smp.args | 35 ----------------- tests/qemuxml2argvdata/smp.xml | 33 ---------------- tests/qemuxml2argvtest.c | 11 +++--- .../qemuxml2xmloutdata/smp.x86_64-latest.xml | 39 ------------------- tests/qemuxml2xmltest.c | 1 - 14 files changed, 35 insertions(+), 159 deletions(-) rename tests/qemuxml2argvdata/{cpu-topology3.args => cpu-topology1.x86_64-latest.args} (96%) rename tests/qemuxml2argvdata/{cpu-topology2.args => cpu-topology2.x86_64-latest.args} (98%) rename tests/qemuxml2argvdata/{cpu-topology1.args => cpu-topology3.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{smp-dies.args => cpu-topology4.x86_64-latest.args} (74%) create mode 100644 tests/qemuxml2argvdata/cpu-topology4.xml delete mode 100644 tests/qemuxml2argvdata/smp-dies.xml delete mode 100644 tests/qemuxml2argvdata/smp.args delete mode 100644 tests/qemuxml2argvdata/smp.xml delete mode 100644 tests/qemuxml2xmloutdata/smp.x86_64-latest.xml diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args similarity index 96% rename from tests/qemuxml2argvdata/cpu-topology3.args rename to tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args index c11b4cd307..009c08d71a 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 6,sockets=3,dies=1,cores=2,threads=1 \ +-smp 1,maxcpus=6,sockets=3,dies=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.xml b/tests/qemuxml2argvdata/cpu-topology1.xml index af82a1c51a..5cf49987e1 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.xml +++ b/tests/qemuxml2argvdata/cpu-topology1.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>6</vcpu> + <vcpu placement='static' current='1'>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> @@ -16,6 +16,6 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> </devices> </domain> diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args similarity index 98% rename from tests/qemuxml2argvdata/cpu-topology2.args rename to tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args index 4639d34c56..7ba175fa80 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ --cpu core2duo \ +-cpu qemu64 \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-topology2.xml b/tests/qemuxml2argvdata/cpu-topology2.xml index 1b113b8b13..dd125ec4e2 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.xml +++ b/tests/qemuxml2argvdata/cpu-topology2.xml @@ -8,8 +8,7 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> - <cpu match='exact'> - <model>core2duo</model> + <cpu> <topology sockets="1" dies="1" cores="2" threads="3"/> </cpu> <clock offset='utc'/> @@ -17,6 +16,6 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> </devices> </domain> diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology1.args rename to tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-topology3.xml b/tests/qemuxml2argvdata/cpu-topology3.xml index af82a1c51a..f8175fcd81 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.xml +++ b/tests/qemuxml2argvdata/cpu-topology3.xml @@ -16,6 +16,6 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> </devices> </domain> diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args similarity index 74% rename from tests/qemuxml2argvdata/smp-dies.args rename to tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args index a4d5fc3372..d0e31ba2b5 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 1,maxcpus=4,sockets=2,dies=2,cores=1,threads=1 \ +-smp 1,maxcpus=6,sockets=1,dies=3,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -27,9 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-topology4.xml b/tests/qemuxml2argvdata/cpu-topology4.xml new file mode 100644 index 0000000000..a60b5865fa --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-topology4.xml @@ -0,0 +1,21 @@ +<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' current='1'>6</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu> + <topology sockets='1' dies='3' cores='2' threads='1'/> + </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> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/smp-dies.xml b/tests/qemuxml2argvdata/smp-dies.xml deleted file mode 100644 index a29786c0c4..0000000000 --- a/tests/qemuxml2argvdata/smp-dies.xml +++ /dev/null @@ -1,33 +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' current='1'>4</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu> - <topology sockets='2' dies='2' cores='1' threads='1'/> - </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> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args deleted file mode 100644 index 352b1d3d6e..0000000000 --- a/tests/qemuxml2argvdata/smp.args +++ /dev/null @@ -1,35 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ --accel tcg \ --cpu qemu64 \ --m size=219136k \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ --overcommit mem-lock=off \ --smp 1,maxcpus=2,sockets=2,dies=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot strict=on \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/smp.xml b/tests/qemuxml2argvdata/smp.xml deleted file mode 100644 index 274aa37f1a..0000000000 --- a/tests/qemuxml2argvdata/smp.xml +++ /dev/null @@ -1,33 +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' current='1'>2</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu> - <topology sockets='2' dies='1' cores='1' threads='1'/> - </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> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ec06a734a1..d218b17d57 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1723,9 +1723,6 @@ mymain(void) DO_TEST_NOCAPS("qemu-ns-no-env"); DO_TEST_NOCAPS("qemu-ns-alt"); - DO_TEST_NOCAPS("smp"); - DO_TEST("smp-dies", QEMU_CAPS_SMP_DIES); - DO_TEST_CAPS_LATEST("iothreads-ids"); DO_TEST_CAPS_LATEST("iothreads-ids-partial"); DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes"); @@ -1735,9 +1732,11 @@ mymain(void) DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci"); DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x"); - DO_TEST_NOCAPS("cpu-topology1"); - DO_TEST_NOCAPS("cpu-topology2"); - DO_TEST_NOCAPS("cpu-topology3"); + DO_TEST_CAPS_LATEST("cpu-topology1"); + DO_TEST_CAPS_LATEST("cpu-topology2"); + DO_TEST_CAPS_LATEST("cpu-topology3"); + DO_TEST_CAPS_LATEST("cpu-topology4"); + DO_TEST("cpu-minimum1", QEMU_CAPS_KVM); DO_TEST("cpu-minimum2", QEMU_CAPS_KVM); DO_TEST("cpu-exact1", QEMU_CAPS_KVM); diff --git a/tests/qemuxml2xmloutdata/smp.x86_64-latest.xml b/tests/qemuxml2xmloutdata/smp.x86_64-latest.xml deleted file mode 100644 index a7f324afba..0000000000 --- a/tests/qemuxml2xmloutdata/smp.x86_64-latest.xml +++ /dev/null @@ -1,39 +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' current='1'>2</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> - </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> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </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'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3b8eab6346..72f976358f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -466,7 +466,6 @@ mymain(void) DO_TEST_CAPS_LATEST("cputune-cpuset-big-id"); DO_TEST_CAPS_LATEST("numavcpus-topology-mismatch"); - DO_TEST_CAPS_LATEST("smp"); DO_TEST_CAPS_LATEST("iothreads-ids"); DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes"); DO_TEST_CAPS_LATEST("iothreads-ids-partial"); -- 2.41.0

Modernize test cases using 'host-mode' cpu type, where the actual CPU doesn't isn't important. As using the host cpu from the 'latest' capabilities data would cause test churn in case the host cpu changes in the future, convert them using the overriden Haswell cpu. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...e3.args => cpu-cache-disable3.x86_64-latest.args} | 2 +- ... => cpu-check-default-partial.x86_64-latest.args} | 2 +- ...args => cpu-host-model-vendor.x86_64-latest.args} | 2 +- ...rgs => cpu-phys-bits-emulate2.x86_64-latest.args} | 2 +- tests/qemuxml2argvtest.c | 12 ++++++++---- 5 files changed, 12 insertions(+), 8 deletions(-) rename tests/qemuxml2argvdata/{cpu-cache-disable3.args => cpu-cache-disable3.x86_64-latest.args} (86%) rename tests/qemuxml2argvdata/{cpu-check-default-partial.args => cpu-check-default-partial.x86_64-latest.args} (87%) rename tests/qemuxml2argvdata/{cpu-host-model-vendor.args => cpu-host-model-vendor.x86_64-latest.args} (86%) rename tests/qemuxml2argvdata/{cpu-phys-bits-emulate2.args => cpu-phys-bits-emulate2.x86_64-latest.args} (86%) diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.x86_64-latest.args similarity index 86% rename from tests/qemuxml2argvdata/cpu-cache-disable3.args rename to tests/qemuxml2argvdata/cpu-cache-disable3.x86_64-latest.args index 70fbf70e57..4adf20b55a 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,l3-cache=off \ +-cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,l3-cache=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.x86_64-latest.args similarity index 87% rename from tests/qemuxml2argvdata/cpu-check-default-partial.args rename to tests/qemuxml2argvdata/cpu-check-default-partial.x86_64-latest.args index e6454e5870..a92da44bd8 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ +-cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.x86_64-latest.args similarity index 86% rename from tests/qemuxml2argvdata/cpu-host-model-vendor.args rename to tests/qemuxml2argvdata/cpu-host-model-vendor.x86_64-latest.args index 72c108ab88..c258a1ab36 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ --cpu 'core2duo,vendor=Libvirt QEMU,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on' \ +-cpu 'Haswell,vendor=Libvirt QEMU,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on' \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.x86_64-latest.args similarity index 86% rename from tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args rename to tests/qemuxml2argvdata/cpu-phys-bits-emulate2.x86_64-latest.args index 11c60a4d8a..92c719b553 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,phys-bits=42 \ +-cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,phys-bits=42 \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d218b17d57..050d38c3fc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1797,7 +1797,8 @@ mymain(void) DO_TEST_CAPS_LATEST("cpu-host-model-fallback"); DO_TEST_CAPS_LATEST("cpu-host-model-nofallback"); - DO_TEST_NOCAPS("cpu-host-model-vendor"); + /* this test case uses 'cpu="host-model"', run it with Haswell host cpu to prevent test case churn */ + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-host-model-vendor", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); @@ -2471,11 +2472,13 @@ mymain(void) DO_TEST("cpu-check-full", QEMU_CAPS_KVM); DO_TEST("cpu-check-default-none", QEMU_CAPS_KVM); DO_TEST_NOCAPS("cpu-check-default-none2"); - DO_TEST("cpu-check-default-partial", QEMU_CAPS_KVM); + /* this test case uses 'cpu="host-model"', run it with Haswell host cpu to prevent test case churn */ + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-check-default-partial", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST("cpu-check-default-partial2", QEMU_CAPS_KVM); DO_TEST("cpu-cache-disable", QEMU_CAPS_KVM); - DO_TEST("cpu-cache-disable3", QEMU_CAPS_KVM); + /* this test case uses 'cpu="host-model"', run it with Haswell host cpu to prevent test case churn */ + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-cache-disable3", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM); DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", QEMU_CAPS_KVM); @@ -2576,7 +2579,8 @@ mymain(void) DO_TEST("cpu-phys-bits-passthrough", QEMU_CAPS_KVM); DO_TEST("cpu-phys-bits-emulate", QEMU_CAPS_KVM); - DO_TEST("cpu-phys-bits-emulate2", QEMU_CAPS_KVM); + /* this test case uses 'cpu="host"', run it with Haswell host cpu to prevent test case churn */ + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-phys-bits-emulate2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST_PARSE_ERROR("cpu-phys-bits-passthrough2", QEMU_CAPS_KVM); DO_TEST_CAPS_LATEST("cpu-phys-bits-limit"); DO_TEST_CAPS_LATEST("cpu-phys-bits-emulate-bare"); -- 2.41.0

Modernize all test cases which set 'Haswell' as the host cpu model. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...X.args => cpu-Haswell-noTSX.x86_64-latest.args} | 0 ...Haswell.args => cpu-Haswell.x86_64-latest.args} | 0 ...swell2.args => cpu-Haswell2.x86_64-latest.args} | 0 ...swell3.args => cpu-Haswell3.x86_64-latest.args} | 0 ....args => cpu-host-model-cmt.x86_64-latest.args} | 0 ...y.args => cpu-tsc-frequency.x86_64-latest.args} | 0 tests/qemuxml2argvtest.c | 14 ++++++-------- 7 files changed, 6 insertions(+), 8 deletions(-) rename tests/qemuxml2argvdata/{cpu-Haswell-noTSX.args => cpu-Haswell-noTSX.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-Haswell.args => cpu-Haswell.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-Haswell2.args => cpu-Haswell2.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-Haswell3.args => cpu-Haswell3.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-cmt.args => cpu-host-model-cmt.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-tsc-frequency.args => cpu-tsc-frequency.x86_64-latest.args} (100%) diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell-noTSX.args rename to tests/qemuxml2argvdata/cpu-Haswell-noTSX.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell.args rename to tests/qemuxml2argvdata/cpu-Haswell.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell2.args rename to tests/qemuxml2argvdata/cpu-Haswell2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell3.args rename to tests/qemuxml2argvdata/cpu-Haswell3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-cmt.args rename to tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-tsc-frequency.args rename to tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-latest.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 050d38c3fc..a3e137e1c1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1805,14 +1805,12 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("cpu-s390-zEC12", "s390x"); DO_TEST_CAPS_ARCH_LATEST("cpu-s390-features", "s390x"); - qemuTestSetHostCPU(&driver, driver.hostarch, qemuTestGetCPUDef(QEMU_CPU_DEF_HASWELL)); - DO_TEST("cpu-Haswell", QEMU_CAPS_KVM); - DO_TEST("cpu-Haswell2", QEMU_CAPS_KVM); - DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM); - DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM); - DO_TEST_NOCAPS("cpu-host-model-cmt"); - DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM); - qemuTestSetHostCPU(&driver, driver.hostarch, NULL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell3", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell-noTSX", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-host-model-cmt", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-tsc-frequency", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST_CAPS_LATEST("cpu-translation"); -- 2.41.0

Use real capabilities, but select the fake 'Haswell' host CPU for test stability. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../{cpu-minimum1.args => cpu-minimum1.x86_64-latest.args} | 2 +- .../{cpu-minimum2.args => cpu-minimum2.x86_64-latest.args} | 2 +- tests/qemuxml2argvtest.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename tests/qemuxml2argvdata/{cpu-minimum1.args => cpu-minimum1.x86_64-latest.args} (87%) rename tests/qemuxml2argvdata/{cpu-minimum2.args => cpu-minimum2.x86_64-latest.args} (86%) diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args similarity index 87% rename from tests/qemuxml2argvdata/cpu-minimum1.args rename to tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args index e6454e5870..a92da44bd8 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ +-cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args similarity index 86% rename from tests/qemuxml2argvdata/cpu-minimum2.args rename to tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args index 6e87b6be88..62e0101568 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,syscall=off,nx=off,lm=off,svm=off \ +-cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,syscall=off,nx=off,lm=off,svm=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a3e137e1c1..7fc564d3ef 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1737,8 +1737,8 @@ mymain(void) DO_TEST_CAPS_LATEST("cpu-topology3"); DO_TEST_CAPS_LATEST("cpu-topology4"); - DO_TEST("cpu-minimum1", QEMU_CAPS_KVM); - DO_TEST("cpu-minimum2", QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST("cpu-exact1", QEMU_CAPS_KVM); DO_TEST("cpu-exact2", QEMU_CAPS_KVM); DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM); -- 2.41.0

Use the fake Haswell processor definition and augment the list of features to make the test pass. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...u-strict1.args => cpu-strict1.x86_64-latest.args} | 2 +- tests/qemuxml2argvdata/cpu-strict1.xml | 12 +++++++++++- tests/qemuxml2argvtest.c | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) rename tests/qemuxml2argvdata/{cpu-strict1.args => cpu-strict1.x86_64-latest.args} (84%) diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args similarity index 84% rename from tests/qemuxml2argvdata/cpu-strict1.args rename to tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args index 7e33e9dd62..3f9c3516bb 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu core2duo,ds=on,acpi=on,ht=on,tm=on,ds-cpl=on,vmx=on,est=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off \ +-cpu Haswell,ds=on,acpi=on,ht=on,tm=on,ds-cpl=on,vmx=on,est=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off,vme=off,invtsc=off,abm=off,pdpe1gb=off,rdrand=off,f16c=off,pdcm=off,smx=off,monitor=off,dtes64=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-strict1.xml b/tests/qemuxml2argvdata/cpu-strict1.xml index f17c75b6af..63db54ecad 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.xml +++ b/tests/qemuxml2argvdata/cpu-strict1.xml @@ -9,7 +9,7 @@ <boot dev='network'/> </os> <cpu match='strict'> - <model>core2duo</model> + <model>Haswell</model> <feature name='ds' policy='require'/> <feature name='acpi' policy='optional'/> <feature name='ht' policy='require'/> @@ -27,6 +27,16 @@ <feature name='ss' policy='disable'/> <feature name='sse4a' policy='optional'/> <feature name='wdt' policy='forbid'/> + <feature name='vme' policy='disable'/> + <feature name='invtsc' policy='disable'/> + <feature name='abm' policy='disable'/> + <feature name='pdpe1gb' policy='disable'/> + <feature name='rdrand' policy='disable'/> + <feature name='f16c' policy='disable'/> + <feature name='pdcm' policy='disable'/> + <feature name='smx' policy='disable'/> + <feature name='monitor' policy='disable'/> + <feature name='dtes64' policy='disable'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7fc564d3ef..e2af688529 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1744,7 +1744,7 @@ mymain(void) DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM); DO_TEST("cpu-fallback", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-nofallback", QEMU_CAPS_KVM); - DO_TEST("cpu-strict1", QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-strict1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST("cpu-no-removed-features", QEMU_CAPS_KVM); DO_TEST_NOCAPS("cpu-numa1"); DO_TEST_NOCAPS("cpu-numa2"); -- 2.41.0

Previously without modern capabilities the test was relying on a CPU model which was not entered into a fake list of supported cpus. With real capabilities we have to pick a CPU model which is supported by libvirt but in some version is not supported by qemu. I've picked EPYC-Milan, which was introduced into qemu-6.0. This test configures a CPU which is equivalent to EPYC-Rome by disabling features from EPYC-Milan and uses a versioned real caps test to check it against a qemu which doesn't support EPYC-Milan. With real capabilities though, we can also do a positive test case by using a version whic doesh support it. I've specifically not used the LATEST caps so that it doesn't change once capabilities are bumped. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../cpu-fallback.x86_64-5.2.0.args | 34 +++++++++++++++++++ ...ck.args => cpu-fallback.x86_64-8.0.0.args} | 4 +-- tests/qemuxml2argvdata/cpu-fallback.xml | 15 +++++--- tests/qemuxml2argvdata/cpu-nofallback.err | 1 - .../cpu-nofallback.x86_64-5.2.0.err | 1 + .../cpu-nofallback.x86_64-8.0.0.args | 33 ++++++++++++++++++ tests/qemuxml2argvdata/cpu-nofallback.xml | 15 +++++--- tests/qemuxml2argvtest.c | 9 +++-- 8 files changed, 97 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args rename tests/qemuxml2argvdata/{cpu-fallback.args => cpu-fallback.x86_64-8.0.0.args} (86%) delete mode 100644 tests/qemuxml2argvdata/cpu-nofallback.err create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args b/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args new file mode 100644 index 0000000000..ecc6bb3977 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ +-cpu EPYC-Rome,amd-ssbd=off,erms=off,fsrm=off,invpcid=off,pcid=off,pku=off,xsaves=off \ +-m size=219136k \ +-object memory-backend-ram,id=pc.ram,size=224395264 \ +-overcommit mem-lock=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,fd=1729,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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args similarity index 86% rename from tests/qemuxml2argvdata/cpu-fallback.args rename to tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args index 995c006347..b0ce1dfcbd 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args @@ -10,9 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu Conroe,cx16=on,sse4.1=off,sse4.2=off,popcnt=off,aes=off \ +-cpu EPYC-Milan,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=off,xsaves=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-fallback.xml b/tests/qemuxml2argvdata/cpu-fallback.xml index f1a843b7e0..d5674f6d17 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.xml +++ b/tests/qemuxml2argvdata/cpu-fallback.xml @@ -9,11 +9,16 @@ <boot dev='network'/> </os> <cpu match='exact'> - <model>Westmere</model> - <feature policy='disable' name='sse4.1'/> - <feature policy='disable' name='sse4.2'/> - <feature policy='disable' name='popcnt'/> - <feature policy='disable' name='aes'/> + <model>EPYC-Milan</model> + <feature policy='disable' name='amd-ssbd'/> + <feature policy='disable' name='erms'/> + <feature policy='disable' name='fsrm'/> + <feature policy='disable' name='ibrs'/> + <feature policy='disable' name='invpcid'/> + <feature policy='disable' name='pcid'/> + <feature policy='disable' name='pku'/> + <feature policy='disable' name='svme-addr-chk'/> + <feature policy='disable' name='xsaves'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvdata/cpu-nofallback.err b/tests/qemuxml2argvdata/cpu-nofallback.err deleted file mode 100644 index e5ba7473f2..0000000000 --- a/tests/qemuxml2argvdata/cpu-nofallback.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: CPU model Westmere is not supported by hypervisor diff --git a/tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err b/tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err new file mode 100644 index 0000000000..acea093d76 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err @@ -0,0 +1 @@ +unsupported configuration: CPU model EPYC-Milan is not supported by hypervisor diff --git a/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args b/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args new file mode 100644 index 0000000000..b0ce1dfcbd --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel kvm \ +-cpu EPYC-Milan,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=off,xsaves=off \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-nofallback.xml b/tests/qemuxml2argvdata/cpu-nofallback.xml index 8163c4c369..ce1414559f 100644 --- a/tests/qemuxml2argvdata/cpu-nofallback.xml +++ b/tests/qemuxml2argvdata/cpu-nofallback.xml @@ -9,11 +9,16 @@ <boot dev='network'/> </os> <cpu match='exact'> - <model fallback='forbid'>Westmere</model> - <feature policy='disable' name='sse4.1'/> - <feature policy='disable' name='sse4.2'/> - <feature policy='disable' name='popcnt'/> - <feature policy='disable' name='aes'/> + <model fallback='forbid'>EPYC-Milan</model> + <feature policy='disable' name='amd-ssbd'/> + <feature policy='disable' name='erms'/> + <feature policy='disable' name='fsrm'/> + <feature policy='disable' name='ibrs'/> + <feature policy='disable' name='invpcid'/> + <feature policy='disable' name='pcid'/> + <feature policy='disable' name='pku'/> + <feature policy='disable' name='svme-addr-chk'/> + <feature policy='disable' name='xsaves'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e2af688529..6997d7400c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1742,10 +1742,15 @@ mymain(void) DO_TEST("cpu-exact1", QEMU_CAPS_KVM); DO_TEST("cpu-exact2", QEMU_CAPS_KVM); DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM); - DO_TEST("cpu-fallback", QEMU_CAPS_KVM); - DO_TEST_FAILURE("cpu-nofallback", QEMU_CAPS_KVM); DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-strict1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST("cpu-no-removed-features", QEMU_CAPS_KVM); + + /* EPYC-Milan became available in qemu-6.0, use it for the fallback tests */ + DO_TEST_CAPS_VER_FAILURE("cpu-nofallback", "5.2.0"); + DO_TEST_CAPS_VER("cpu-nofallback", "8.0.0"); + DO_TEST_CAPS_VER("cpu-fallback", "5.2.0"); + DO_TEST_CAPS_VER("cpu-fallback", "8.0.0"); + DO_TEST_NOCAPS("cpu-numa1"); DO_TEST_NOCAPS("cpu-numa2"); DO_TEST_NOCAPS("cpu-numa-no-memory-element"); -- 2.41.0

Use real capabilities, but select the fake 'Haswell' host CPU for test stability. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../{cpu-exact1.args => cpu-exact1.x86_64-latest.args} | 0 ...back.args => cpu-exact2-nofallback.x86_64-latest.args} | 0 .../{cpu-exact2.args => cpu-exact2.x86_64-latest.args} | 0 ...es.args => cpu-no-removed-features.x86_64-latest.args} | 0 tests/qemuxml2argvtest.c | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename tests/qemuxml2argvdata/{cpu-exact1.args => cpu-exact1.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-exact2-nofallback.args => cpu-exact2-nofallback.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-exact2.args => cpu-exact2.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-no-removed-features.args => cpu-no-removed-features.x86_64-latest.args} (100%) diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact1.args rename to tests/qemuxml2argvdata/cpu-exact1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact2-nofallback.args rename to tests/qemuxml2argvdata/cpu-exact2-nofallback.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact2.args rename to tests/qemuxml2argvdata/cpu-exact2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-no-removed-features.args rename to tests/qemuxml2argvdata/cpu-no-removed-features.x86_64-latest.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6997d7400c..cea936518e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1739,11 +1739,11 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); - DO_TEST("cpu-exact1", QEMU_CAPS_KVM); - DO_TEST("cpu-exact2", QEMU_CAPS_KVM); - DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact2-nofallback", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-strict1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); - DO_TEST("cpu-no-removed-features", QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-no-removed-features", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); /* EPYC-Milan became available in qemu-6.0, use it for the fallback tests */ DO_TEST_CAPS_VER_FAILURE("cpu-nofallback", "5.2.0"); -- 2.41.0

The rest of the test cases has no change in the output now that we've assumed some flags. Remove the fake-caps test macros after conversion. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...fx-ide-address-conflict.x86_64-latest.err} | 0 ...err => 440fx-wrong-root.x86_64-latest.err} | 0 ...ble.args => acpi-table.x86_64-latest.args} | 0 ...ndex.args => autoindex.x86_64-latest.args} | 0 ...=> balloon-device-auto.x86_64-latest.args} | 0 ...oon-device-deflate-off.x86_64-latest.args} | 0 ...balloon-device-deflate.x86_64-latest.args} | 0 ... balloon-device-period.x86_64-latest.args} | 0 ...args => balloon-device.x86_64-latest.args} | 0 ...gs => blkiotune-device.x86_64-latest.args} | 0 ...tune.args => blkiotune.x86_64-latest.args} | 0 ...gs => channel-guestfwd.x86_64-latest.args} | 0 ...gs => channel-spicevmc.x86_64-latest.args} | 0 ...=> channel-virtio-auto.x86_64-latest.args} | 0 ...channel-virtio-autoadd.x86_64-latest.args} | 0 ...nnel-virtio-autoassign.x86_64-latest.args} | 0 ...channel-virtio-default.x86_64-latest.args} | 0 ...> channel-virtio-state.x86_64-latest.args} | 0 ...=> channel-virtio-unix.x86_64-latest.args} | 0 ...args => channel-virtio.x86_64-latest.args} | 0 ...econnect-generated-path.x86_64-latest.err} | 0 ...connect-invalid-timeout.x86_64-latest.err} | 0 ...s => chardev-reconnect.x86_64-latest.args} | 0 ....args => clock-catchup.x86_64-latest.args} | 0 ...e.args => clock-france.x86_64-latest.args} | 0 ...altime-basis-localtime.x86_64-latest.args} | 0 ...rgs => clock-localtime.x86_64-latest.args} | 0 ...clock-timer-hyperv-rtc.x86_64-latest.args} | 0 ...-utc.args => clock-utc.x86_64-latest.args} | 0 ...args => clock-variable.x86_64-latest.args} | 0 ...=> console-virtio-many.x86_64-latest.args} | 0 ...args => console-virtio.x86_64-latest.args} | 0 ...gs => controller-order.x86_64-latest.args} | 0 ...s => cpu-cache-disable.x86_64-latest.args} | 0 ...=> cpu-cache-emulate-l2.x86_64-latest.err} | 0 ...> cpu-cache-emulate-l3.x86_64-latest.args} | 0 ...pu-cache-passthrough-l3.x86_64-latest.err} | 0 ... cpu-cache-passthrough.x86_64-latest.args} | 0 ... cpu-cache-passthrough3.x86_64-latest.err} | 0 ...cpu-check-default-none.x86_64-latest.args} | 0 ...pu-check-default-none2.x86_64-latest.args} | 0 ...check-default-partial2.x86_64-latest.args} | 0 tests/qemuxml2argvdata/cpu-check-full.args | 1 - .../cpu-check-full.x86_64-latest.args | 1 + ...args => cpu-check-none.x86_64-latest.args} | 0 tests/qemuxml2argvdata/cpu-check-partial.args | 1 - .../cpu-check-partial.x86_64-latest.args | 1 + ...s => cpu-host-kvmclock.x86_64-latest.args} | 0 ...t-passthrough-features.x86_64-latest.args} | 0 ...> cpu-host-passthrough.x86_64-latest.args} | 0 ...k.args => cpu-kvmclock.x86_64-latest.args} | 0 ...s => cpu-numa-disjoint.x86_64-latest.args} | 0 ... => cpu-numa-memshared.x86_64-latest.args} | 0 ...numa-no-memory-element.x86_64-latest.args} | 0 ...uma1.args => cpu-numa1.x86_64-latest.args} | 0 ...uma2.args => cpu-numa2.x86_64-latest.args} | 0 ...-numa3.err => cpu-numa3.x86_64-latest.err} | 0 ... cpu-phys-bits-emulate.x86_64-latest.args} | 0 ...-phys-bits-passthrough.x86_64-latest.args} | 0 ...-phys-bits-passthrough2.x86_64-latest.err} | 0 ...u-qemu-host-passthrough.x86_64-latest.err} | 0 ... default-kvm-host-arch.x86_64-latest.args} | 0 ...default-qemu-host-arch.x86_64-latest.args} | 0 ...raphics-sdl-fullscreen.x86_64-latest.args} | 0 ...l.args => graphics-sdl.x86_64-latest.args} | 0 ...isplay-missing-graphics.x86_64-latest.err} | 0 ... hostdev-mdev-duplicate.x86_64-latest.err} | 0 ...-invalid-target-address.x86_64-latest.err} | 0 ...ostdev-mdev-precreated.x86_64-latest.args} | 0 ...dev-src-address-invalid.x86_64-latest.err} | 0 ...pci-address-unassigned.x86_64-latest.args} | 0 ...> hostdev-pci-duplicate.x86_64-latest.err} | 0 ...tdev-pci-multifunction.x86_64-latest.args} | 0 ... hostdev-scsi-duplicate.x86_64-latest.err} | 0 ...ev-scsi-vhost-scsi-pci.x86_64-latest.args} | 0 ...> hostdev-usb-duplicate.x86_64-latest.err} | 0 ...stdev-vfio-multidomain.x86_64-latest.args} | 0 ...ev-vfio-zpci-wrong-arch.x86_64-latest.err} | 0 ...o.args => hostdev-vfio.x86_64-latest.args} | 0 ...e.args => hotplug-base.x86_64-latest.args} | 0 ...=> input-usbmouse-addr.x86_64-latest.args} | 0 ...args => input-usbmouse.x86_64-latest.args} | 0 ...rgs => input-usbtablet.x86_64-latest.args} | 0 ....args => kvm-pit-delay.x86_64-latest.args} | 0 ...rgs => kvm-pit-discard.x86_64-latest.args} | 0 ...clock.args => kvmclock.x86_64-latest.args} | 0 ...gs => machine-aliases1.x86_64-latest.args} | 0 ...gs => machine-aliases2.x86_64-latest.args} | 0 ...gs => machine-core-off.x86_64-latest.args} | 0 ...rgs => machine-core-on.x86_64-latest.args} | 0 ...dparm-s390-char-invalid.x86_64-latest.err} | 0 ...adparm-s390-len-invalid.x86_64-latest.err} | 0 ... => machine-vmport-opt.x86_64-latest.args} | 0 ...rr => memory-align-fail.x86_64-latest.err} | 0 ...=> memory-hotplug-dimm.x86_64-latest.args} | 0 ...plug-invalid-targetnode.x86_64-latest.err} | 0 ...> memory-hotplug-nonuma.x86_64-latest.err} | 0 ...args => memory-hotplug.x86_64-latest.args} | 0 ...s => memtune-unlimited.x86_64-latest.args} | 0 ...emtune.args => memtune.x86_64-latest.args} | 0 ...rr => minimal-no-memory.x86_64-latest.err} | 0 ...inimal.args => minimal.x86_64-latest.args} | 0 ...acpi.args => misc-acpi.x86_64-latest.args} | 0 ...rgs => misc-disable-s3.x86_64-latest.args} | 0 ... misc-disable-suspends.x86_64-latest.args} | 0 ...args => misc-enable-s4.x86_64-latest.args} | 0 ...uuid.args => misc-uuid.x86_64-latest.args} | 0 ...ltifunction-pci-device.x86_64-latest.args} | 0 ...s.args => nosharepages.x86_64-latest.args} | 0 ...uto-memory-vcpu-cpuset.x86_64-latest.args} | 0 ...o-cpuset-and-placement.x86_64-latest.args} | 0 ...tic-numatune-no-nodeset.x86_64-latest.err} | 0 ...o-vcpu-static-numatune.x86_64-latest.args} | 0 ...tatic-memory-auto-vcpu.x86_64-latest.args} | 0 .../{numad.args => numad.x86_64-latest.args} | 0 ...gs => pci-autoadd-addr.x86_64-latest.args} | 0 ...rgs => pci-autoadd-idx.x86_64-latest.args} | 0 ...s => pci-autofill-addr.x86_64-latest.args} | 0 ...-bridge-duplicate-index.x86_64-latest.err} | 0 ... pci-bridge-many-disks.x86_64-latest.args} | 0 ...-negative-index-invalid.x86_64-latest.err} | 0 ...dge.args => pci-bridge.x86_64-latest.args} | 0 ....err => pci-bus-invalid.x86_64-latest.err} | 0 ...r => pci-domain-invalid.x86_64-latest.err} | 0 ...ci-expander-bus-bad-bus.x86_64-latest.err} | 0 ...xpander-bus-bad-machine.x86_64-latest.err} | 0 ...i-expander-bus-bad-node.x86_64-latest.err} | 0 ...gs => pci-expander-bus.x86_64-latest.args} | 0 ...=> pci-function-invalid.x86_64-latest.err} | 0 ...-many.args => pci-many.x86_64-latest.args} | 0 .../pci-rom-disabled-invalid.args | 1 - ...ci-rom-disabled-invalid.x86_64-latest.args | 1 + ...gs => pci-rom-disabled.x86_64-latest.args} | 0 ...ci-rom.args => pci-rom.x86_64-latest.args} | 0 ...err => pci-root-address.x86_64-latest.err} | 0 ... pci-root-nonzero-index.x86_64-latest.err} | 0 ...err => pci-slot-invalid.x86_64-latest.err} | 0 ...ie-expander-bus-bad-bus.x86_64-latest.err} | 0 ...xpander-bus-bad-machine.x86_64-latest.err} | 0 ...s => pcie-expander-bus.x86_64-latest.args} | 0 ...oot-port-model-generic.x86_64-latest.args} | 0 ...oot-port-model-ioh3420.x86_64-latest.args} | 0 ...pcie-root-port-too-many.x86_64-latest.err} | 0 ...args => pcie-root-port.x86_64-latest.args} | 0 ...root.args => pcie-root.x86_64-latest.args} | 0 ...switch-downstream-port.x86_64-latest.args} | 0 ...e-switch-upstream-port.x86_64-latest.args} | 0 ....args => pcihole64-q35.x86_64-latest.args} | 0 ...le64.args => pcihole64.x86_64-latest.args} | 0 ...rgs => pmu-feature-off.x86_64-latest.args} | 0 ...re.args => pmu-feature.x86_64-latest.args} | 0 ...eatures-invalid-machine.x86_64-latest.err} | 0 ...-serial-invalid-machine.x86_64-latest.err} | 0 ...=> q35-dmi-bad-address1.x86_64-latest.err} | 0 ...=> q35-dmi-bad-address2.x86_64-latest.err} | 0 ... q35-pci-force-address.x86_64-latest.args} | 0 ...args => q35-usb2-multi.x86_64-latest.args} | 0 ...gs => q35-usb2-reorder.x86_64-latest.args} | 0 ...-usb2.args => q35-usb2.x86_64-latest.args} | 0 ...t.err => q35-wrong-root.x86_64-latest.err} | 0 .../{q35.args => q35.x86_64-latest.args} | 0 ...lt.args => qemu-ns-alt.x86_64-latest.args} | 0 ...emu-ns-commandline-ns0.x86_64-latest.args} | 0 ...emu-ns-commandline-ns1.x86_64-latest.args} | 0 ...=> qemu-ns-commandline.x86_64-latest.args} | 0 ...domain-commandline-ns0.x86_64-latest.args} | 0 ...-ns-domain-commandline.x86_64-latest.args} | 0 ... => qemu-ns-domain-ns0.x86_64-latest.args} | 0 ...args => qemu-ns-no-env.x86_64-latest.args} | 0 ...eboot-timeout-disabled.x86_64-latest.args} | 0 ...reboot-timeout-enabled.x86_64-latest.args} | 0 ...s => seclabel-dac-none.x86_64-latest.args} | 0 ...label-device-duplicates.x86_64-latest.err} | 0 ...-device-relabel-invalid.x86_64-latest.err} | 0 ...abel-dynamic-baselabel.x86_64-latest.args} | 0 ...abel-dynamic-labelskip.x86_64-latest.args} | 0 ...label-dynamic-override.x86_64-latest.args} | 0 ...clabel-dynamic-relabel.x86_64-latest.args} | 0 ...gs => seclabel-dynamic.x86_64-latest.args} | 0 ...rr => seclabel-multiple.x86_64-latest.err} | 0 ....args => seclabel-none.x86_64-latest.args} | 0 ...label-static-labelskip.x86_64-latest.args} | 0 ...eclabel-static-relabel.x86_64-latest.args} | 0 ...rgs => seclabel-static.x86_64-latest.args} | 0 ...> smartcard-controller.x86_64-latest.args} | 0 ...-certificates-database.x86_64-latest.args} | 0 ...card-host-certificates.x86_64-latest.args} | 0 ...args => smartcard-host.x86_64-latest.args} | 0 ...d-passthrough-spicevmc.x86_64-latest.args} | 0 ...rtcard-passthrough-tcp.x86_64-latest.args} | 0 ...date.err => smbios-date.x86_64-latest.err} | 0 ...rr => smbios-uuid-match.x86_64-latest.err} | 0 ...{smbios.args => smbios.x86_64-latest.args} | 0 ... tpm-no-backend-invalid.x86_64-latest.err} | 0 ....err => usb-bus-missing.x86_64-latest.err} | 0 ...roller-ich9-autoassign.x86_64-latest.args} | 0 ...troller-ich9-companion.x86_64-latest.args} | 0 ...troller-ich9-ehci-addr.x86_64-latest.args} | 0 ...oller-ich9-no-companion.x86_64-latest.err} | 0 ...> usb-controller-piix3.x86_64-latest.args} | 0 ...usb-hub-autoadd-deluxe.x86_64-latest.args} | 0 ...rgs => usb-hub-autoadd.x86_64-latest.args} | 0 ...err => usb-hub-conflict.x86_64-latest.err} | 0 ... => usb-hub-nonexistent.x86_64-latest.err} | 0 ...sb-hub.args => usb-hub.x86_64-latest.args} | 0 ... => usb-long-port-path.x86_64-latest.args} | 0 ...hub.err => usb-none-hub.x86_64-latest.err} | 0 ...r.err => usb-none-other.x86_64-latest.err} | 0 ...r => usb-none-usbtablet.x86_64-latest.err} | 0 ...-none.args => usb-none.x86_64-latest.args} | 0 ...=> usb-port-autoassign.x86_64-latest.args} | 0 ...gs => usb-port-missing.x86_64-latest.args} | 0 ... usb-ports-out-of-range.x86_64-latest.err} | 0 ...orts.args => usb-ports.x86_64-latest.args} | 0 ...args => usb-redir-boot.x86_64-latest.args} | 0 ...b-redir-filter-version.x86_64-latest.args} | 0 ...gs => usb-redir-filter.x86_64-latest.args} | 0 ...edir.args => usb-redir.x86_64-latest.args} | 0 ...-long-port-path-invalid.x86_64-latest.err} | 0 ...usb2.args => usb1-usb2.x86_64-latest.args} | 0 ...=> vhost_queues-invalid.x86_64-latest.err} | 0 ...rtio-input-passthrough.x86_64-latest.args} | 0 ...t.args => virtio-input.x86_64-latest.args} | 0 ... => virtio-rng-default.x86_64-latest.args} | 0 ...=> virtio-rng-egd-crash.x86_64-latest.err} | 0 ...args => virtio-rng-egd.x86_64-latest.args} | 0 ...=> virtio-rng-multiple.x86_64-latest.args} | 0 ...s => virtio-rng-random.x86_64-latest.args} | 0 ...nfo.args => vmcoreinfo.x86_64-latest.args} | 0 tests/qemuxml2argvtest.c | 735 ++++++------------ 230 files changed, 243 insertions(+), 498 deletions(-) rename tests/qemuxml2argvdata/{440fx-ide-address-conflict.err => 440fx-ide-address-conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{440fx-wrong-root.err => 440fx-wrong-root.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{acpi-table.args => acpi-table.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{autoindex.args => autoindex.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{balloon-device-auto.args => balloon-device-auto.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{balloon-device-deflate-off.args => balloon-device-deflate-off.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{balloon-device-deflate.args => balloon-device-deflate.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{balloon-device-period.args => balloon-device-period.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{balloon-device.args => balloon-device.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{blkiotune-device.args => blkiotune-device.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{blkiotune.args => blkiotune.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{channel-guestfwd.args => channel-guestfwd.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{channel-spicevmc.args => channel-spicevmc.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{channel-virtio-auto.args => channel-virtio-auto.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{channel-virtio-autoadd.args => channel-virtio-autoadd.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{channel-virtio-autoassign.args => channel-virtio-autoassign.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{channel-virtio-default.args => channel-virtio-default.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{channel-virtio-state.args => channel-virtio-state.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{channel-virtio-unix.args => channel-virtio-unix.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{channel-virtio.args => channel-virtio.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{chardev-reconnect-generated-path.err => chardev-reconnect-generated-path.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{chardev-reconnect-invalid-timeout.err => chardev-reconnect-invalid-timeout.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{chardev-reconnect.args => chardev-reconnect.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{clock-catchup.args => clock-catchup.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{clock-france.args => clock-france.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{clock-localtime-basis-localtime.args => clock-localtime-basis-localtime.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{clock-localtime.args => clock-localtime.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{clock-timer-hyperv-rtc.args => clock-timer-hyperv-rtc.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{clock-utc.args => clock-utc.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{clock-variable.args => clock-variable.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{console-virtio-many.args => console-virtio-many.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{console-virtio.args => console-virtio.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{controller-order.args => controller-order.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-cache-disable.args => cpu-cache-disable.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-cache-emulate-l2.err => cpu-cache-emulate-l2.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{cpu-cache-emulate-l3.args => cpu-cache-emulate-l3.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-cache-passthrough-l3.err => cpu-cache-passthrough-l3.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{cpu-cache-passthrough.args => cpu-cache-passthrough.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-cache-passthrough3.err => cpu-cache-passthrough3.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{cpu-check-default-none.args => cpu-check-default-none.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-check-default-none2.args => cpu-check-default-none2.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-check-default-partial2.args => cpu-check-default-partial2.x86_64-latest.args} (100%) delete mode 120000 tests/qemuxml2argvdata/cpu-check-full.args create mode 120000 tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-check-none.args => cpu-check-none.x86_64-latest.args} (100%) delete mode 120000 tests/qemuxml2argvdata/cpu-check-partial.args create mode 120000 tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-host-kvmclock.args => cpu-host-kvmclock.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-passthrough-features.args => cpu-host-passthrough-features.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-passthrough.args => cpu-host-passthrough.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-kvmclock.args => cpu-kvmclock.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-numa-disjoint.args => cpu-numa-disjoint.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-numa-memshared.args => cpu-numa-memshared.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-numa-no-memory-element.args => cpu-numa-no-memory-element.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-numa1.args => cpu-numa1.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-numa2.args => cpu-numa2.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-numa3.err => cpu-numa3.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{cpu-phys-bits-emulate.args => cpu-phys-bits-emulate.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-phys-bits-passthrough.args => cpu-phys-bits-passthrough.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-phys-bits-passthrough2.err => cpu-phys-bits-passthrough2.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{cpu-qemu-host-passthrough.err => cpu-qemu-host-passthrough.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{default-kvm-host-arch.args => default-kvm-host-arch.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{default-qemu-host-arch.args => default-qemu-host-arch.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{graphics-sdl-fullscreen.args => graphics-sdl-fullscreen.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{graphics-sdl.args => graphics-sdl.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-display-missing-graphics.err => hostdev-mdev-display-missing-graphics.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-duplicate.err => hostdev-mdev-duplicate.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-invalid-target-address.err => hostdev-mdev-invalid-target-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-precreated.args => hostdev-mdev-precreated.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-src-address-invalid.err => hostdev-mdev-src-address-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-pci-address-unassigned.args => hostdev-pci-address-unassigned.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{hostdev-pci-duplicate.err => hostdev-pci-duplicate.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-pci-multifunction.args => hostdev-pci-multifunction.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{hostdev-scsi-duplicate.err => hostdev-scsi-duplicate.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pci.args => hostdev-scsi-vhost-scsi-pci.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{hostdev-usb-duplicate.err => hostdev-usb-duplicate.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-multidomain.args => hostdev-vfio-multidomain.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-wrong-arch.err => hostdev-vfio-zpci-wrong-arch.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio.args => hostdev-vfio.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{hotplug-base.args => hotplug-base.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{input-usbmouse-addr.args => input-usbmouse-addr.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{input-usbmouse.args => input-usbmouse.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{input-usbtablet.args => input-usbtablet.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{kvm-pit-delay.args => kvm-pit-delay.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{kvm-pit-discard.args => kvm-pit-discard.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{kvmclock.args => kvmclock.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{machine-aliases1.args => machine-aliases1.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{machine-aliases2.args => machine-aliases2.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{machine-core-off.args => machine-core-off.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{machine-core-on.args => machine-core-on.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{machine-loadparm-s390-char-invalid.err => machine-loadparm-s390-char-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{machine-loadparm-s390-len-invalid.err => machine-loadparm-s390-len-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{machine-vmport-opt.args => machine-vmport-opt.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{memory-align-fail.err => memory-align-fail.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{memory-hotplug-dimm.args => memory-hotplug-dimm.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{memory-hotplug-invalid-targetnode.err => memory-hotplug-invalid-targetnode.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{memory-hotplug-nonuma.err => memory-hotplug-nonuma.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{memory-hotplug.args => memory-hotplug.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{memtune-unlimited.args => memtune-unlimited.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{memtune.args => memtune.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{minimal-no-memory.err => minimal-no-memory.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{minimal.args => minimal.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{misc-acpi.args => misc-acpi.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{misc-disable-s3.args => misc-disable-s3.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{misc-disable-suspends.args => misc-disable-suspends.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{misc-enable-s4.args => misc-enable-s4.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{misc-uuid.args => misc-uuid.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{multifunction-pci-device.args => multifunction-pci-device.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{nosharepages.args => nosharepages.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{numad-auto-memory-vcpu-cpuset.args => numad-auto-memory-vcpu-cpuset.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{numad-auto-memory-vcpu-no-cpuset-and-placement.args => numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{numad-auto-vcpu-static-numatune-no-nodeset.err => numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numad-auto-vcpu-static-numatune.args => numad-auto-vcpu-static-numatune.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{numad-static-memory-auto-vcpu.args => numad-static-memory-auto-vcpu.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{numad.args => numad.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pci-autoadd-addr.args => pci-autoadd-addr.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pci-autoadd-idx.args => pci-autoadd-idx.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pci-autofill-addr.args => pci-autofill-addr.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pci-bridge-duplicate-index.err => pci-bridge-duplicate-index.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-bridge-many-disks.args => pci-bridge-many-disks.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pci-bridge-negative-index-invalid.err => pci-bridge-negative-index-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-bridge.args => pci-bridge.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pci-bus-invalid.err => pci-bus-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-domain-invalid.err => pci-domain-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-expander-bus-bad-bus.err => pci-expander-bus-bad-bus.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-expander-bus-bad-machine.err => pci-expander-bus-bad-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-expander-bus-bad-node.err => pci-expander-bus-bad-node.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-expander-bus.args => pci-expander-bus.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pci-function-invalid.err => pci-function-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-many.args => pci-many.x86_64-latest.args} (100%) delete mode 120000 tests/qemuxml2argvdata/pci-rom-disabled-invalid.args create mode 120000 tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-rom-disabled.args => pci-rom-disabled.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pci-rom.args => pci-rom.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pci-root-address.err => pci-root-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-root-nonzero-index.err => pci-root-nonzero-index.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-slot-invalid.err => pci-slot-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pcie-expander-bus-bad-bus.err => pcie-expander-bus-bad-bus.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pcie-expander-bus-bad-machine.err => pcie-expander-bus-bad-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pcie-expander-bus.args => pcie-expander-bus.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pcie-root-port-model-generic.args => pcie-root-port-model-generic.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pcie-root-port-model-ioh3420.args => pcie-root-port-model-ioh3420.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pcie-root-port-too-many.err => pcie-root-port-too-many.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pcie-root-port.args => pcie-root-port.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pcie-root.args => pcie-root.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pcie-switch-downstream-port.args => pcie-switch-downstream-port.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pcie-switch-upstream-port.args => pcie-switch-upstream-port.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pcihole64-q35.args => pcihole64-q35.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pcihole64.args => pcihole64.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pmu-feature-off.args => pmu-feature-off.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pmu-feature.args => pmu-feature.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{pseries-features-invalid-machine.err => pseries-features-invalid-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pseries-serial-invalid-machine.err => pseries-serial-invalid-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{q35-dmi-bad-address1.err => q35-dmi-bad-address1.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{q35-dmi-bad-address2.err => q35-dmi-bad-address2.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{q35-pci-force-address.args => q35-pci-force-address.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{q35-usb2-multi.args => q35-usb2-multi.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{q35-usb2-reorder.args => q35-usb2-reorder.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{q35-usb2.args => q35-usb2.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{q35-wrong-root.err => q35-wrong-root.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{q35.args => q35.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{qemu-ns-alt.args => qemu-ns-alt.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{qemu-ns-commandline-ns0.args => qemu-ns-commandline-ns0.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{qemu-ns-commandline-ns1.args => qemu-ns-commandline-ns1.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{qemu-ns-commandline.args => qemu-ns-commandline.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{qemu-ns-domain-commandline-ns0.args => qemu-ns-domain-commandline-ns0.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{qemu-ns-domain-commandline.args => qemu-ns-domain-commandline.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{qemu-ns-domain-ns0.args => qemu-ns-domain-ns0.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{qemu-ns-no-env.args => qemu-ns-no-env.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{reboot-timeout-disabled.args => reboot-timeout-disabled.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{reboot-timeout-enabled.args => reboot-timeout-enabled.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{seclabel-dac-none.args => seclabel-dac-none.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{seclabel-device-duplicates.err => seclabel-device-duplicates.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{seclabel-device-relabel-invalid.err => seclabel-device-relabel-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{seclabel-dynamic-baselabel.args => seclabel-dynamic-baselabel.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{seclabel-dynamic-labelskip.args => seclabel-dynamic-labelskip.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{seclabel-dynamic-override.args => seclabel-dynamic-override.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{seclabel-dynamic-relabel.args => seclabel-dynamic-relabel.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{seclabel-dynamic.args => seclabel-dynamic.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{seclabel-multiple.err => seclabel-multiple.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{seclabel-none.args => seclabel-none.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{seclabel-static-labelskip.args => seclabel-static-labelskip.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{seclabel-static-relabel.args => seclabel-static-relabel.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{seclabel-static.args => seclabel-static.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{smartcard-controller.args => smartcard-controller.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{smartcard-host-certificates-database.args => smartcard-host-certificates-database.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{smartcard-host-certificates.args => smartcard-host-certificates.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{smartcard-host.args => smartcard-host.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{smartcard-passthrough-spicevmc.args => smartcard-passthrough-spicevmc.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{smartcard-passthrough-tcp.args => smartcard-passthrough-tcp.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{smbios-date.err => smbios-date.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{smbios-uuid-match.err => smbios-uuid-match.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{smbios.args => smbios.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{tpm-no-backend-invalid.err => tpm-no-backend-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-bus-missing.err => usb-bus-missing.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-controller-ich9-autoassign.args => usb-controller-ich9-autoassign.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-controller-ich9-companion.args => usb-controller-ich9-companion.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-controller-ich9-ehci-addr.args => usb-controller-ich9-ehci-addr.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-controller-ich9-no-companion.err => usb-controller-ich9-no-companion.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-controller-piix3.args => usb-controller-piix3.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-hub-autoadd-deluxe.args => usb-hub-autoadd-deluxe.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-hub-autoadd.args => usb-hub-autoadd.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-hub-conflict.err => usb-hub-conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-hub-nonexistent.err => usb-hub-nonexistent.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-hub.args => usb-hub.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-long-port-path.args => usb-long-port-path.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-none-hub.err => usb-none-hub.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-none-other.err => usb-none-other.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-none-usbtablet.err => usb-none-usbtablet.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-none.args => usb-none.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-port-autoassign.args => usb-port-autoassign.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-port-missing.args => usb-port-missing.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-ports-out-of-range.err => usb-ports-out-of-range.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-ports.args => usb-ports.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-redir-boot.args => usb-redir-boot.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-redir-filter-version.args => usb-redir-filter-version.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-redir-filter.args => usb-redir-filter.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-redir.args => usb-redir.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{usb-too-long-port-path-invalid.err => usb-too-long-port-path-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb1-usb2.args => usb1-usb2.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{vhost_queues-invalid.err => vhost_queues-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{virtio-input-passthrough.args => virtio-input-passthrough.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{virtio-input.args => virtio-input.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{virtio-rng-default.args => virtio-rng-default.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{virtio-rng-egd-crash.err => virtio-rng-egd-crash.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{virtio-rng-egd.args => virtio-rng-egd.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{virtio-rng-multiple.args => virtio-rng-multiple.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{virtio-rng-random.args => virtio-rng-random.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{vmcoreinfo.args => vmcoreinfo.x86_64-latest.args} (100%) diff --git a/tests/qemuxml2argvdata/440fx-ide-address-conflict.err b/tests/qemuxml2argvdata/440fx-ide-address-conflict.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/440fx-ide-address-conflict.err rename to tests/qemuxml2argvdata/440fx-ide-address-conflict.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/440fx-wrong-root.err b/tests/qemuxml2argvdata/440fx-wrong-root.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/440fx-wrong-root.err rename to tests/qemuxml2argvdata/440fx-wrong-root.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/acpi-table.args rename to tests/qemuxml2argvdata/acpi-table.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/autoindex.args rename to tests/qemuxml2argvdata/autoindex.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-auto.args rename to tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-deflate-off.args rename to tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-deflate.args rename to tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-period.args rename to tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-device.args rename to tests/qemuxml2argvdata/balloon-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/blkiotune-device.args rename to tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/blkiotune.args rename to tests/qemuxml2argvdata/blkiotune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-guestfwd.args rename to tests/qemuxml2argvdata/channel-guestfwd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-spicevmc.args rename to tests/qemuxml2argvdata/channel-spicevmc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-auto.args rename to tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-autoadd.args rename to tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-autoassign.args rename to tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-default.args rename to tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-state.args rename to tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-unix.args rename to tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio.args rename to tests/qemuxml2argvdata/channel-virtio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.err b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/chardev-reconnect-generated-path.err rename to tests/qemuxml2argvdata/chardev-reconnect-generated-path.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.err b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.err rename to tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/chardev-reconnect.args rename to tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-catchup.args rename to tests/qemuxml2argvdata/clock-catchup.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-france.args rename to tests/qemuxml2argvdata/clock-france.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-localtime-basis-localtime.args rename to tests/qemuxml2argvdata/clock-localtime-basis-localtime.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-localtime.args rename to tests/qemuxml2argvdata/clock-localtime.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args rename to tests/qemuxml2argvdata/clock-timer-hyperv-rtc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-utc.args rename to tests/qemuxml2argvdata/clock-utc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-variable.args rename to tests/qemuxml2argvdata/clock-variable.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-virtio-many.args rename to tests/qemuxml2argvdata/console-virtio-many.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-virtio.args rename to tests/qemuxml2argvdata/console-virtio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/controller-order.args rename to tests/qemuxml2argvdata/controller-order.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-disable.args rename to tests/qemuxml2argvdata/cpu-cache-disable.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l2.err b/tests/qemuxml2argvdata/cpu-cache-emulate-l2.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-emulate-l2.err rename to tests/qemuxml2argvdata/cpu-cache-emulate-l2.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-emulate-l3.args rename to tests/qemuxml2argvdata/cpu-cache-emulate-l3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough-l3.err b/tests/qemuxml2argvdata/cpu-cache-passthrough-l3.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-passthrough-l3.err rename to tests/qemuxml2argvdata/cpu-cache-passthrough-l3.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-passthrough.args rename to tests/qemuxml2argvdata/cpu-cache-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough3.err b/tests/qemuxml2argvdata/cpu-cache-passthrough3.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-passthrough3.err rename to tests/qemuxml2argvdata/cpu-cache-passthrough3.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-none.args rename to tests/qemuxml2argvdata/cpu-check-default-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-none2.args rename to tests/qemuxml2argvdata/cpu-check-default-none2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-partial2.args rename to tests/qemuxml2argvdata/cpu-check-default-partial2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-full.args b/tests/qemuxml2argvdata/cpu-check-full.args deleted file mode 120000 index e280ccb23d..0000000000 --- a/tests/qemuxml2argvdata/cpu-check-full.args +++ /dev/null @@ -1 +0,0 @@ -cpu-check-none.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args new file mode 120000 index 0000000000..b7577a2c43 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args @@ -0,0 +1 @@ +cpu-check-none.x86_64-latest.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-none.args rename to tests/qemuxml2argvdata/cpu-check-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-partial.args b/tests/qemuxml2argvdata/cpu-check-partial.args deleted file mode 120000 index e280ccb23d..0000000000 --- a/tests/qemuxml2argvdata/cpu-check-partial.args +++ /dev/null @@ -1 +0,0 @@ -cpu-check-none.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args new file mode 120000 index 0000000000..b7577a2c43 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args @@ -0,0 +1 @@ +cpu-check-none.x86_64-latest.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-kvmclock.args rename to tests/qemuxml2argvdata/cpu-host-kvmclock.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-passthrough-features.args rename to tests/qemuxml2argvdata/cpu-host-passthrough-features.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-passthrough.args rename to tests/qemuxml2argvdata/cpu-host-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-kvmclock.args rename to tests/qemuxml2argvdata/cpu-kvmclock.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-disjoint.args rename to tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-memshared.args rename to tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-no-memory-element.args rename to tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa1.args rename to tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa2.args rename to tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa3.err b/tests/qemuxml2argvdata/cpu-numa3.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa3.err rename to tests/qemuxml2argvdata/cpu-numa3.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-emulate.args rename to tests/qemuxml2argvdata/cpu-phys-bits-emulate.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args rename to tests/qemuxml2argvdata/cpu-phys-bits-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err rename to tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-qemu-host-passthrough.err b/tests/qemuxml2argvdata/cpu-qemu-host-passthrough.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-qemu-host-passthrough.err rename to tests/qemuxml2argvdata/cpu-qemu-host-passthrough.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/default-kvm-host-arch.args rename to tests/qemuxml2argvdata/default-kvm-host-arch.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/default-qemu-host-arch.args rename to tests/qemuxml2argvdata/default-qemu-host-arch.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-sdl-fullscreen.args rename to tests/qemuxml2argvdata/graphics-sdl-fullscreen.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-sdl.args rename to tests/qemuxml2argvdata/graphics-sdl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.err b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.err rename to tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.err b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-duplicate.err rename to tests/qemuxml2argvdata/hostdev-mdev-duplicate.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.err b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.err rename to tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-precreated.args rename to tests/qemuxml2argvdata/hostdev-mdev-precreated.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.err b/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.err rename to tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args rename to tests/qemuxml2argvdata/hostdev-pci-address-unassigned.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-pci-duplicate.err b/tests/qemuxml2argvdata/hostdev-pci-duplicate.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-duplicate.err rename to tests/qemuxml2argvdata/hostdev-pci-duplicate.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-multifunction.args rename to tests/qemuxml2argvdata/hostdev-pci-multifunction.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.err b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-duplicate.err rename to tests/qemuxml2argvdata/hostdev-scsi-duplicate.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args rename to tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-usb-duplicate.err b/tests/qemuxml2argvdata/hostdev-usb-duplicate.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-usb-duplicate.err rename to tests/qemuxml2argvdata/hostdev-usb-duplicate.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-multidomain.args rename to tests/qemuxml2argvdata/hostdev-vfio-multidomain.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.err b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.err rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio.args rename to tests/qemuxml2argvdata/hostdev-vfio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hotplug-base.args rename to tests/qemuxml2argvdata/hotplug-base.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/input-usbmouse-addr.args rename to tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/input-usbmouse.args rename to tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/input-usbtablet.args rename to tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/kvm-pit-delay.args rename to tests/qemuxml2argvdata/kvm-pit-delay.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/kvm-pit-discard.args rename to tests/qemuxml2argvdata/kvm-pit-discard.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/kvmclock.args rename to tests/qemuxml2argvdata/kvmclock.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-aliases1.args rename to tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-aliases2.args rename to tests/qemuxml2argvdata/machine-aliases2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-core-off.args rename to tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-core-on.args rename to tests/qemuxml2argvdata/machine-core-on.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.err b/tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.err rename to tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.err b/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.err rename to tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-vmport-opt.args rename to tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-align-fail.err b/tests/qemuxml2argvdata/memory-align-fail.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/memory-align-fail.err rename to tests/qemuxml2argvdata/memory-align-fail.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-dimm.args rename to tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err b/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err rename to tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/memory-hotplug-nonuma.err b/tests/qemuxml2argvdata/memory-hotplug-nonuma.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nonuma.err rename to tests/qemuxml2argvdata/memory-hotplug-nonuma.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug.args rename to tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memtune-unlimited.args rename to tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memtune.args rename to tests/qemuxml2argvdata/memtune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/minimal-no-memory.err b/tests/qemuxml2argvdata/minimal-no-memory.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/minimal-no-memory.err rename to tests/qemuxml2argvdata/minimal-no-memory.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/minimal.args rename to tests/qemuxml2argvdata/minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-acpi.args rename to tests/qemuxml2argvdata/misc-acpi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-disable-s3.args rename to tests/qemuxml2argvdata/misc-disable-s3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-disable-suspends.args rename to tests/qemuxml2argvdata/misc-disable-suspends.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-enable-s4.args rename to tests/qemuxml2argvdata/misc-enable-s4.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-uuid.args rename to tests/qemuxml2argvdata/misc-uuid.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/multifunction-pci-device.args rename to tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/nosharepages.args rename to tests/qemuxml2argvdata/nosharepages.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args rename to tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args 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.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args rename to tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.err b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.err rename to tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args rename to tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args rename to tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad.args rename to tests/qemuxml2argvdata/numad.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-autoadd-addr.args rename to tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-autoadd-idx.args rename to tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-autofill-addr.args rename to tests/qemuxml2argvdata/pci-autofill-addr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.err b/tests/qemuxml2argvdata/pci-bridge-duplicate-index.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge-duplicate-index.err rename to tests/qemuxml2argvdata/pci-bridge-duplicate-index.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge-many-disks.args rename to tests/qemuxml2argvdata/pci-bridge-many-disks.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.err b/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.err rename to tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge.args rename to tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-bus-invalid.err b/tests/qemuxml2argvdata/pci-bus-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-bus-invalid.err rename to tests/qemuxml2argvdata/pci-bus-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-domain-invalid.err b/tests/qemuxml2argvdata/pci-domain-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-domain-invalid.err rename to tests/qemuxml2argvdata/pci-domain-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.err b/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus-bad-bus.err rename to tests/qemuxml2argvdata/pci-expander-bus-bad-bus.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.err b/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus-bad-machine.err rename to tests/qemuxml2argvdata/pci-expander-bus-bad-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-node.err b/tests/qemuxml2argvdata/pci-expander-bus-bad-node.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus-bad-node.err rename to tests/qemuxml2argvdata/pci-expander-bus-bad-node.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus.args rename to tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-function-invalid.err b/tests/qemuxml2argvdata/pci-function-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-function-invalid.err rename to tests/qemuxml2argvdata/pci-function-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-many.args rename to tests/qemuxml2argvdata/pci-many.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args deleted file mode 120000 index 0dffe3c624..0000000000 --- a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args +++ /dev/null @@ -1 +0,0 @@ -pci-rom-disabled.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args new file mode 120000 index 0000000000..e17e6682bc --- /dev/null +++ b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args @@ -0,0 +1 @@ +pci-rom-disabled.x86_64-latest.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-rom-disabled.args rename to tests/qemuxml2argvdata/pci-rom-disabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-rom.args rename to tests/qemuxml2argvdata/pci-rom.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-root-address.err b/tests/qemuxml2argvdata/pci-root-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-root-address.err rename to tests/qemuxml2argvdata/pci-root-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-root-nonzero-index.err b/tests/qemuxml2argvdata/pci-root-nonzero-index.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-root-nonzero-index.err rename to tests/qemuxml2argvdata/pci-root-nonzero-index.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-slot-invalid.err b/tests/qemuxml2argvdata/pci-slot-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-slot-invalid.err rename to tests/qemuxml2argvdata/pci-slot-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.err b/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.err rename to tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.err b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.err rename to tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus.args rename to tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-model-generic.args rename to tests/qemuxml2argvdata/pcie-root-port-model-generic.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args rename to tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-root-port-too-many.err b/tests/qemuxml2argvdata/pcie-root-port-too-many.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-too-many.err rename to tests/qemuxml2argvdata/pcie-root-port-too-many.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port.args rename to tests/qemuxml2argvdata/pcie-root-port.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-root.args rename to tests/qemuxml2argvdata/pcie-root.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-switch-downstream-port.args rename to tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-switch-upstream-port.args rename to tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcihole64-q35.args rename to tests/qemuxml2argvdata/pcihole64-q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcihole64.args rename to tests/qemuxml2argvdata/pcihole64.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pmu-feature-off.args rename to tests/qemuxml2argvdata/pmu-feature-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pmu-feature.args rename to tests/qemuxml2argvdata/pmu-feature.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-features-invalid-machine.err b/tests/qemuxml2argvdata/pseries-features-invalid-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-features-invalid-machine.err rename to tests/qemuxml2argvdata/pseries-features-invalid-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-serial-invalid-machine.err b/tests/qemuxml2argvdata/pseries-serial-invalid-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-invalid-machine.err rename to tests/qemuxml2argvdata/pseries-serial-invalid-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/q35-dmi-bad-address1.err b/tests/qemuxml2argvdata/q35-dmi-bad-address1.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/q35-dmi-bad-address1.err rename to tests/qemuxml2argvdata/q35-dmi-bad-address1.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/q35-dmi-bad-address2.err b/tests/qemuxml2argvdata/q35-dmi-bad-address2.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/q35-dmi-bad-address2.err rename to tests/qemuxml2argvdata/q35-dmi-bad-address2.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-pci-force-address.args rename to tests/qemuxml2argvdata/q35-pci-force-address.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-usb2-multi.args rename to tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-usb2-reorder.args rename to tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-usb2.args rename to tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-wrong-root.err b/tests/qemuxml2argvdata/q35-wrong-root.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/q35-wrong-root.err rename to tests/qemuxml2argvdata/q35-wrong-root.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35.args rename to tests/qemuxml2argvdata/q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-alt.args rename to tests/qemuxml2argvdata/qemu-ns-alt.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args rename to tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args rename to tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-commandline.args rename to tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args rename to tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-domain-commandline.args rename to tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-domain-ns0.args rename to tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-no-env.args rename to tests/qemuxml2argvdata/qemu-ns-no-env.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/reboot-timeout-disabled.args rename to tests/qemuxml2argvdata/reboot-timeout-disabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/reboot-timeout-enabled.args rename to tests/qemuxml2argvdata/reboot-timeout-enabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dac-none.args rename to tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-device-duplicates.err b/tests/qemuxml2argvdata/seclabel-device-duplicates.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/seclabel-device-duplicates.err rename to tests/qemuxml2argvdata/seclabel-device-duplicates.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.err b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/seclabel-device-relabel-invalid.err rename to tests/qemuxml2argvdata/seclabel-device-relabel-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args rename to tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args rename to tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-override.args rename to tests/qemuxml2argvdata/seclabel-dynamic-override.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-relabel.args rename to tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic.args rename to tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-multiple.err b/tests/qemuxml2argvdata/seclabel-multiple.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/seclabel-multiple.err rename to tests/qemuxml2argvdata/seclabel-multiple.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-none.args rename to tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-static-labelskip.args rename to tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-static-relabel.args rename to tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-static.args rename to tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-controller.args rename to tests/qemuxml2argvdata/smartcard-controller.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-host-certificates-database.args rename to tests/qemuxml2argvdata/smartcard-host-certificates-database.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-host-certificates.args rename to tests/qemuxml2argvdata/smartcard-host-certificates.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-host.args rename to tests/qemuxml2argvdata/smartcard-host.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args rename to tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-passthrough-tcp.args rename to tests/qemuxml2argvdata/smartcard-passthrough-tcp.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smbios-date.err b/tests/qemuxml2argvdata/smbios-date.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/smbios-date.err rename to tests/qemuxml2argvdata/smbios-date.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/smbios-uuid-match.err b/tests/qemuxml2argvdata/smbios-uuid-match.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/smbios-uuid-match.err rename to tests/qemuxml2argvdata/smbios-uuid-match.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smbios.args rename to tests/qemuxml2argvdata/smbios.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tpm-no-backend-invalid.err b/tests/qemuxml2argvdata/tpm-no-backend-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/tpm-no-backend-invalid.err rename to tests/qemuxml2argvdata/tpm-no-backend-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-bus-missing.err b/tests/qemuxml2argvdata/usb-bus-missing.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-bus-missing.err rename to tests/qemuxml2argvdata/usb-bus-missing.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-controller-ich9-autoassign.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-autoassign.args rename to tests/qemuxml2argvdata/usb-controller-ich9-autoassign.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-companion.args b/tests/qemuxml2argvdata/usb-controller-ich9-companion.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-companion.args rename to tests/qemuxml2argvdata/usb-controller-ich9-companion.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.args rename to tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err b/tests/qemuxml2argvdata/usb-controller-ich9-no-companion.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-no-companion.err rename to tests/qemuxml2argvdata/usb-controller-ich9-no-companion.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-piix3.args b/tests/qemuxml2argvdata/usb-controller-piix3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-piix3.args rename to tests/qemuxml2argvdata/usb-controller-piix3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args rename to tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-autoadd.args rename to tests/qemuxml2argvdata/usb-hub-autoadd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-hub-conflict.err b/tests/qemuxml2argvdata/usb-hub-conflict.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-conflict.err rename to tests/qemuxml2argvdata/usb-hub-conflict.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-hub-nonexistent.err b/tests/qemuxml2argvdata/usb-hub-nonexistent.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-nonexistent.err rename to tests/qemuxml2argvdata/usb-hub-nonexistent.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-hub.args rename to tests/qemuxml2argvdata/usb-hub.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-long-port-path.args rename to tests/qemuxml2argvdata/usb-long-port-path.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-none-hub.err b/tests/qemuxml2argvdata/usb-none-hub.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-none-hub.err rename to tests/qemuxml2argvdata/usb-none-hub.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-none-other.err b/tests/qemuxml2argvdata/usb-none-other.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-none-other.err rename to tests/qemuxml2argvdata/usb-none-other.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-none-usbtablet.err b/tests/qemuxml2argvdata/usb-none-usbtablet.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-none-usbtablet.err rename to tests/qemuxml2argvdata/usb-none-usbtablet.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-none.args rename to tests/qemuxml2argvdata/usb-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-port-autoassign.args rename to tests/qemuxml2argvdata/usb-port-autoassign.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-port-missing.args rename to tests/qemuxml2argvdata/usb-port-missing.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-ports-out-of-range.err b/tests/qemuxml2argvdata/usb-ports-out-of-range.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-ports-out-of-range.err rename to tests/qemuxml2argvdata/usb-ports-out-of-range.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ports.args rename to tests/qemuxml2argvdata/usb-ports.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-boot.args rename to tests/qemuxml2argvdata/usb-redir-boot.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-filter-version.args rename to tests/qemuxml2argvdata/usb-redir-filter-version.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-filter.args rename to tests/qemuxml2argvdata/usb-redir-filter.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-redir.args rename to tests/qemuxml2argvdata/usb-redir.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.err b/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-too-long-port-path-invalid.err rename to tests/qemuxml2argvdata/usb-too-long-port-path-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb1-usb2.args rename to tests/qemuxml2argvdata/usb1-usb2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vhost_queues-invalid.err b/tests/qemuxml2argvdata/vhost_queues-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/vhost_queues-invalid.err rename to tests/qemuxml2argvdata/vhost_queues-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-input-passthrough.args rename to tests/qemuxml2argvdata/virtio-input-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-input.args rename to tests/qemuxml2argvdata/virtio-input.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-default.args rename to tests/qemuxml2argvdata/virtio-rng-default.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-crash.err b/tests/qemuxml2argvdata/virtio-rng-egd-crash.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-egd-crash.err rename to tests/qemuxml2argvdata/virtio-rng-egd-crash.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-egd.args rename to tests/qemuxml2argvdata/virtio-rng-egd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-multiple.args rename to tests/qemuxml2argvdata/virtio-rng-multiple.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-random.args rename to tests/qemuxml2argvdata/virtio-rng-random.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vmcoreinfo.args rename to tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cea936518e..99e0d3aa0d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -852,66 +852,9 @@ mymain(void) # define DO_TEST_CAPS_VER_PARSE_ERROR(name, ver) \ DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, "x86_64", ver) -/* All the following macros require an explicit QEMU_CAPS_* list - * at the end of the argument list, or the NONE placeholder. - * */ -# define DO_TEST(name, ...) \ - DO_TEST_FULL(name, "", \ - ARG_QEMU_CAPS, \ - QEMU_CAPS_DEVICE_JSON, \ - QEMU_CAPS_OBJECT_JSON, \ - QEMU_CAPS_NETDEV_JSON, \ - QEMU_CAPS_SECCOMP_SANDBOX, \ - QEMU_CAPS_PIIX3_USB_UHCI, \ - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ - QEMU_CAPS_CPU_MIGRATABLE, \ - QEMU_CAPS_SMP_DIES, \ - QEMU_CAPS_USB_HOST_HOSTDEVICE, \ - QEMU_CAPS_DEVICE_QEMU_XHCI, \ - QEMU_CAPS_QXL_VRAM64,\ - QEMU_CAPS_QXL_VGAMEM, \ - QEMU_CAPS_VGA_VGAMEM, \ - __VA_ARGS__, \ - QEMU_CAPS_LAST, \ - ARG_END) -# define DO_TEST_NOCAPS(name) \ - DO_TEST_FULL(name, "", \ - ARG_QEMU_CAPS, \ - QEMU_CAPS_DEVICE_JSON, \ - QEMU_CAPS_OBJECT_JSON, \ - QEMU_CAPS_NETDEV_JSON, \ - QEMU_CAPS_SECCOMP_SANDBOX, \ - QEMU_CAPS_PIIX3_USB_UHCI, \ - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ - QEMU_CAPS_CPU_MIGRATABLE, \ - QEMU_CAPS_SMP_DIES, \ - QEMU_CAPS_USB_HOST_HOSTDEVICE, \ - QEMU_CAPS_DEVICE_QEMU_XHCI, \ - QEMU_CAPS_QXL_VRAM64,\ - QEMU_CAPS_QXL_VGAMEM, \ - QEMU_CAPS_VGA_VGAMEM, \ - QEMU_CAPS_LAST, \ - ARG_END) - # define DO_TEST_GIC(name, ver, gic) \ DO_TEST_CAPS_ARCH_VER_FULL(name, "aarch64", ver, ARG_GIC, gic, ARG_END) -# define DO_TEST_FAILURE(name, ...) \ - DO_TEST_FULL(name, "", \ - ARG_FLAGS, FLAG_EXPECT_FAILURE, \ - ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) -# define DO_TEST_FAILURE_NOCAPS(name) \ - DO_TEST_FULL(name, "", ARG_FLAGS, FLAG_EXPECT_FAILURE, ARG_END) - -# define DO_TEST_PARSE_ERROR(name, ...) \ - DO_TEST_FULL(name, "", \ - ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \ - ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) -# define DO_TEST_PARSE_ERROR_NOCAPS(name) \ - DO_TEST_FULL(name, "", \ - ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \ - ARG_END) - /* Unset or set all envvars here that are copied in qemudBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ @@ -928,24 +871,23 @@ mymain(void) g_unsetenv("QEMU_AUDIO_DRV"); g_unsetenv("SDL_AUDIODRIVER"); - DO_TEST_NOCAPS("minimal"); - DO_TEST_PARSE_ERROR_NOCAPS("minimal-no-memory"); + DO_TEST_CAPS_LATEST("minimal"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("minimal-no-memory"); DO_TEST_CAPS_LATEST("genid"); DO_TEST_CAPS_LATEST("genid-auto"); - DO_TEST_NOCAPS("machine-aliases1"); - DO_TEST("machine-aliases2", QEMU_CAPS_KVM); - DO_TEST_NOCAPS("machine-core-on"); + DO_TEST_CAPS_LATEST("machine-aliases1"); + DO_TEST_CAPS_LATEST("machine-aliases2"); + DO_TEST_CAPS_LATEST("machine-core-on"); driver.config->dumpGuestCore = true; - DO_TEST_NOCAPS("machine-core-off"); + DO_TEST_CAPS_LATEST("machine-core-off"); driver.config->dumpGuestCore = false; DO_TEST_CAPS_LATEST("machine-smm-on"); DO_TEST_CAPS_LATEST("machine-smm-off"); - DO_TEST("machine-vmport-opt", - QEMU_CAPS_MACHINE_VMPORT_OPT); - DO_TEST_NOCAPS("default-kvm-host-arch"); - DO_TEST_NOCAPS("default-qemu-host-arch"); + DO_TEST_CAPS_LATEST("machine-vmport-opt"); + DO_TEST_CAPS_LATEST("default-kvm-host-arch"); + DO_TEST_CAPS_LATEST("default-qemu-host-arch"); DO_TEST_CAPS_LATEST("x86-kvm-32-on-64"); DO_TEST_CAPS_LATEST("boot-cdrom"); DO_TEST_CAPS_LATEST("boot-network"); @@ -1017,8 +959,8 @@ mymain(void) driver.config->nogfxAllowHostAudio = false; g_unsetenv("QEMU_AUDIO_DRV"); - DO_TEST_NOCAPS("reboot-timeout-disabled"); - DO_TEST_NOCAPS("reboot-timeout-enabled"); + DO_TEST_CAPS_LATEST("reboot-timeout-disabled"); + DO_TEST_CAPS_LATEST("reboot-timeout-enabled"); DO_TEST_CAPS_LATEST("firmware-manual-bios"); DO_TEST_CAPS_LATEST("firmware-manual-bios-stateless"); @@ -1102,32 +1044,24 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-format-loader-raw-abi-update", "aarch64"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-format-mismatch"); - DO_TEST_NOCAPS("clock-utc"); - DO_TEST_NOCAPS("clock-localtime"); - DO_TEST_NOCAPS("clock-localtime-basis-localtime"); - DO_TEST_NOCAPS("clock-variable"); - DO_TEST_NOCAPS("clock-france"); + DO_TEST_CAPS_LATEST("clock-utc"); + DO_TEST_CAPS_LATEST("clock-localtime"); + DO_TEST_CAPS_LATEST("clock-localtime-basis-localtime"); + DO_TEST_CAPS_LATEST("clock-variable"); + DO_TEST_CAPS_LATEST("clock-france"); DO_TEST_CAPS_VER("clock-hpet-off", "7.2.0"); DO_TEST_CAPS_LATEST("clock-hpet-off"); - DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY); - DO_TEST_NOCAPS("cpu-kvmclock"); - DO_TEST_NOCAPS("cpu-host-kvmclock"); - DO_TEST("kvmclock", QEMU_CAPS_KVM); - DO_TEST("clock-timer-hyperv-rtc", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("clock-catchup"); + DO_TEST_CAPS_LATEST("cpu-kvmclock"); + DO_TEST_CAPS_LATEST("cpu-host-kvmclock"); + DO_TEST_CAPS_LATEST("kvmclock"); + DO_TEST_CAPS_LATEST("clock-timer-hyperv-rtc"); DO_TEST_CAPS_LATEST("clock-realtime"); DO_TEST_CAPS_LATEST("clock-absolute"); DO_TEST_CAPS_LATEST("controller-usb-order"); - DO_TEST("controller-order", - QEMU_CAPS_KVM, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_CCID_PASSTHRU, - QEMU_CAPS_SPICE, - QEMU_CAPS_HDA_DUPLEX, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("controller-order"); /* 'eoi' cpu feature with an explicit CPU defined */ DO_TEST_CAPS_LATEST("cpu-eoi-disabled"); DO_TEST_CAPS_LATEST("cpu-eoi-enabled"); @@ -1148,8 +1082,8 @@ mymain(void) DO_TEST_CAPS_LATEST("kvm-features"); DO_TEST_CAPS_LATEST("kvm-features-off"); - DO_TEST_NOCAPS("pmu-feature"); - DO_TEST_NOCAPS("pmu-feature-off"); + DO_TEST_CAPS_LATEST("pmu-feature"); + DO_TEST_CAPS_LATEST("pmu-feature-off"); DO_TEST_CAPS_LATEST("pages-discard"); DO_TEST_CAPS_LATEST("pages-discard-hugepages"); @@ -1174,7 +1108,7 @@ mymain(void) DO_TEST_CAPS_VER_PARSE_ERROR("hugepages-memaccess3", "5.1.0"); DO_TEST_CAPS_LATEST("hugepages-memaccess3"); DO_TEST_CAPS_LATEST("hugepages-nvdimm"); - DO_TEST_NOCAPS("nosharepages"); + DO_TEST_CAPS_LATEST("nosharepages"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("non-x86_64-timer-error", "s390x"); @@ -1338,11 +1272,9 @@ mymain(void) driver.config->vncSASL = driver.config->vncTLSx509verify = driver.config->vncTLS = 0; DO_TEST_CAPS_LATEST("graphics-vnc-egl-headless"); - DO_TEST("graphics-sdl", - QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_SDL); + DO_TEST_CAPS_LATEST("graphics-sdl"); DO_TEST_CAPS_LATEST_PARSE_ERROR("graphics-sdl-egl-headless"); - DO_TEST("graphics-sdl-fullscreen", - QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_SDL); + DO_TEST_CAPS_LATEST("graphics-sdl-fullscreen"); driver.config->spiceTLS = 1; DO_TEST_CAPS_LATEST("graphics-spice"); @@ -1373,17 +1305,17 @@ mymain(void) DO_TEST_CAPS_LATEST("graphics-dbus-chardev"); DO_TEST_CAPS_LATEST("graphics-dbus-usbredir"); - DO_TEST_NOCAPS("input-usbmouse"); - DO_TEST_NOCAPS("input-usbtablet"); - DO_TEST_NOCAPS("misc-acpi"); - DO_TEST_NOCAPS("misc-disable-s3"); - DO_TEST_NOCAPS("misc-disable-suspends"); - DO_TEST_NOCAPS("misc-enable-s4"); + DO_TEST_CAPS_LATEST("input-usbmouse"); + DO_TEST_CAPS_LATEST("input-usbtablet"); + DO_TEST_CAPS_LATEST("misc-acpi"); + DO_TEST_CAPS_LATEST("misc-disable-s3"); + DO_TEST_CAPS_LATEST("misc-disable-suspends"); + DO_TEST_CAPS_LATEST("misc-enable-s4"); DO_TEST_CAPS_VER("misc-no-reboot", "5.2.0"); DO_TEST_CAPS_LATEST("misc-no-reboot"); - DO_TEST_NOCAPS("misc-uuid"); + DO_TEST_CAPS_LATEST("misc-uuid"); - DO_TEST_PARSE_ERROR_NOCAPS("vhost_queues-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("vhost_queues-invalid"); DO_TEST_CAPS_LATEST("net-vhostuser"); DO_TEST_CAPS_LATEST("net-vhostuser-multiq"); @@ -1423,13 +1355,9 @@ mymain(void) DO_TEST_CAPS_LATEST("net-vdpa-multiqueue"); DO_TEST_CAPS_LATEST("net-virtio-rss"); - DO_TEST("hostdev-pci-multifunction", - QEMU_CAPS_KVM, - QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_CAPS_LATEST("hostdev-pci-multifunction"); - DO_TEST("hostdev-pci-address-unassigned", - QEMU_CAPS_KVM, - QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_CAPS_LATEST("hostdev-pci-address-unassigned"); DO_TEST_CAPS_LATEST("serial-file-log"); driver.config->spiceTLS = 1; @@ -1460,64 +1388,44 @@ mymain(void) DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-secret-chardev"); VIR_FREE(driver.config->chardevTLSx509secretUUID); driver.config->chardevTLS = 0; + DO_TEST_CAPS_LATEST("parallel-tcp-chardev"); + DO_TEST_CAPS_LATEST("parallel-parport-chardev"); DO_TEST_CAPS_LATEST("serial-many-chardev"); DO_TEST_CAPS_LATEST("parallel-tcp-chardev"); DO_TEST_CAPS_LATEST("parallel-parport-chardev"); DO_TEST_CAPS_LATEST("parallel-unix-chardev"); - DO_TEST_CAPS_LATEST("console-compat-chardev"); - DO_TEST_CAPS_LATEST("pci-serial-dev-chardev"); - DO_TEST_NOCAPS("channel-guestfwd"); + DO_TEST_CAPS_LATEST("channel-guestfwd"); DO_TEST_CAPS_LATEST("channel-unix-guestfwd"); - DO_TEST_NOCAPS("channel-virtio"); - DO_TEST_NOCAPS("channel-virtio-state"); - DO_TEST_NOCAPS("channel-virtio-auto"); - DO_TEST_NOCAPS("channel-virtio-autoassign"); - DO_TEST_NOCAPS("channel-virtio-autoadd"); - DO_TEST_NOCAPS("console-virtio"); - DO_TEST("console-virtio-many", - QEMU_CAPS_DEVICE_ISA_SERIAL); + DO_TEST_CAPS_LATEST("channel-virtio"); + DO_TEST_CAPS_LATEST("channel-virtio-state"); + DO_TEST_CAPS_LATEST("channel-virtio-auto"); + DO_TEST_CAPS_LATEST("channel-virtio-autoassign"); + DO_TEST_CAPS_LATEST("channel-virtio-autoadd"); + DO_TEST_CAPS_LATEST("console-virtio"); + DO_TEST_CAPS_LATEST("console-virtio-many"); DO_TEST_CAPS_ARCH_LATEST("console-virtio-ccw", "s390x"); DO_TEST_CAPS_LATEST("console-virtio-unix"); DO_TEST_CAPS_ARCH_LATEST("console-sclp", "s390x"); driver.config->spiceTLS = 1; - DO_TEST("channel-spicevmc", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("channel-spicevmc"); driver.config->spiceTLS = 0; DO_TEST_CAPS_LATEST("channel-qemu-vdagent"); DO_TEST_CAPS_LATEST("channel-qemu-vdagent-features"); - DO_TEST("channel-virtio-default", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST_NOCAPS("channel-virtio-unix"); - - DO_TEST("smartcard-host", - QEMU_CAPS_CCID_EMULATED); - DO_TEST("smartcard-host-certificates", - QEMU_CAPS_CCID_EMULATED); - DO_TEST("smartcard-host-certificates-database", - QEMU_CAPS_CCID_EMULATED); - DO_TEST("smartcard-passthrough-tcp", - QEMU_CAPS_CCID_PASSTHRU); - DO_TEST("smartcard-passthrough-spicevmc", - QEMU_CAPS_CCID_PASSTHRU, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("smartcard-controller", - QEMU_CAPS_CCID_EMULATED); + DO_TEST_CAPS_LATEST("channel-virtio-default"); + DO_TEST_CAPS_LATEST("channel-virtio-unix"); + + DO_TEST_CAPS_LATEST("smartcard-host"); + DO_TEST_CAPS_LATEST("smartcard-host-certificates"); + DO_TEST_CAPS_LATEST("smartcard-host-certificates-database"); + DO_TEST_CAPS_LATEST("smartcard-passthrough-tcp"); + DO_TEST_CAPS_LATEST("smartcard-passthrough-spicevmc"); + DO_TEST_CAPS_LATEST("smartcard-controller"); DO_TEST_CAPS_LATEST("smartcard-passthrough-unix"); - DO_TEST("chardev-reconnect", - QEMU_CAPS_CHARDEV_RECONNECT, - QEMU_CAPS_USB_REDIR, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_EGD, - QEMU_CAPS_CCID_PASSTHRU); - DO_TEST_PARSE_ERROR("chardev-reconnect-invalid-timeout", - QEMU_CAPS_CHARDEV_RECONNECT); - DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", - QEMU_CAPS_CHARDEV_RECONNECT); + DO_TEST_CAPS_LATEST("chardev-reconnect"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("chardev-reconnect-invalid-timeout"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("chardev-reconnect-generated-path"); DO_TEST_CAPS_LATEST("usb-controller-implicit-isapc"); DO_TEST_CAPS_LATEST("usb-controller-implicit-i440fx"); @@ -1538,23 +1446,14 @@ mymain(void) ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LAST, ARG_END); - DO_TEST_NOCAPS("usb-none"); - - DO_TEST("usb-controller-piix3", - QEMU_CAPS_PIIX3_USB_UHCI); - DO_TEST("usb-controller-ich9-ehci-addr", - QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST("usb-controller-ich9-companion", - QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_PARSE_ERROR("usb-controller-ich9-no-companion", - QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST("usb-controller-ich9-autoassign", - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_USB_HUB); - DO_TEST("usb1-usb2", - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_ICH9_USB_EHCI1); + DO_TEST_CAPS_LATEST("usb-none"); + + DO_TEST_CAPS_LATEST("usb-controller-piix3"); + DO_TEST_CAPS_LATEST("usb-controller-ich9-ehci-addr"); + DO_TEST_CAPS_LATEST("usb-controller-ich9-companion"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-ich9-no-companion"); + DO_TEST_CAPS_LATEST("usb-controller-ich9-autoassign"); + DO_TEST_CAPS_LATEST("usb1-usb2"); DO_TEST_CAPS_LATEST("usb-controller-nec-xhci"); DO_TEST_FULL("usb-controller-nec-xhci-unavailable", ".x86_64-latest", @@ -1568,60 +1467,30 @@ mymain(void) DO_TEST_CAPS_LATEST("usb-controller-qemu-xhci"); DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-qemu-xhci-limit"); - DO_TEST_NOCAPS("input-usbmouse-addr"); - DO_TEST("usb-hub", - QEMU_CAPS_USB_HUB); - DO_TEST("usb-hub-autoadd", - QEMU_CAPS_USB_HUB); - DO_TEST("usb-hub-autoadd-deluxe", - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-hub-conflict", - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-hub-nonexistent", - QEMU_CAPS_USB_HUB); - DO_TEST("usb-port-missing", - QEMU_CAPS_USB_HUB); - DO_TEST_FAILURE("usb-bus-missing", - QEMU_CAPS_USB_HUB); - DO_TEST("usb-ports", - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-ports-out-of-range", - QEMU_CAPS_USB_HUB); - DO_TEST("usb-port-autoassign", - QEMU_CAPS_USB_HUB); - DO_TEST("usb-redir", - QEMU_CAPS_USB_HUB, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_USB_REDIR, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("usb-redir-boot", - QEMU_CAPS_USB_HUB, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_USB_REDIR, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("usb-redir-filter", - QEMU_CAPS_USB_HUB, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_USB_REDIR, - QEMU_CAPS_SPICE, - QEMU_CAPS_USB_REDIR_FILTER, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("usb-redir-filter-version", - QEMU_CAPS_USB_REDIR, - QEMU_CAPS_SPICE, - QEMU_CAPS_USB_REDIR_FILTER, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("input-usbmouse-addr"); + DO_TEST_CAPS_LATEST("usb-hub"); + DO_TEST_CAPS_LATEST("usb-hub-autoadd"); + DO_TEST_CAPS_LATEST("usb-hub-autoadd-deluxe"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-hub-conflict"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-hub-nonexistent"); + DO_TEST_CAPS_LATEST("usb-port-missing"); + DO_TEST_CAPS_LATEST_FAILURE("usb-bus-missing"); + DO_TEST_CAPS_LATEST("usb-ports"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-ports-out-of-range"); + DO_TEST_CAPS_LATEST("usb-port-autoassign"); + DO_TEST_CAPS_LATEST("usb-redir"); + DO_TEST_CAPS_LATEST("usb-redir-boot"); + DO_TEST_CAPS_LATEST("usb-redir-filter"); + DO_TEST_CAPS_LATEST("usb-redir-filter-version"); DO_TEST_CAPS_LATEST("usb-redir-unix"); - DO_TEST_PARSE_ERROR_NOCAPS("usb-none-other"); - DO_TEST_PARSE_ERROR("usb-none-hub", - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR_NOCAPS("usb-none-usbtablet"); - - DO_TEST_NOCAPS("smbios"); - DO_TEST_PARSE_ERROR_NOCAPS("smbios-date"); - DO_TEST_PARSE_ERROR_NOCAPS("smbios-uuid-match"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-none-other"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-none-hub"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-none-usbtablet"); + DO_TEST_CAPS_LATEST("usb-long-port-path"); + + DO_TEST_CAPS_LATEST("smbios"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("smbios-date"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("smbios-uuid-match"); DO_TEST_CAPS_LATEST("smbios-type-fwcfg"); DO_TEST_CAPS_LATEST("watchdog"); @@ -1630,9 +1499,9 @@ mymain(void) DO_TEST_CAPS_LATEST("watchdog-injectnmi"); DO_TEST_CAPS_LATEST("watchdog-q35-multiple"); DO_TEST_CAPS_ARCH_LATEST("watchdog-diag288", "s390x"); - DO_TEST_NOCAPS("balloon-device"); - DO_TEST("balloon-device-deflate", - QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); + + DO_TEST_CAPS_LATEST("balloon-device"); + DO_TEST_CAPS_LATEST("balloon-device-deflate"); DO_TEST_CAPS_ARCH_LATEST("balloon-ccw-deflate", "s390x"); DO_TEST_FULL("balloon-mmio-deflate", ".aarch64-latest", ARG_CAPS_ARCH, "aarch64", @@ -1641,10 +1510,10 @@ mymain(void) QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_LAST, ARG_END); - DO_TEST("balloon-device-deflate-off", - QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); - DO_TEST_NOCAPS("balloon-device-auto"); - DO_TEST_NOCAPS("balloon-device-period"); + DO_TEST_CAPS_LATEST("balloon-device-deflate-off"); + DO_TEST_CAPS_LATEST("balloon-device-auto"); + DO_TEST_CAPS_LATEST("balloon-device-period"); + DO_TEST_CAPS_VER("sound-device", "4.2.0"); DO_TEST_CAPS_LATEST("sound-device"); DO_TEST_CAPS_LATEST("fs9p"); @@ -1653,33 +1522,24 @@ mymain(void) DO_TEST_CAPS_LATEST("hostdev-usb-address"); DO_TEST_CAPS_LATEST("hostdev-usb-address-device"); DO_TEST_CAPS_LATEST("hostdev-usb-address-device-boot"); - DO_TEST_PARSE_ERROR_NOCAPS("hostdev-usb-duplicate"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-usb-duplicate"); DO_TEST_CAPS_LATEST("hostdev-pci-address"); DO_TEST_CAPS_LATEST("hostdev-pci-address-device"); - DO_TEST_PARSE_ERROR("hostdev-pci-duplicate", - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("hostdev-vfio", - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("hostdev-vfio-multidomain", - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("hostdev-mdev-precreated", - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_PARSE_ERROR("hostdev-mdev-src-address-invalid", - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address", - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_PARSE_ERROR("hostdev-mdev-duplicate", - QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-pci-duplicate"); + DO_TEST_CAPS_LATEST("hostdev-vfio"); + DO_TEST_CAPS_LATEST("hostdev-vfio-multidomain"); + DO_TEST_CAPS_LATEST("hostdev-mdev-precreated"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-src-address-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-invalid-target-address"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-duplicate"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-opengl"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-egl-headless"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc-egl-headless"); - DO_TEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics", - QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-display-ramfb-multiple"); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch", - QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci", "s390x"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-invalid-uid-valid-fid", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-multidomain-many", "s390x"); @@ -1692,9 +1552,9 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-set-zero", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-ccw-memballoon", "s390x"); - DO_TEST("pci-rom", QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_NOCAPS("pci-rom-disabled"); - DO_TEST_NOCAPS("pci-rom-disabled-invalid"); + DO_TEST_CAPS_LATEST("pci-rom"); + DO_TEST_CAPS_LATEST("pci-rom-disabled"); + DO_TEST_CAPS_LATEST("pci-rom-disabled-invalid"); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); @@ -1720,8 +1580,8 @@ mymain(void) ARG_MIGRATE_FD, 7); DO_TEST_CAPS_LATEST("qemu-ns"); - DO_TEST_NOCAPS("qemu-ns-no-env"); - DO_TEST_NOCAPS("qemu-ns-alt"); + DO_TEST_CAPS_LATEST("qemu-ns-no-env"); + DO_TEST_CAPS_LATEST("qemu-ns-alt"); DO_TEST_CAPS_LATEST("iothreads-ids"); DO_TEST_CAPS_LATEST("iothreads-ids-partial"); @@ -1751,12 +1611,12 @@ mymain(void) DO_TEST_CAPS_VER("cpu-fallback", "5.2.0"); DO_TEST_CAPS_VER("cpu-fallback", "8.0.0"); - DO_TEST_NOCAPS("cpu-numa1"); - DO_TEST_NOCAPS("cpu-numa2"); - DO_TEST_NOCAPS("cpu-numa-no-memory-element"); - DO_TEST_PARSE_ERROR_NOCAPS("cpu-numa3"); - DO_TEST_NOCAPS("cpu-numa-disjoint"); - DO_TEST_NOCAPS("cpu-numa-memshared"); + DO_TEST_CAPS_LATEST("cpu-numa1"); + DO_TEST_CAPS_LATEST("cpu-numa2"); + DO_TEST_CAPS_LATEST("cpu-numa-no-memory-element"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("cpu-numa3"); + DO_TEST_CAPS_LATEST("cpu-numa-disjoint"); + DO_TEST_CAPS_LATEST("cpu-numa-memshared"); /* host-model cpu expansion depends on the cpu reported by qemu and thus * we invoke it for all real capability dumps we have */ @@ -1804,8 +1664,8 @@ mymain(void) /* this test case uses 'cpu="host-model"', run it with Haswell host cpu to prevent test case churn */ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-host-model-vendor", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); - DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); - DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("cpu-host-passthrough"); + DO_TEST_CAPS_LATEST_FAILURE("cpu-qemu-host-passthrough"); DO_TEST_CAPS_ARCH_LATEST("cpu-s390-zEC12", "s390x"); DO_TEST_CAPS_ARCH_LATEST("cpu-s390-features", "s390x"); @@ -1819,10 +1679,10 @@ mymain(void) DO_TEST_CAPS_LATEST("cpu-translation"); - DO_TEST_NOCAPS("memtune"); - DO_TEST_NOCAPS("memtune-unlimited"); - DO_TEST_NOCAPS("blkiotune"); - DO_TEST_NOCAPS("blkiotune-device"); + DO_TEST_CAPS_LATEST("memtune"); + DO_TEST_CAPS_LATEST("memtune-unlimited"); + DO_TEST_CAPS_LATEST("blkiotune"); + DO_TEST_CAPS_LATEST("blkiotune-device"); DO_TEST_CAPS_LATEST("cputune"); DO_TEST_CAPS_LATEST("cputune-zero-shares"); DO_TEST_CAPS_LATEST_PARSE_ERROR("cputune-iothreadsched-toomuch"); @@ -1854,33 +1714,32 @@ mymain(void) DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-strict"); DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-restrictive"); - DO_TEST_NOCAPS("numad"); - DO_TEST_NOCAPS("numad-auto-vcpu-static-numatune"); - DO_TEST_PARSE_ERROR_NOCAPS("numad-auto-vcpu-static-numatune-no-nodeset"); - DO_TEST_NOCAPS("numad-auto-memory-vcpu-cpuset"); - DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement"); - DO_TEST_NOCAPS("numad-static-memory-auto-vcpu"); + DO_TEST_CAPS_LATEST("numad"); + DO_TEST_CAPS_LATEST("numad-auto-vcpu-static-numatune"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numad-auto-vcpu-static-numatune-no-nodeset"); + DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset"); + DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement"); + DO_TEST_CAPS_LATEST("numad-static-memory-auto-vcpu"); DO_TEST_CAPS_LATEST("blkdeviotune"); DO_TEST_CAPS_LATEST("blkdeviotune-max"); DO_TEST_CAPS_LATEST("blkdeviotune-group-num"); DO_TEST_CAPS_LATEST("blkdeviotune-max-length"); - DO_TEST("multifunction-pci-device", - QEMU_CAPS_SCSI_LSI); - - DO_TEST_NOCAPS("seclabel-dynamic"); - DO_TEST_NOCAPS("seclabel-dynamic-baselabel"); - DO_TEST_NOCAPS("seclabel-dynamic-override"); - DO_TEST_NOCAPS("seclabel-dynamic-labelskip"); - DO_TEST_NOCAPS("seclabel-dynamic-relabel"); - DO_TEST_NOCAPS("seclabel-static"); - DO_TEST_NOCAPS("seclabel-static-relabel"); - DO_TEST_NOCAPS("seclabel-static-labelskip"); - DO_TEST_NOCAPS("seclabel-none"); - DO_TEST_NOCAPS("seclabel-dac-none"); - DO_TEST_PARSE_ERROR_NOCAPS("seclabel-multiple"); - DO_TEST_PARSE_ERROR_NOCAPS("seclabel-device-duplicates"); - DO_TEST_PARSE_ERROR_NOCAPS("seclabel-device-relabel-invalid"); + DO_TEST_CAPS_LATEST("multifunction-pci-device"); + + DO_TEST_CAPS_LATEST("seclabel-dynamic"); + DO_TEST_CAPS_LATEST("seclabel-dynamic-baselabel"); + DO_TEST_CAPS_LATEST("seclabel-dynamic-override"); + DO_TEST_CAPS_LATEST("seclabel-dynamic-labelskip"); + DO_TEST_CAPS_LATEST("seclabel-dynamic-relabel"); + DO_TEST_CAPS_LATEST("seclabel-static"); + DO_TEST_CAPS_LATEST("seclabel-static-relabel"); + DO_TEST_CAPS_LATEST("seclabel-static-labelskip"); + DO_TEST_CAPS_LATEST("seclabel-none"); + DO_TEST_CAPS_LATEST("seclabel-dac-none"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("seclabel-multiple"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("seclabel-device-duplicates"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("seclabel-device-relabel-invalid"); DO_TEST_CAPS_LATEST_PPC64("pseries-basic"); DO_TEST_CAPS_LATEST_PPC64("pseries-vio"); @@ -1930,7 +1789,7 @@ mymain(void) DO_TEST_CAPS_ARCH_VER("pseries-features", "ppc64", "4.2.0"); DO_TEST_CAPS_LATEST_PPC64("pseries-features"); - DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-invalid-machine"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pseries-features-invalid-machine"); DO_TEST_CAPS_LATEST_PPC64("pseries-serial-native"); DO_TEST_CAPS_LATEST_PPC64("pseries-serial+console-native"); @@ -1939,7 +1798,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PPC64("pseries-serial-usb"); DO_TEST_CAPS_LATEST_PPC64("pseries-console-native"); DO_TEST_CAPS_LATEST_PPC64("pseries-console-virtio"); - DO_TEST_PARSE_ERROR_NOCAPS("pseries-serial-invalid-machine"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pseries-serial-invalid-machine"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-spaprvio-invalid", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-native", "aarch64"); @@ -1987,26 +1846,15 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("video-multiple-primaries"); - DO_TEST("virtio-rng-default", - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("virtio-rng-random", - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("virtio-rng-egd", - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_EGD); + DO_TEST_CAPS_LATEST("virtio-rng-default"); + DO_TEST_CAPS_LATEST("virtio-rng-random"); + DO_TEST_CAPS_LATEST("virtio-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", "5.2.0"); DO_TEST_CAPS_LATEST("virtio-rng-egd-unix"); - DO_TEST("virtio-rng-multiple", - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_EGD, - QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_PARSE_ERROR("virtio-rng-egd-crash", - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_EGD); + DO_TEST_CAPS_LATEST("virtio-rng-multiple"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-rng-egd-crash"); DO_TEST_CAPS_ARCH_LATEST("virtio-rng-ccw", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); @@ -2025,8 +1873,7 @@ mymain(void) DO_TEST_CAPS_LATEST("tpm-passthrough"); DO_TEST_CAPS_LATEST("tpm-passthrough-crb"); - DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", - QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); + DO_TEST_CAPS_LATEST_PARSE_ERROR("tpm-no-backend-invalid"); DO_TEST_CAPS_LATEST("tpm-emulator"); DO_TEST_CAPS_LATEST("tpm-emulator-tpm2"); DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc"); @@ -2042,70 +1889,28 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("tpm-emulator-tpm2"); unsetenv(TEST_TPM_ENV_VAR); - DO_TEST_PARSE_ERROR_NOCAPS("pci-domain-invalid"); - DO_TEST_PARSE_ERROR_NOCAPS("pci-bus-invalid"); - DO_TEST_PARSE_ERROR_NOCAPS("pci-slot-invalid"); - DO_TEST_PARSE_ERROR_NOCAPS("pci-function-invalid"); - - DO_TEST("pci-bridge", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("pci-autoadd-addr", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("pci-autoadd-idx", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("pci-autofill-addr", QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("pci-many", - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("pci-bridge-many-disks", - QEMU_CAPS_DEVICE_PCI_BRIDGE); - DO_TEST("pcie-root", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_DEVICE_QXL); - DO_TEST_PARSE_ERROR("q35-dmi-bad-address1", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420); - DO_TEST_PARSE_ERROR("q35-dmi-bad-address2", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-domain-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-bus-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-slot-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-function-invalid"); + + DO_TEST_CAPS_LATEST("pci-bridge"); + DO_TEST_CAPS_LATEST("pci-autoadd-addr"); + DO_TEST_CAPS_LATEST("pci-autoadd-idx"); + DO_TEST_CAPS_LATEST("pci-autofill-addr"); + DO_TEST_CAPS_LATEST("pci-many"); + DO_TEST_CAPS_LATEST("pci-bridge-many-disks"); + DO_TEST_CAPS_LATEST("pcie-root"); + DO_TEST_CAPS_LATEST("q35"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("q35-dmi-bad-address1"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("q35-dmi-bad-address2"); DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable"); DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable"); DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5.1.0"); DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-enable", "5.1.0"); - DO_TEST("q35-usb2", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("q35-usb2-multi", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("q35-usb2-reorder", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_DEVICE_QXL); + DO_TEST_CAPS_LATEST("q35-usb2"); + DO_TEST_CAPS_LATEST("q35-usb2-multi"); + DO_TEST_CAPS_LATEST("q35-usb2-reorder"); /* Note: The real caps versions of the following tests based on qemu-4.2.0 * were added as a comparison point between fake caps testing and real caps @@ -2124,117 +1929,61 @@ mymain(void) DO_TEST_CAPS_LATEST("q35-virt-manager-basic"); /* 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_QXL); + DO_TEST_CAPS_LATEST("pcie-root-port"); /* Make sure the default model for PCIe Root Ports is picked correctly * based on QEMU binary capabilities. We use x86/q35 for the test, but * any PCIe machine type (such as aarch64/virt) will behave the same */ - DO_TEST("pcie-root-port-model-generic", - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_IOH3420); - DO_TEST("pcie-root-port-model-ioh3420", - QEMU_CAPS_DEVICE_IOH3420); + DO_TEST_CAPS_LATEST("pcie-root-port-model-generic"); + DO_TEST_CAPS_LATEST("pcie-root-port-model-ioh3420"); DO_TEST_CAPS_LATEST("pcie-root-port-nohotplug"); - DO_TEST("autoindex", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_X3130_UPSTREAM, - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_CAPS_LATEST("autoindex"); /* Make sure the user can always override libvirt's default device * placement policy by providing an explicit PCI address */ - DO_TEST("q35-pci-force-address", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_HDA_DUPLEX); - - DO_TEST_PARSE_ERROR("q35-wrong-root", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_DEVICE_QXL); - DO_TEST_PARSE_ERROR_NOCAPS("440fx-wrong-root"); - DO_TEST_PARSE_ERROR_NOCAPS("440fx-ide-address-conflict"); - - DO_TEST_PARSE_ERROR("pcie-root-port-too-many", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - 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_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_QXL); - - DO_TEST("pci-expander-bus", - QEMU_CAPS_DEVICE_PXB); - DO_TEST_PARSE_ERROR("pci-expander-bus-bad-node", - QEMU_CAPS_DEVICE_PXB); - DO_TEST_PARSE_ERROR("pci-expander-bus-bad-machine", - QEMU_CAPS_DEVICE_PXB); - DO_TEST_PARSE_ERROR("pci-expander-bus-bad-bus", - QEMU_CAPS_DEVICE_PXB); - - DO_TEST("pcie-expander-bus", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_X3130_UPSTREAM, - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, - QEMU_CAPS_DEVICE_PXB_PCIE); - DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-machine", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_X3130_UPSTREAM, - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, - QEMU_CAPS_DEVICE_PXB_PCIE); - DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-bus", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_PXB_PCIE); + DO_TEST_CAPS_LATEST("q35-pci-force-address"); + + DO_TEST_CAPS_LATEST_PARSE_ERROR("q35-wrong-root"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("440fx-wrong-root"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("440fx-ide-address-conflict"); + + DO_TEST_CAPS_LATEST_PARSE_ERROR("pcie-root-port-too-many"); + + DO_TEST_CAPS_LATEST("pcie-switch-upstream-port"); + DO_TEST_CAPS_LATEST("pcie-switch-downstream-port"); + + DO_TEST_CAPS_LATEST("pci-expander-bus"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-expander-bus-bad-node"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-expander-bus-bad-machine"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-expander-bus-bad-bus"); + + DO_TEST_CAPS_LATEST("pcie-expander-bus"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pcie-expander-bus-bad-machine"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pcie-expander-bus-bad-bus"); DO_TEST_CAPS_ARCH_LATEST("pcie-expander-bus-aarch64", "aarch64"); DO_TEST_CAPS_LATEST("hostdev-scsi-lsi"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); DO_TEST_CAPS_ARCH_LATEST("hostdev-scsi-vhost-scsi-ccw", "s390x"); - DO_TEST("hostdev-scsi-vhost-scsi-pci", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_VHOST_SCSI); + DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pci"); DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-vhost-scsi-pci-boot-fail"); DO_TEST_CAPS_VER("hostdev-scsi-vhost-scsi-pcie", "4.2.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pcie"); - DO_TEST_PARSE_ERROR("hostdev-scsi-duplicate", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_VHOST_SCSI); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-duplicate"); DO_TEST_CAPS_LATEST("mlock-on"); DO_TEST_CAPS_LATEST("mlock-off"); - DO_TEST_PARSE_ERROR_NOCAPS("pci-bridge-negative-index-invalid"); - DO_TEST_PARSE_ERROR_NOCAPS("pci-bridge-duplicate-index"); - DO_TEST_PARSE_ERROR_NOCAPS("pci-root-nonzero-index"); - DO_TEST_PARSE_ERROR_NOCAPS("pci-root-address"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-bridge-negative-index-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-bridge-duplicate-index"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-root-nonzero-index"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("pci-root-address"); - DO_TEST("hotplug-base", - QEMU_CAPS_KVM, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("hotplug-base"); - DO_TEST_NOCAPS("pcihole64"); - DO_TEST("pcihole64-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_DEVICE_QXL); + DO_TEST_CAPS_LATEST("pcihole64"); + DO_TEST_CAPS_LATEST("pcihole64-q35"); DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-nodevs", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-basic", "aarch64"); @@ -2311,8 +2060,8 @@ mymain(void) qemuTestSetHostArch(&driver, VIR_ARCH_NONE); - DO_TEST("kvm-pit-delay", QEMU_CAPS_KVM_PIT_TICK_POLICY); - DO_TEST("kvm-pit-discard", QEMU_CAPS_KVM_PIT_TICK_POLICY); + DO_TEST_CAPS_LATEST("kvm-pit-delay"); + DO_TEST_CAPS_LATEST("kvm-pit-discard"); DO_TEST_CAPS_LATEST("panic"); DO_TEST_CAPS_LATEST("panic-double"); @@ -2331,13 +2080,13 @@ mymain(void) DO_TEST_CAPS_LATEST_FAILURE("shmem-invalid-address"); DO_TEST_CAPS_LATEST_FAILURE("shmem-small-size"); DO_TEST_CAPS_LATEST_PARSE_ERROR("shmem-msi-only"); - DO_TEST("cpu-host-passthrough-features", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("cpu-host-passthrough-features"); - DO_TEST_FAILURE_NOCAPS("memory-align-fail"); - DO_TEST_PARSE_ERROR("memory-hotplug-nonuma", QEMU_CAPS_DEVICE_PC_DIMM); - DO_TEST_PARSE_ERROR_NOCAPS("memory-hotplug-invalid-targetnode"); - DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM); - DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM); + DO_TEST_CAPS_LATEST_FAILURE("memory-align-fail"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("memory-hotplug-nonuma"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("memory-hotplug-invalid-targetnode"); + DO_TEST_CAPS_LATEST("memory-hotplug"); + DO_TEST_CAPS_LATEST("memory-hotplug-dimm"); DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr"); DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-ppc64-nonuma", "ppc64"); DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-ppc64-nonuma-abi-update", "ppc64"); @@ -2373,19 +2122,18 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-net-s390", "s390x"); DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x"); DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-multiple-disks-nets-s390", "s390x"); - DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-char-invalid"); - DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-len-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("machine-loadparm-s390-char-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("machine-loadparm-s390-len-invalid"); - DO_TEST_NOCAPS("qemu-ns-domain-ns0"); - DO_TEST_NOCAPS("qemu-ns-domain-commandline"); - DO_TEST_NOCAPS("qemu-ns-domain-commandline-ns0"); - DO_TEST_NOCAPS("qemu-ns-commandline"); - DO_TEST_NOCAPS("qemu-ns-commandline-ns0"); - DO_TEST_NOCAPS("qemu-ns-commandline-ns1"); + DO_TEST_CAPS_LATEST("qemu-ns-domain-ns0"); + DO_TEST_CAPS_LATEST("qemu-ns-domain-commandline"); + DO_TEST_CAPS_LATEST("qemu-ns-domain-commandline-ns0"); + DO_TEST_CAPS_LATEST("qemu-ns-commandline"); + DO_TEST_CAPS_LATEST("qemu-ns-commandline-ns0"); + DO_TEST_CAPS_LATEST("qemu-ns-commandline-ns1"); - DO_TEST("virtio-input", QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET); - DO_TEST("virtio-input-passthrough", QEMU_CAPS_VIRTIO_INPUT_HOST); + DO_TEST_CAPS_LATEST("virtio-input"); + DO_TEST_CAPS_LATEST("virtio-input-passthrough"); DO_TEST_CAPS_LATEST("input-linux"); @@ -2407,12 +2155,9 @@ mymain(void) DO_TEST_CAPS_LATEST("name-escape"); - DO_TEST("usb-long-port-path", - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid", - QEMU_CAPS_USB_HUB); + DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-too-long-port-path-invalid"); - DO_TEST_NOCAPS("acpi-table"); + DO_TEST_CAPS_LATEST("acpi-table"); DO_TEST_CAPS_LATEST("intel-iommu"); DO_TEST_CAPS_LATEST("intel-iommu-caching-mode"); @@ -2470,24 +2215,24 @@ mymain(void) DO_TEST_CAPS_LATEST("memfd-memory-numa"); DO_TEST_CAPS_LATEST("memfd-memory-default-hugepage"); - DO_TEST("cpu-check-none", QEMU_CAPS_KVM); - DO_TEST("cpu-check-partial", QEMU_CAPS_KVM); - DO_TEST("cpu-check-full", QEMU_CAPS_KVM); - DO_TEST("cpu-check-default-none", QEMU_CAPS_KVM); - DO_TEST_NOCAPS("cpu-check-default-none2"); + DO_TEST_CAPS_LATEST("cpu-check-none"); + DO_TEST_CAPS_LATEST("cpu-check-partial"); + DO_TEST_CAPS_LATEST("cpu-check-full"); + DO_TEST_CAPS_LATEST("cpu-check-default-none"); + DO_TEST_CAPS_LATEST("cpu-check-default-none2"); /* this test case uses 'cpu="host-model"', run it with Haswell host cpu to prevent test case churn */ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-check-default-partial", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); - DO_TEST("cpu-check-default-partial2", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("cpu-check-default-partial2"); - DO_TEST("cpu-cache-disable", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("cpu-cache-disable"); /* this test case uses 'cpu="host-model"', run it with Haswell host cpu to prevent test case churn */ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-cache-disable3", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); - DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM); - DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("cpu-cache-passthrough3", QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", QEMU_CAPS_KVM); - DO_TEST("vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO); + DO_TEST_CAPS_LATEST("cpu-cache-passthrough"); + DO_TEST_CAPS_LATEST("cpu-cache-emulate-l3"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("cpu-cache-emulate-l2"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("cpu-cache-passthrough3"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("cpu-cache-passthrough-l3"); + DO_TEST_CAPS_LATEST("vmcoreinfo"); DO_TEST_CAPS_LATEST("user-aliases"); DO_TEST_CAPS_LATEST("user-aliases2"); @@ -2580,11 +2325,11 @@ mymain(void) /* HVF guests should not work on Linux with KVM */ DO_TEST_CAPS_LATEST_PARSE_ERROR("hvf-x86_64-q35-headless"); - DO_TEST("cpu-phys-bits-passthrough", QEMU_CAPS_KVM); - DO_TEST("cpu-phys-bits-emulate", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("cpu-phys-bits-passthrough"); + DO_TEST_CAPS_LATEST("cpu-phys-bits-emulate"); /* this test case uses 'cpu="host"', run it with Haswell host cpu to prevent test case churn */ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-phys-bits-emulate2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); - DO_TEST_PARSE_ERROR("cpu-phys-bits-passthrough2", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST_PARSE_ERROR("cpu-phys-bits-passthrough2"); DO_TEST_CAPS_LATEST("cpu-phys-bits-limit"); DO_TEST_CAPS_LATEST("cpu-phys-bits-emulate-bare"); -- 2.41.0

Now that all tests were converted to use real capabilities we can drop x86_64 from the tooling to create fake capabilities. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutilsqemu.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8996f846bc..cde633e075 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -27,21 +27,15 @@ static virCPUDef *cpuPower10; static const char *qemu_emulators[VIR_ARCH_LAST] = { - [VIR_ARCH_X86_64] = "/usr/bin/qemu-system-x86_64", -}; - -static const char *const x86_64_machines[] = { - "pc", "q35", NULL }; static const char *const *qemu_machines[VIR_ARCH_LAST] = { - [VIR_ARCH_X86_64] = x86_64_machines, }; static const char *qemu_default_ram_id[VIR_ARCH_LAST] = { - [VIR_ARCH_X86_64] = "pc.ram", }; + char * virFindFileInPath(const char *file) { -- 2.41.0

The status XML doesn't require any capabilities to be parsed and formatted back. Remove all qemuCaps related code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemustatusxml2xmltest.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/tests/qemustatusxml2xmltest.c b/tests/qemustatusxml2xmltest.c index c689ab3b03..418a724b94 100644 --- a/tests/qemustatusxml2xmltest.c +++ b/tests/qemustatusxml2xmltest.c @@ -23,13 +23,7 @@ testCompareStatusXMLToXMLFiles(const void *opaque) g_autofree char *actual = NULL; int ret = -1; - if (testQemuInfoInitArgs((struct testQemuInfo *) data) < 0) - return -1; - - virFileCacheClear(driver.qemuCapsCache); - - if (qemuTestCapsCacheInsert(driver.qemuCapsCache, data->qemuCaps) < 0) - return -1; + /* this test suite doesn't yet need testQemuInfoInitArgs() */ if (!(obj = virDomainObjParseFile(data->infile, driver.xmlopt, VIR_DOMAIN_DEF_PARSE_STATUS | @@ -76,15 +70,8 @@ static int mymain(void) { int ret = 0; - g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps(); - g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref); g_autoptr(virConnect) conn = NULL; - struct testQemuConf testConf = { .capslatest = capslatest, - .capscache = capscache, - .qapiSchemaCache = NULL }; - - if (!capslatest) - return EXIT_FAILURE; + struct testQemuConf testConf = { NULL, NULL, NULL }; if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; -- 2.41.0

Remove all the code for adding fake machines into the testing capability cache as we no longer have any machines in it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutilsqemu.c | 144 +++--------------------------------------- 1 file changed, 9 insertions(+), 135 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index cde633e075..05b28699c8 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -25,17 +25,6 @@ static virCPUDef *cpuPower8; static virCPUDef *cpuPower9; static virCPUDef *cpuPower10; - -static const char *qemu_emulators[VIR_ARCH_LAST] = { -}; - -static const char *const *qemu_machines[VIR_ARCH_LAST] = { -}; - -static const char *qemu_default_ram_id[VIR_ARCH_LAST] = { -}; - - char * virFindFileInPath(const char *file) { @@ -120,44 +109,10 @@ virHostCPUX86GetCPUID(uint32_t leaf, } } -static int -testQemuAddGuest(virCaps *caps, - virArch arch) -{ - int nmachines; - virCapsGuestMachine **machines = NULL; - virCapsGuest *guest; - virArch emu_arch = arch; - - if (qemu_emulators[emu_arch] == NULL) - return 0; - - machines = virCapabilitiesAllocMachines(qemu_machines[emu_arch], &nmachines); - guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, - arch, qemu_emulators[emu_arch], - NULL, nmachines, machines); - - if (arch == VIR_ARCH_I686 || - arch == VIR_ARCH_X86_64) - virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_CPUSELECTION); - - virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, - NULL, NULL, 0, NULL); - - machines = virCapabilitiesAllocMachines(qemu_machines[emu_arch], &nmachines); - virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - qemu_emulators[emu_arch], - NULL, nmachines, machines); - - return 0; -} - - virCaps * testQemuCapsInit(void) { virCaps *caps; - size_t i; if (!(caps = virCapabilitiesNew(VIR_ARCH_X86_64, false, false))) return NULL; @@ -173,11 +128,6 @@ testQemuCapsInit(void) if (!(caps->host.numa = virCapabilitiesHostNUMANewHost())) goto cleanup; - for (i = 0; i < VIR_ARCH_LAST; i++) { - if (testQemuAddGuest(caps, i) < 0) - goto cleanup; - } - if (virTestGetDebug()) { g_autofree char *caps_str = NULL; @@ -291,46 +241,6 @@ void qemuTestDriverFree(virQEMUDriver *driver) } -static void -qemuTestCapsPopulateFakeMachines(virQEMUCaps *caps, - virArch arch) -{ - size_t i; - - virQEMUCapsSetArch(caps, arch); - - for (i = 0; qemu_machines[arch][i] != NULL; i++) { - virQEMUCapsAddMachine(caps, - VIR_DOMAIN_VIRT_QEMU, - qemu_machines[arch][i], - NULL, - "qemu64", - 0, - false, - false, - false, - qemu_default_ram_id[arch], - false, - VIR_TRISTATE_BOOL_YES); - virQEMUCapsSet(caps, QEMU_CAPS_TCG); - - virQEMUCapsAddMachine(caps, - VIR_DOMAIN_VIRT_KVM, - qemu_machines[arch][i], - NULL, - "qemu64", - 0, - false, - false, - false, - qemu_default_ram_id[arch], - false, - VIR_TRISTATE_BOOL_YES); - virQEMUCapsSet(caps, QEMU_CAPS_KVM); - } -} - - static int qemuTestCapsCacheInsertData(virFileCache *cache, const char *binary, @@ -349,53 +259,17 @@ int qemuTestCapsCacheInsert(virFileCache *cache, virQEMUCaps *caps) { - size_t i; - - if (virQEMUCapsGetArch(caps) != VIR_ARCH_NONE) { - /* all tests using real caps or architecture are expected to call: - * - * virFileCacheClear(driver.qemuCapsCache); - * - * before populating the cache; - */ - /* caps->binary is populated only for real capabilities */ - if (virQEMUCapsGetBinary(caps)) { - if (qemuTestCapsCacheInsertData(cache, virQEMUCapsGetBinary(caps), caps) < 0) - return -1; - } else { - virArch arch = virQEMUCapsGetArch(caps); - g_autoptr(virQEMUCaps) copyCaps = NULL; - virQEMUCaps *effCaps = caps; - - if (qemu_emulators[arch]) { - /* if we are dealing with fake caps we need to populate machine types */ - if (!virQEMUCapsHasMachines(caps)) { - copyCaps = effCaps = virQEMUCapsNewCopy(caps); - qemuTestCapsPopulateFakeMachines(copyCaps, arch); - } - - if (qemuTestCapsCacheInsertData(cache, qemu_emulators[arch], effCaps) < 0) - return -1; - } - } - } else { - /* in case when caps are missing or are missing architecture, we populate - * everything */ - for (i = 0; i < G_N_ELEMENTS(qemu_emulators); i++) { - g_autoptr(virQEMUCaps) tmp = NULL; - - if (qemu_emulators[i] == NULL) - continue; - - tmp = virQEMUCapsNewCopy(caps); - - qemuTestCapsPopulateFakeMachines(tmp, i); - - if (qemuTestCapsCacheInsertData(cache, qemu_emulators[i], tmp) < 0) - return -1; - } + /* At this point we support only real capabilities. */ + if (virQEMUCapsGetArch(caps) == VIR_ARCH_NONE || + !virQEMUCapsGetBinary(caps)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "missing 'arch' or 'binary' in qemuCaps to be inserted into testing cache"); + return -1; } + if (qemuTestCapsCacheInsertData(cache, virQEMUCapsGetBinary(caps), caps) < 0) + return -1; + return 0; } -- 2.41.0

Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutilsqemu.c | 2 +- tests/testutilsqemu.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 05b28699c8..bb3e1b52c5 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -109,7 +109,7 @@ virHostCPUX86GetCPUID(uint32_t leaf, } } -virCaps * +static virCaps * testQemuCapsInit(void) { virCaps *caps; diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 89d40ce9bc..2d7e2f7779 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -105,7 +105,6 @@ struct testQemuInfo { struct testQemuConf *conf; }; -virCaps *testQemuCapsInit(void); virDomainXMLOption *testQemuXMLConfInit(void); -- 2.41.0

It's no longer needed in tests as we are no longer adding fake machines. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capspriv.h | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index bd6a32b815..7b5f59e0f1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2738,7 +2738,7 @@ static const char *preferredMachines[] = G_STATIC_ASSERT(G_N_ELEMENTS(preferredMachines) == VIR_ARCH_LAST); -void +static void virQEMUCapsAddMachine(virQEMUCaps *qemuCaps, virDomainVirtType virtType, const char *name, diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index be83b13ab5..06b36d2eb8 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -103,19 +103,5 @@ virQEMUCapsStripMachineAliases(virQEMUCaps *qemuCaps); bool virQEMUCapsHasMachines(virQEMUCaps *qemuCaps); -void -virQEMUCapsAddMachine(virQEMUCaps *qemuCaps, - virDomainVirtType virtType, - const char *name, - const char *alias, - const char *defaultCPU, - int maxCpus, - bool hotplugCpus, - bool isDefault, - bool numaMemSupported, - const char *defaultRAMid, - bool deprecated, - virTristateBool acpi); - bool virQEMUCapsHaveAccel(virQEMUCaps *qemuCaps); -- 2.41.0

Now that all fake-caps testing was removed we can also remove the filling of the fake caps by cpu models. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvtest.c | 49 ---------------------------------------- 1 file changed, 49 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 99e0d3aa0d..2d06e2a0d1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -256,32 +256,6 @@ static virNWFilterDriver fakeNWFilterDriver = { }; -static int -testAddCPUModels(virQEMUCaps *caps) -{ - virArch arch = virQEMUCapsGetArch(caps); - const char *x86Models[] = { - "n270", "athlon", "pentium3", "pentium2", "pentium", - "486", "coreduo", "kvm32", "qemu32", "kvm64", - "core2duo", "phenom", "qemu64", - "Opteron_G3", "Opteron_G2", "Opteron_G1", - "Nehalem", "Penryn", "Conroe", - "Haswell-noTSX", "Haswell", - }; - - if (ARCH_IS_X86(arch)) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, x86Models, - G_N_ELEMENTS(x86Models), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0 || - virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, x86Models, - G_N_ELEMENTS(x86Models), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0) - return -1; - } - - return 0; -} - static void testUpdateQEMUCapsHostCPUModel(virQEMUCaps *qemuCaps, virArch hostArch) { @@ -289,24 +263,6 @@ testUpdateQEMUCapsHostCPUModel(virQEMUCaps *qemuCaps, virArch hostArch) virQEMUCapsUpdateHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_QEMU); } -static int -testUpdateQEMUCaps(const struct testQemuInfo *info, - virArch arch, - virCaps *caps) -{ - if (!caps) - return -1; - - virQEMUCapsSetArch(info->qemuCaps, arch); - - if (testAddCPUModels(info->qemuCaps) < 0) - return -1; - - testUpdateQEMUCapsHostCPUModel(info->qemuCaps, caps->host.arch); - - return 0; -} - static int testCheckExclusiveFlags(int flags) @@ -554,11 +510,6 @@ testCompareXMLToArgv(const void *data) if (arch == VIR_ARCH_NONE) arch = virArchFromHost(); - if (!(info->flags & FLAG_REAL_CAPS)) { - if (testUpdateQEMUCaps(info, arch, driver.caps) < 0) - goto cleanup; - } - virFileCacheClear(driver.qemuCapsCache); if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0) -- 2.41.0

The function was used only to fill the cpu models into fake capabilities, whic no longer exists. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 40 ------------------------------------ src/qemu/qemu_capabilities.h | 5 ----- 2 files changed, 45 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7b5f59e0f1..87412dd4ec 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2119,46 +2119,6 @@ bool virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) } -/* Note that this function is invoked only by test code for faking supported cpu - * models */ -int -virQEMUCapsAddCPUDefinitions(virQEMUCaps *qemuCaps, - virDomainVirtType type, - const char **name, - size_t count, - virDomainCapsCPUUsable usable) -{ - size_t i; - size_t start; - virQEMUCapsAccel *accel = virQEMUCapsGetAccel(qemuCaps, type); - qemuMonitorCPUDefs *defs = accel->cpuModels; - - if (defs) { - start = defs->ncpus; - - VIR_EXPAND_N(defs->cpus, defs->ncpus, count); - } else { - start = 0; - - if (!(defs = qemuMonitorCPUDefsNew(count))) - return -1; - - accel->cpuModels = defs; - } - - for (i = 0; i < count; i++) { - qemuMonitorCPUDefInfo *cpu = defs->cpus + start + i; - - cpu->usable = usable; - cpu->name = g_strdup(name[i]); - /* while the type name doesn't correspond with reality, this is just for fake cpu models */ - cpu->type = g_strdup(name[i]); - } - - return 0; -} - - static virDomainCapsCPUModels * virQEMUCapsCPUDefsToModels(virArch arch, qemuMonitorCPUDefs *defs, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index afc28620dd..e51d3fffdc 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -708,11 +708,6 @@ virArch virQEMUCapsGetArch(virQEMUCaps *qemuCaps); unsigned int virQEMUCapsGetVersion(virQEMUCaps *qemuCaps); const char *virQEMUCapsGetPackage(virQEMUCaps *qemuCaps); -int virQEMUCapsAddCPUDefinitions(virQEMUCaps *qemuCaps, - virDomainVirtType type, - const char **name, - size_t count, - virDomainCapsCPUUsable usable); virDomainCapsCPUModels *virQEMUCapsGetCPUModels(virQEMUCaps *qemuCaps, virDomainVirtType type, const char **modelAllowed, -- 2.41.0

On Tue, Sep 05, 2023 at 16:23:27 +0200, Peter Krempa wrote:
This series converts all outstanding test cases to use real capabilities.
In the process few cases of pointless tests or features which are supported by every version of qemu were identified and addressed.
To simplify the bulk of the conversion I've opted to simply set the most common capabilities in DO_TEST and DO_TEST_NOCAPS in addition to what the test asked for. This is done in a handful of patches and allows then a bulk conversion of many tests with no changes in the output files.
I've payed special attention to CPU tests were I've ensured that they are semantically testing what they were before.
Note: As is this breaks 'securityselinuxlabellingtest' as that test is skipped on filesystems not supporting xattr and I'm building libvirt in tmpfs to save wear on the SSD. I'll update with what changes are necessary.

On 9/5/23 16:54, Peter Krempa wrote:
On Tue, Sep 05, 2023 at 16:23:27 +0200, Peter Krempa wrote:
This series converts all outstanding test cases to use real capabilities.
In the process few cases of pointless tests or features which are supported by every version of qemu were identified and addressed.
To simplify the bulk of the conversion I've opted to simply set the most common capabilities in DO_TEST and DO_TEST_NOCAPS in addition to what the test asked for. This is done in a handful of patches and allows then a bulk conversion of many tests with no changes in the output files.
I've payed special attention to CPU tests were I've ensured that they are semantically testing what they were before.
Note: As is this breaks 'securityselinuxlabellingtest' as that test is skipped on filesystems not supporting xattr and I'm building libvirt in tmpfs to save wear on the SSD. I'll update with what changes are necessary.
With kernel-6.6 tmpfs gains support for user.* XATTRs too (among other things): https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i... Michal

On Wed, Sep 06, 2023 at 10:01:22 +0200, Michal Prívozník wrote:
On 9/5/23 16:54, Peter Krempa wrote:
On Tue, Sep 05, 2023 at 16:23:27 +0200, Peter Krempa wrote:
[...]
Note: As is this breaks 'securityselinuxlabellingtest' as that test is skipped on filesystems not supporting xattr and I'm building libvirt in tmpfs to save wear on the SSD. I'll update with what changes are necessary.
With kernel-6.6 tmpfs gains support for user.* XATTRs too (among other things):
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
Oh, cool! That means that I'll be also testing image relabelling regularly because I put throwaway images on tmpfs too. I'll have to wait a bit still though: kernel-6.4.13-200.fc38

Use the modern infrastructure to populate capabilities cache with real capabilities instead of the faked one which will be soon removed. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/securityselinuxlabeltest.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 30bd68b550..04bffe4356 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -299,7 +299,8 @@ mymain(void) { int ret = 0; int rc = testUserXattrEnabled(); - g_autoptr(virQEMUCaps) qemuCaps = NULL; + g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps(); + g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref); if (rc < 0) { VIR_TEST_VERBOSE("failed to determine xattr support"); @@ -322,12 +323,10 @@ mymain(void) if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; - qemuCaps = virQEMUCapsNew(); + qemuTestSetHostArch(&driver, VIR_ARCH_X86_64); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC); - - if (qemuTestCapsCacheInsert(driver.qemuCapsCache, qemuCaps) < 0) + if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "", + capslatest, capscache, NULL, NULL) < 0) return EXIT_FAILURE; #define DO_TEST_LABELING(name) \ -- 2.41.0

On a Tuesday in 2023, Peter Krempa wrote:
Use the modern infrastructure to populate capabilities cache with real capabilities instead of the faked one which will be soon removed.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/securityselinuxlabeltest.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano

On a Tuesday in 2023, Peter Krempa wrote:
This series converts all outstanding test cases to use real capabilities.
In the process few cases of pointless tests or features which are supported by every version of qemu were identified and addressed.
To simplify the bulk of the conversion I've opted to simply set the most common capabilities in DO_TEST and DO_TEST_NOCAPS in addition to what the test asked for. This is done in a handful of patches and allows then a bulk conversion of many tests with no changes in the output files.
I've payed special attention to CPU tests were I've ensured that they are semantically testing what they were before.
[...]
tests/qemuxml2xmltest.c | 14 +- tests/testutilsqemu.c | 159 +-- tests/testutilsqemu.h | 6 +- 550 files changed, 6870 insertions(+), 7188 deletions(-) rename tests/qemuxml2argvdata/{440fx-ide-address-conflict.err => 440fx-ide-address-conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{440fx-wrong-root.err => 440fx-wrong-root.x86_64-latest.err} (100%)
[...]
rename tests/qemuxml2xmloutdata/{usb-controller-explicit-q35.x86_64-latest.xml => usb-controller-nec-xhci.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{usb-piix3-controller.x86_64-latest.xml => usb-controller-piix3.x86_64-latest.xml} (100%)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (3)
-
Ján Tomko
-
Michal Prívozník
-
Peter Krempa