8:10 a.m.
These patches originate from my upcoming series bumping minimum qemu
version to 4.2 and are valid even without the qemu version bump.
Peter Krempa (11):
test: domaincaps: Remove old test data
qemuxml2(argv|xml)test: Drop qemu-3.1 version of
'cpu-Icelake-Server-pconfig'
qemuxml2argvtest: Drop 'qemu-4.1' versions of hyperv tests
qemuxml2argvtest: Convert 'cpu-eoi-(disabled|enabled)' cases to
VIR_TEST_CAPS_LATEST
qemuxml2argvtest: Remove qemu-4.0 versions of cpu feature test cases
qemuxml2argvtest: Convert 'net-user' case to _LATEST
qemuxml2argvtest: Make 'qemu-ns' test case more stable
qemuxml2argvtest: Move real-caps versions of cpu-host tests out of the
block setting fake host cpu
qemu: Remove qemu-4.0 version of 'cpu-translation' test case
qemucapabilitiestest: Fake proper version for 'caps_4.2.0.ppc64' case
qemucapabilitiestest: Fake proper version for 'caps_4.2.0.aarch64'
case
.../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 191 ---------------
.../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 204 ----------------
tests/domaincapsdata/qemu_2.11.0.s390x.xml | 219 -----------------
tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 191 ---------------
.../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 212 ----------------
.../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 222 -----------------
.../qemu_2.12.0-virt.aarch64.xml | 172 -------------
tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 166 -------------
tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 136 -----------
tests/domaincapsdata/qemu_2.12.0.s390x.xml | 219 -----------------
tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 212 ----------------
.../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 208 ----------------
.../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 220 -----------------
tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 138 -----------
tests/domaincapsdata/qemu_3.0.0.s390x.xml | 226 ------------------
tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 208 ----------------
.../caps_4.2.0.aarch64.replies | 4 +-
.../caps_4.2.0.aarch64.xml | 2 +-
.../caps_4.2.0.ppc64.replies | 4 +-
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 +-
...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 33 ---
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 31 ---
...gs => cpu-eoi-disabled.x86_64-latest.args} | 12 +-
tests/qemuxml2argvdata/cpu-eoi-disabled.xml | 2 +-
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 31 ---
...rgs => cpu-eoi-enabled.x86_64-latest.args} | 13 +-
tests/qemuxml2argvdata/cpu-eoi-enabled.xml | 2 +-
.../cpu-translation.x86_64-4.0.0.args | 33 ---
.../eoi-enabled.x86_64-4.0.0.args | 32 ---
.../hyperv-panic.x86_64-4.0.0.args | 31 ---
.../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 31 ---
.../kvmclock+eoi-disabled.x86_64-4.0.0.args | 32 ---
.../net-user.x86_64-4.0.0.args | 35 ---
...4.0.0.args => net-user.x86_64-latest.args} | 18 +-
.../pv-spinlock-disabled.x86_64-4.0.0.args | 32 ---
.../pv-spinlock-enabled.x86_64-4.0.0.args | 32 ---
tests/qemuxml2argvdata/qemu-ns.xml | 1 -
tests/qemuxml2argvtest.c | 24 +-
...pu-Icelake-Server-pconfig.x86_64-3.1.0.xml | 32 ---
tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 2 +-
.../qemu-ns.x86_64-latest.xml | 1 -
tests/qemuxml2xmltest.c | 1 -
43 files changed, 41 insertions(+), 3578 deletions(-)
delete mode 100644 tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.11.0.s390x.xml
delete mode 100644 tests/domaincapsdata/qemu_2.11.0.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0.s390x.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.0.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.0.0.s390x.xml
delete mode 100644 tests/domaincapsdata/qemu_3.0.0.x86_64.xml
delete mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-eoi-disabled.args
rename tests/qemuxml2argvdata/{hyperv-off.x86_64-4.0.0.args =>
cpu-eoi-disabled.x86_64-latest.args} (60%)
delete mode 100644 tests/qemuxml2argvdata/cpu-eoi-enabled.args
rename tests/qemuxml2argvdata/{eoi-disabled.x86_64-4.0.0.args =>
cpu-eoi-enabled.x86_64-latest.args} (60%)
delete mode 100644 tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
rename tests/qemuxml2argvdata/{qemu-ns.x86_64-4.0.0.args =>
net-user.x86_64-latest.args} (61%)
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
--
2.36.1
8:10 a.m.
New subject: [PATCH 01/11] test: domaincaps: Remove old test data
Remove the test data for qemu-2.11, qemu-2.12 and qemu-3.0 which are no
longer supported.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 191 ---------------
.../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 204 ----------------
tests/domaincapsdata/qemu_2.11.0.s390x.xml | 219 -----------------
tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 191 ---------------
.../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 212 ----------------
.../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 222 -----------------
.../qemu_2.12.0-virt.aarch64.xml | 172 -------------
tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 166 -------------
tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 136 -----------
tests/domaincapsdata/qemu_2.12.0.s390x.xml | 219 -----------------
tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 212 ----------------
.../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 208 ----------------
.../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 220 -----------------
tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 138 -----------
tests/domaincapsdata/qemu_3.0.0.s390x.xml | 226 ------------------
tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 208 ----------------
16 files changed, 3144 deletions(-)
delete mode 100644 tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.11.0.s390x.xml
delete mode 100644 tests/domaincapsdata/qemu_2.11.0.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0.s390x.xml
delete mode 100644 tests/domaincapsdata/qemu_2.12.0.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.0.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.0.0.s390x.xml
delete mode 100644 tests/domaincapsdata/qemu_3.0.0.x86_64.xml
diff --git a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
deleted file mode 100644
index ea9737d9ce..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-x86_64</path>
- <domain>kvm</domain>
- <machine>pc-q35-2.11</machine>
- <arch>x86_64</arch>
- <vcpu max='288'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'>
- <value>bios</value>
- <value>efi</value>
- </enum>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>yes</value>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>Skylake-Client</model>
- <vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='vmx'/>
- <feature policy='require' name='hypervisor'/>
- <feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='clflushopt'/>
- <feature policy='require' name='umip'/>
- <feature policy='require' name='xsaves'/>
- <feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='invtsc'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>qemu64</model>
- <model usable='yes'>qemu32</model>
- <model usable='no'>phenom</model>
- <model usable='yes'>pentium3</model>
- <model usable='yes'>pentium2</model>
- <model usable='yes'>pentium</model>
- <model usable='yes'>n270</model>
- <model usable='yes'>kvm64</model>
- <model usable='yes'>kvm32</model>
- <model usable='yes'>coreduo</model>
- <model usable='yes'>core2duo</model>
- <model usable='no'>athlon</model>
- <model usable='yes'>Westmere</model>
- <model usable='no'>Skylake-Server</model>
- <model usable='yes'>Skylake-Client</model>
- <model usable='yes'>SandyBridge</model>
- <model usable='yes'>Penryn</model>
- <model usable='no'>Opteron_G5</model>
- <model usable='no'>Opteron_G4</model>
- <model usable='no'>Opteron_G3</model>
- <model usable='yes'>Opteron_G2</model>
- <model usable='yes'>Opteron_G1</model>
- <model usable='yes'>Nehalem</model>
- <model usable='yes'>IvyBridge</model>
- <model usable='yes'>Haswell</model>
- <model usable='yes'>Haswell-noTSX</model>
- <model usable='no'>EPYC</model>
- <model usable='yes'>Conroe</model>
- <model usable='yes'>Broadwell</model>
- <model usable='yes'>Broadwell-noTSX</model>
- <model usable='yes'>486</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>spice</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>cirrus</value>
- <value>vmvga</value>
- <value>qxl</value>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='yes'>
- <enum name='model'>
- <value>tpm-tis</value>
- </enum>
- <enum name='backendModel'>
- <value>passthrough</value>
- <value>emulator</value>
- </enum>
- </tpm>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='yes'/>
- <genid supported='yes'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
deleted file mode 100644
index cccc6830f9..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-x86_64</path>
- <domain>qemu</domain>
- <machine>pc-i440fx-2.11</machine>
- <arch>x86_64</arch>
- <vcpu max='255'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'>
- <value>bios</value>
- <value>efi</value>
- </enum>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>EPYC</model>
- <vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='monitor'/>
- <feature policy='require' name='hypervisor'/>
- <feature policy='require' name='erms'/>
- <feature policy='require' name='mpx'/>
- <feature policy='require' name='pcommit'/>
- <feature policy='require' name='clwb'/>
- <feature policy='require' name='pku'/>
- <feature policy='require' name='ospke'/>
- <feature policy='require' name='la57'/>
- <feature policy='require' name='3dnowext'/>
- <feature policy='require' name='3dnow'/>
- <feature policy='disable' name='vme'/>
- <feature policy='disable' name='fma'/>
- <feature policy='disable' name='avx'/>
- <feature policy='disable' name='f16c'/>
- <feature policy='disable' name='rdrand'/>
- <feature policy='disable' name='avx2'/>
- <feature policy='disable' name='rdseed'/>
- <feature policy='disable' name='sha-ni'/>
- <feature policy='disable' name='xsavec'/>
- <feature policy='disable' name='fxsr_opt'/>
- <feature policy='disable' name='misalignsse'/>
- <feature policy='disable' name='3dnowprefetch'/>
- <feature policy='disable' name='osvw'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>qemu64</model>
- <model usable='yes'>qemu32</model>
- <model usable='no'>phenom</model>
- <model usable='yes'>pentium3</model>
- <model usable='yes'>pentium2</model>
- <model usable='yes'>pentium</model>
- <model usable='yes'>n270</model>
- <model usable='yes'>kvm64</model>
- <model usable='yes'>kvm32</model>
- <model usable='yes'>coreduo</model>
- <model usable='yes'>core2duo</model>
- <model usable='yes'>athlon</model>
- <model usable='yes'>Westmere</model>
- <model usable='no'>Skylake-Server</model>
- <model usable='no'>Skylake-Client</model>
- <model usable='no'>SandyBridge</model>
- <model usable='yes'>Penryn</model>
- <model usable='no'>Opteron_G5</model>
- <model usable='no'>Opteron_G4</model>
- <model usable='no'>Opteron_G3</model>
- <model usable='yes'>Opteron_G2</model>
- <model usable='yes'>Opteron_G1</model>
- <model usable='yes'>Nehalem</model>
- <model usable='no'>IvyBridge</model>
- <model usable='no'>Haswell</model>
- <model usable='no'>Haswell-noTSX</model>
- <model usable='no'>EPYC</model>
- <model usable='yes'>Conroe</model>
- <model usable='no'>Broadwell</model>
- <model usable='no'>Broadwell-noTSX</model>
- <model usable='yes'>486</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>ide</value>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>spice</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>cirrus</value>
- <value>vmvga</value>
- <value>qxl</value>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='yes'>
- <enum name='model'>
- <value>tpm-tis</value>
- </enum>
- <enum name='backendModel'>
- <value>passthrough</value>
- <value>emulator</value>
- </enum>
- </tpm>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='yes'/>
- <genid supported='yes'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
deleted file mode 100644
index 804bf8020e..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-s390x</path>
- <domain>kvm</domain>
- <machine>s390-ccw-virtio-2.11</machine>
- <arch>s390x</arch>
- <vcpu max='248'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'/>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='no'/>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>z14-base</model>
- <feature policy='require' name='aen'/>
- <feature policy='require' name='cmmnt'/>
- <feature policy='require' name='aefsi'/>
- <feature policy='require' name='mepoch'/>
- <feature policy='require' name='msa8'/>
- <feature policy='require' name='msa7'/>
- <feature policy='require' name='msa6'/>
- <feature policy='require' name='msa5'/>
- <feature policy='require' name='msa4'/>
- <feature policy='require' name='msa3'/>
- <feature policy='require' name='msa2'/>
- <feature policy='require' name='msa1'/>
- <feature policy='require' name='sthyi'/>
- <feature policy='require' name='edat'/>
- <feature policy='require' name='ri'/>
- <feature policy='require' name='edat2'/>
- <feature policy='require' name='vx'/>
- <feature policy='require' name='ipter'/>
- <feature policy='require' name='vxeh'/>
- <feature policy='require' name='vxpd'/>
- <feature policy='require' name='esop'/>
- <feature policy='require' name='iep'/>
- <feature policy='require' name='cte'/>
- <feature policy='require' name='gs'/>
- <feature policy='require' name='zpci'/>
- <feature policy='require' name='sea_esop2'/>
- <feature policy='require' name='te'/>
- <feature policy='require' name='cmm'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>z890.2</model>
- <model usable='yes'>z990.4</model>
- <model usable='yes'>z10BC.2</model>
- <model usable='yes'>z196.2</model>
- <model usable='yes'>z14</model>
- <model usable='yes'>z9BC-base</model>
- <model usable='yes'>zEC12-base</model>
- <model usable='yes'>z196-base</model>
- <model usable='yes'>z13-base</model>
- <model usable='yes'>z990.3</model>
- <model usable='yes'>z9EC</model>
- <model usable='yes'>zBC12</model>
- <model usable='yes'>z9EC.3</model>
- <model usable='yes'>z196.2-base</model>
- <model usable='yes'>qemu</model>
- <model usable='yes'>zEC12.2-base</model>
- <model usable='yes'>z800-base</model>
- <model usable='yes'>z9EC.2</model>
- <model usable='yes'>z900.2-base</model>
- <model usable='yes'>z900.3</model>
- <model usable='yes'>z890-base</model>
- <model usable='yes'>z890</model>
- <model usable='yes'>z990.4-base</model>
- <model usable='yes'>z10BC.2-base</model>
- <model usable='yes'>z900.2</model>
- <model usable='yes'>z9BC.2-base</model>
- <model usable='yes'>z800</model>
- <model usable='yes'>z114</model>
- <model usable='yes'>z13</model>
- <model usable='yes'>z990</model>
- <model usable='yes'>z13s-base</model>
- <model usable='yes'>z990.2</model>
- <model usable='yes'>z14-base</model>
- <model usable='yes'>z890.2-base</model>
- <model usable='yes'>z196</model>
- <model usable='yes'>z10EC</model>
- <model usable='yes'>z13s</model>
- <model usable='yes'>z900</model>
- <model usable='yes'>z10EC.3</model>
- <model usable='yes'>z10EC.2-base</model>
- <model usable='yes'>z114-base</model>
- <model usable='yes'>z990.2-base</model>
- <model usable='yes'>z9EC.2-base</model>
- <model usable='yes'>z890.3</model>
- <model usable='yes'>z900.3-base</model>
- <model usable='yes'>z9BC.2</model>
- <model usable='yes'>z10BC</model>
- <model usable='yes'>z990.5</model>
- <model usable='yes'>zEC12.2</model>
- <model usable='yes'>z10EC-base</model>
- <model usable='yes'>z9EC-base</model>
- <model usable='yes'>z9EC.3-base</model>
- <model usable='yes'>zEC12</model>
- <model usable='yes'>z990.5-base</model>
- <model usable='yes'>z10BC-base</model>
- <model usable='yes'>z900-base</model>
- <model usable='yes'>z13.2</model>
- <model usable='yes'>zBC12-base</model>
- <model usable='yes'>z13.2-base</model>
- <model usable='yes'>z890.3-base</model>
- <model usable='yes'>z990-base</model>
- <model usable='yes'>z10EC.2</model>
- <model usable='yes'>z9BC</model>
- <model usable='yes'>z10EC.3-base</model>
- <model usable='yes'>z990.3-base</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='no'/>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='no'/>
- <genid supported='no'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <s390-pv supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
deleted file mode 100644
index 3a8aa2ab71..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-x86_64</path>
- <domain>kvm</domain>
- <machine>pc-i440fx-2.11</machine>
- <arch>x86_64</arch>
- <vcpu max='255'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'>
- <value>bios</value>
- <value>efi</value>
- </enum>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>Skylake-Client</model>
- <vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='vmx'/>
- <feature policy='require' name='hypervisor'/>
- <feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='clflushopt'/>
- <feature policy='require' name='umip'/>
- <feature policy='require' name='xsaves'/>
- <feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='invtsc'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>qemu64</model>
- <model usable='yes'>qemu32</model>
- <model usable='no'>phenom</model>
- <model usable='yes'>pentium3</model>
- <model usable='yes'>pentium2</model>
- <model usable='yes'>pentium</model>
- <model usable='yes'>n270</model>
- <model usable='yes'>kvm64</model>
- <model usable='yes'>kvm32</model>
- <model usable='yes'>coreduo</model>
- <model usable='yes'>core2duo</model>
- <model usable='no'>athlon</model>
- <model usable='yes'>Westmere</model>
- <model usable='no'>Skylake-Server</model>
- <model usable='yes'>Skylake-Client</model>
- <model usable='yes'>SandyBridge</model>
- <model usable='yes'>Penryn</model>
- <model usable='no'>Opteron_G5</model>
- <model usable='no'>Opteron_G4</model>
- <model usable='no'>Opteron_G3</model>
- <model usable='yes'>Opteron_G2</model>
- <model usable='yes'>Opteron_G1</model>
- <model usable='yes'>Nehalem</model>
- <model usable='yes'>IvyBridge</model>
- <model usable='yes'>Haswell</model>
- <model usable='yes'>Haswell-noTSX</model>
- <model usable='no'>EPYC</model>
- <model usable='yes'>Conroe</model>
- <model usable='yes'>Broadwell</model>
- <model usable='yes'>Broadwell-noTSX</model>
- <model usable='yes'>486</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>ide</value>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>spice</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>cirrus</value>
- <value>vmvga</value>
- <value>qxl</value>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='yes'>
- <enum name='model'>
- <value>tpm-tis</value>
- </enum>
- <enum name='backendModel'>
- <value>passthrough</value>
- <value>emulator</value>
- </enum>
- </tpm>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='yes'/>
- <genid supported='yes'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
deleted file mode 100644
index 0dc5995c09..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-x86_64</path>
- <domain>kvm</domain>
- <machine>pc-q35-2.12</machine>
- <arch>x86_64</arch>
- <vcpu max='288'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'>
- <value>bios</value>
- <value>efi</value>
- </enum>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>yes</value>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>Haswell-noTSX</model>
- <vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
- <feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
- <feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
- <feature policy='require' name='invtsc'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>qemu64</model>
- <model usable='yes'>qemu32</model>
- <model usable='no'>phenom</model>
- <model usable='yes'>pentium3</model>
- <model usable='yes'>pentium2</model>
- <model usable='yes'>pentium</model>
- <model usable='yes'>n270</model>
- <model usable='yes'>kvm64</model>
- <model usable='yes'>kvm32</model>
- <model usable='yes'>coreduo</model>
- <model usable='yes'>core2duo</model>
- <model usable='no'>athlon</model>
- <model usable='yes'>Westmere</model>
- <model usable='no'>Westmere-IBRS</model>
- <model usable='no'>Skylake-Server</model>
- <model usable='no'>Skylake-Server-IBRS</model>
- <model usable='no'>Skylake-Client</model>
- <model usable='no'>Skylake-Client-IBRS</model>
- <model usable='yes'>SandyBridge</model>
- <model usable='no'>SandyBridge-IBRS</model>
- <model usable='yes'>Penryn</model>
- <model usable='no'>Opteron_G5</model>
- <model usable='no'>Opteron_G4</model>
- <model usable='no'>Opteron_G3</model>
- <model usable='yes'>Opteron_G2</model>
- <model usable='yes'>Opteron_G1</model>
- <model usable='yes'>Nehalem</model>
- <model usable='no'>Nehalem-IBRS</model>
- <model usable='yes'>IvyBridge</model>
- <model usable='no'>IvyBridge-IBRS</model>
- <model usable='no'>Haswell</model>
- <model usable='yes'>Haswell-noTSX</model>
- <model usable='no'>Haswell-noTSX-IBRS</model>
- <model usable='no'>Haswell-IBRS</model>
- <model usable='no'>EPYC</model>
- <model usable='no'>EPYC-IBPB</model>
- <model usable='yes'>Conroe</model>
- <model usable='no'>Broadwell</model>
- <model usable='no'>Broadwell-noTSX</model>
- <model usable='no'>Broadwell-noTSX-IBRS</model>
- <model usable='no'>Broadwell-IBRS</model>
- <model usable='yes'>486</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>spice</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>cirrus</value>
- <value>vmvga</value>
- <value>qxl</value>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='yes'>
- <enum name='model'>
- <value>tpm-tis</value>
- <value>tpm-crb</value>
- </enum>
- <enum name='backendModel'>
- <value>passthrough</value>
- <value>emulator</value>
- </enum>
- </tpm>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='yes'/>
- <genid supported='yes'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='yes'>
- <cbitpos>47</cbitpos>
- <reducedPhysBits>1</reducedPhysBits>
- <maxGuests>59</maxGuests>
- <maxESGuests>450</maxESGuests>
- </sev>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
deleted file mode 100644
index 575506d852..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-x86_64</path>
- <domain>qemu</domain>
- <machine>pc-i440fx-2.12</machine>
- <arch>x86_64</arch>
- <vcpu max='255'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'>
- <value>bios</value>
- <value>efi</value>
- </enum>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>EPYC</model>
- <vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='monitor'/>
- <feature policy='require' name='hypervisor'/>
- <feature policy='require' name='erms'/>
- <feature policy='require' name='mpx'/>
- <feature policy='require' name='pcommit'/>
- <feature policy='require' name='clwb'/>
- <feature policy='require' name='pku'/>
- <feature policy='require' name='ospke'/>
- <feature policy='require' name='la57'/>
- <feature policy='require' name='3dnowext'/>
- <feature policy='require' name='3dnow'/>
- <feature policy='disable' name='vme'/>
- <feature policy='disable' name='fma'/>
- <feature policy='disable' name='avx'/>
- <feature policy='disable' name='f16c'/>
- <feature policy='disable' name='rdrand'/>
- <feature policy='disable' name='avx2'/>
- <feature policy='disable' name='rdseed'/>
- <feature policy='disable' name='sha-ni'/>
- <feature policy='disable' name='xsavec'/>
- <feature policy='disable' name='fxsr_opt'/>
- <feature policy='disable' name='misalignsse'/>
- <feature policy='disable' name='3dnowprefetch'/>
- <feature policy='disable' name='osvw'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>qemu64</model>
- <model usable='yes'>qemu32</model>
- <model usable='no'>phenom</model>
- <model usable='yes'>pentium3</model>
- <model usable='yes'>pentium2</model>
- <model usable='yes'>pentium</model>
- <model usable='yes'>n270</model>
- <model usable='yes'>kvm64</model>
- <model usable='yes'>kvm32</model>
- <model usable='yes'>coreduo</model>
- <model usable='yes'>core2duo</model>
- <model usable='yes'>athlon</model>
- <model usable='yes'>Westmere</model>
- <model usable='no'>Westmere-IBRS</model>
- <model usable='no'>Skylake-Server</model>
- <model usable='no'>Skylake-Server-IBRS</model>
- <model usable='no'>Skylake-Client</model>
- <model usable='no'>Skylake-Client-IBRS</model>
- <model usable='no'>SandyBridge</model>
- <model usable='no'>SandyBridge-IBRS</model>
- <model usable='yes'>Penryn</model>
- <model usable='no'>Opteron_G5</model>
- <model usable='no'>Opteron_G4</model>
- <model usable='no'>Opteron_G3</model>
- <model usable='yes'>Opteron_G2</model>
- <model usable='yes'>Opteron_G1</model>
- <model usable='yes'>Nehalem</model>
- <model usable='no'>Nehalem-IBRS</model>
- <model usable='no'>IvyBridge</model>
- <model usable='no'>IvyBridge-IBRS</model>
- <model usable='no'>Haswell</model>
- <model usable='no'>Haswell-noTSX</model>
- <model usable='no'>Haswell-noTSX-IBRS</model>
- <model usable='no'>Haswell-IBRS</model>
- <model usable='no'>EPYC</model>
- <model usable='no'>EPYC-IBPB</model>
- <model usable='yes'>Conroe</model>
- <model usable='no'>Broadwell</model>
- <model usable='no'>Broadwell-noTSX</model>
- <model usable='no'>Broadwell-noTSX-IBRS</model>
- <model usable='no'>Broadwell-IBRS</model>
- <model usable='yes'>486</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>ide</value>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>spice</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>cirrus</value>
- <value>vmvga</value>
- <value>qxl</value>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='yes'>
- <enum name='model'>
- <value>tpm-tis</value>
- <value>tpm-crb</value>
- </enum>
- <enum name='backendModel'>
- <value>passthrough</value>
- <value>emulator</value>
- </enum>
- </tpm>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='yes'/>
- <genid supported='yes'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='yes'>
- <cbitpos>47</cbitpos>
- <reducedPhysBits>1</reducedPhysBits>
- <maxGuests>59</maxGuests>
- <maxESGuests>450</maxESGuests>
- </sev>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
deleted file mode 100644
index 2074c89875..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-aarch64</path>
- <domain>kvm</domain>
- <machine>virt-2.12</machine>
- <arch>aarch64</arch>
- <vcpu max='255'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'>
- <value>efi</value>
- </enum>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='no'/>
- <mode name='custom' supported='yes'>
- <model usable='unknown'>pxa262</model>
- <model usable='unknown'>pxa270-a0</model>
- <model usable='unknown'>arm1136</model>
- <model usable='unknown'>cortex-a15</model>
- <model usable='unknown'>pxa260</model>
- <model usable='unknown'>arm1136-r2</model>
- <model usable='unknown'>pxa261</model>
- <model usable='unknown'>pxa255</model>
- <model usable='unknown'>cortex-m33</model>
- <model usable='unknown'>arm926</model>
- <model usable='unknown'>arm11mpcore</model>
- <model usable='unknown'>pxa250</model>
- <model usable='unknown'>ti925t</model>
- <model usable='unknown'>cortex-a57</model>
- <model usable='unknown'>sa1110</model>
- <model usable='unknown'>arm1176</model>
- <model usable='unknown'>cortex-a53</model>
- <model usable='unknown'>sa1100</model>
- <model usable='unknown'>pxa270-c5</model>
- <model usable='unknown'>cortex-a9</model>
- <model usable='unknown'>cortex-a8</model>
- <model usable='unknown'>cortex-a7</model>
- <model usable='unknown'>pxa270-c0</model>
- <model usable='unknown'>arm1026</model>
- <model usable='unknown'>pxa270-b1</model>
- <model usable='unknown'>cortex-m3</model>
- <model usable='unknown'>max</model>
- <model usable='unknown'>cortex-m4</model>
- <model usable='unknown'>pxa270-b0</model>
- <model usable='unknown'>arm946</model>
- <model usable='unknown'>cortex-r5</model>
- <model usable='unknown'>pxa270-a1</model>
- <model usable='unknown'>pxa270</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='no'/>
- </devices>
- <features>
- <gic supported='yes'>
- <enum name='version'>
- <value>3</value>
- </enum>
- </gic>
- <vmcoreinfo supported='yes'/>
- <genid supported='no'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
deleted file mode 100644
index a93313f980..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-aarch64</path>
- <domain>kvm</domain>
- <machine>integratorcp</machine>
- <arch>aarch64</arch>
- <vcpu max='1'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'/>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='no'/>
- <mode name='custom' supported='yes'>
- <model usable='unknown'>pxa262</model>
- <model usable='unknown'>pxa270-a0</model>
- <model usable='unknown'>arm1136</model>
- <model usable='unknown'>cortex-a15</model>
- <model usable='unknown'>pxa260</model>
- <model usable='unknown'>arm1136-r2</model>
- <model usable='unknown'>pxa261</model>
- <model usable='unknown'>pxa255</model>
- <model usable='unknown'>cortex-m33</model>
- <model usable='unknown'>arm926</model>
- <model usable='unknown'>arm11mpcore</model>
- <model usable='unknown'>pxa250</model>
- <model usable='unknown'>ti925t</model>
- <model usable='unknown'>cortex-a57</model>
- <model usable='unknown'>sa1110</model>
- <model usable='unknown'>arm1176</model>
- <model usable='unknown'>cortex-a53</model>
- <model usable='unknown'>sa1100</model>
- <model usable='unknown'>pxa270-c5</model>
- <model usable='unknown'>cortex-a9</model>
- <model usable='unknown'>cortex-a8</model>
- <model usable='unknown'>cortex-a7</model>
- <model usable='unknown'>pxa270-c0</model>
- <model usable='unknown'>arm1026</model>
- <model usable='unknown'>pxa270-b1</model>
- <model usable='unknown'>cortex-m3</model>
- <model usable='unknown'>max</model>
- <model usable='unknown'>cortex-m4</model>
- <model usable='unknown'>pxa270-b0</model>
- <model usable='unknown'>arm946</model>
- <model usable='unknown'>cortex-r5</model>
- <model usable='unknown'>pxa270-a1</model>
- <model usable='unknown'>pxa270</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='no'/>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='yes'/>
- <genid supported='no'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
deleted file mode 100644
index cb3edcbd56..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-ppc64</path>
- <domain>kvm</domain>
- <machine>pseries-2.12</machine>
- <arch>ppc64</arch>
- <vcpu max='1024'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'/>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='allow'>POWER8</model>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='unknown'>POWER9</model>
- <model usable='unknown'>POWER8</model>
- <model usable='unknown'>POWER7</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='no'/>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='no'/>
- <genid supported='no'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
deleted file mode 100644
index 5c3d9ce7db..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-s390x</path>
- <domain>kvm</domain>
- <machine>s390-ccw-virtio-2.12</machine>
- <arch>s390x</arch>
- <vcpu max='248'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'/>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='no'/>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>z14-base</model>
- <feature policy='require' name='aen'/>
- <feature policy='require' name='aefsi'/>
- <feature policy='require' name='msa8'/>
- <feature policy='require' name='msa7'/>
- <feature policy='require' name='msa6'/>
- <feature policy='require' name='msa5'/>
- <feature policy='require' name='msa4'/>
- <feature policy='require' name='msa3'/>
- <feature policy='require' name='msa2'/>
- <feature policy='require' name='msa1'/>
- <feature policy='require' name='sthyi'/>
- <feature policy='require' name='edat'/>
- <feature policy='require' name='ri'/>
- <feature policy='require' name='edat2'/>
- <feature policy='require' name='vx'/>
- <feature policy='require' name='ipter'/>
- <feature policy='require' name='vxeh'/>
- <feature policy='require' name='vxpd'/>
- <feature policy='require' name='esop'/>
- <feature policy='require' name='iep'/>
- <feature policy='require' name='cte'/>
- <feature policy='require' name='gs'/>
- <feature policy='require' name='ppa15'/>
- <feature policy='require' name='zpci'/>
- <feature policy='require' name='sea_esop2'/>
- <feature policy='require' name='te'/>
- <feature policy='require' name='cmm'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>z890.2</model>
- <model usable='yes'>z990.4</model>
- <model usable='yes'>z10BC.2</model>
- <model usable='yes'>z196.2</model>
- <model usable='yes'>z14</model>
- <model usable='yes'>z9BC-base</model>
- <model usable='yes'>zEC12-base</model>
- <model usable='yes'>z196-base</model>
- <model usable='yes'>z13-base</model>
- <model usable='yes'>z990.3</model>
- <model usable='yes'>z9EC</model>
- <model usable='yes'>zBC12</model>
- <model usable='yes'>z9EC.3</model>
- <model usable='yes'>z196.2-base</model>
- <model usable='no'>qemu</model>
- <model usable='yes'>zEC12.2-base</model>
- <model usable='yes'>z800-base</model>
- <model usable='yes'>z9EC.2</model>
- <model usable='yes'>z900.2-base</model>
- <model usable='yes'>z900.3</model>
- <model usable='yes'>z890-base</model>
- <model usable='yes'>z890</model>
- <model usable='yes'>z990.4-base</model>
- <model usable='yes'>z10BC.2-base</model>
- <model usable='yes'>z900.2</model>
- <model usable='yes'>z9BC.2-base</model>
- <model usable='yes'>z800</model>
- <model usable='yes'>z114</model>
- <model usable='yes'>z13</model>
- <model usable='yes'>z13s-base</model>
- <model usable='yes'>z990</model>
- <model usable='yes'>z990.2</model>
- <model usable='yes'>z14-base</model>
- <model usable='yes'>z890.2-base</model>
- <model usable='yes'>z196</model>
- <model usable='yes'>z10EC</model>
- <model usable='yes'>z13s</model>
- <model usable='yes'>z900</model>
- <model usable='yes'>z10EC.3</model>
- <model usable='yes'>z10EC.2-base</model>
- <model usable='yes'>z114-base</model>
- <model usable='yes'>z990.2-base</model>
- <model usable='yes'>z9EC.2-base</model>
- <model usable='yes'>z890.3</model>
- <model usable='yes'>z900.3-base</model>
- <model usable='yes'>z9BC.2</model>
- <model usable='yes'>z10BC</model>
- <model usable='yes'>z990.5</model>
- <model usable='yes'>zEC12.2</model>
- <model usable='yes'>z10EC-base</model>
- <model usable='yes'>z9EC-base</model>
- <model usable='yes'>z9EC.3-base</model>
- <model usable='yes'>zEC12</model>
- <model usable='yes'>z990.5-base</model>
- <model usable='yes'>z10BC-base</model>
- <model usable='yes'>z900-base</model>
- <model usable='yes'>z13.2</model>
- <model usable='yes'>z890.3-base</model>
- <model usable='yes'>zBC12-base</model>
- <model usable='yes'>z13.2-base</model>
- <model usable='yes'>z990-base</model>
- <model usable='yes'>z10EC.2</model>
- <model usable='yes'>z9BC</model>
- <model usable='yes'>z10EC.3-base</model>
- <model usable='yes'>z990.3-base</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='no'/>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='no'/>
- <genid supported='no'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <s390-pv supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
deleted file mode 100644
index c8a5558536..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-x86_64</path>
- <domain>kvm</domain>
- <machine>pc-i440fx-2.12</machine>
- <arch>x86_64</arch>
- <vcpu max='255'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'>
- <value>bios</value>
- <value>efi</value>
- </enum>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>Haswell-noTSX</model>
- <vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
- <feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
- <feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
- <feature policy='require' name='invtsc'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>qemu64</model>
- <model usable='yes'>qemu32</model>
- <model usable='no'>phenom</model>
- <model usable='yes'>pentium3</model>
- <model usable='yes'>pentium2</model>
- <model usable='yes'>pentium</model>
- <model usable='yes'>n270</model>
- <model usable='yes'>kvm64</model>
- <model usable='yes'>kvm32</model>
- <model usable='yes'>coreduo</model>
- <model usable='yes'>core2duo</model>
- <model usable='no'>athlon</model>
- <model usable='yes'>Westmere</model>
- <model usable='no'>Westmere-IBRS</model>
- <model usable='no'>Skylake-Server</model>
- <model usable='no'>Skylake-Server-IBRS</model>
- <model usable='no'>Skylake-Client</model>
- <model usable='no'>Skylake-Client-IBRS</model>
- <model usable='yes'>SandyBridge</model>
- <model usable='no'>SandyBridge-IBRS</model>
- <model usable='yes'>Penryn</model>
- <model usable='no'>Opteron_G5</model>
- <model usable='no'>Opteron_G4</model>
- <model usable='no'>Opteron_G3</model>
- <model usable='yes'>Opteron_G2</model>
- <model usable='yes'>Opteron_G1</model>
- <model usable='yes'>Nehalem</model>
- <model usable='no'>Nehalem-IBRS</model>
- <model usable='yes'>IvyBridge</model>
- <model usable='no'>IvyBridge-IBRS</model>
- <model usable='no'>Haswell</model>
- <model usable='yes'>Haswell-noTSX</model>
- <model usable='no'>Haswell-noTSX-IBRS</model>
- <model usable='no'>Haswell-IBRS</model>
- <model usable='no'>EPYC</model>
- <model usable='no'>EPYC-IBPB</model>
- <model usable='yes'>Conroe</model>
- <model usable='no'>Broadwell</model>
- <model usable='no'>Broadwell-noTSX</model>
- <model usable='no'>Broadwell-noTSX-IBRS</model>
- <model usable='no'>Broadwell-IBRS</model>
- <model usable='yes'>486</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>ide</value>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>spice</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>cirrus</value>
- <value>vmvga</value>
- <value>qxl</value>
- <value>virtio</value>
- <value>none</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='yes'>
- <enum name='model'>
- <value>tpm-tis</value>
- <value>tpm-crb</value>
- </enum>
- <enum name='backendModel'>
- <value>passthrough</value>
- <value>emulator</value>
- </enum>
- </tpm>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='yes'/>
- <genid supported='yes'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='yes'>
- <cbitpos>47</cbitpos>
- <reducedPhysBits>1</reducedPhysBits>
- <maxGuests>59</maxGuests>
- <maxESGuests>450</maxESGuests>
- </sev>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
deleted file mode 100644
index 4f80439eb4..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-x86_64</path>
- <domain>kvm</domain>
- <machine>pc-q35-3.0</machine>
- <arch>x86_64</arch>
- <vcpu max='288'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'>
- <value>bios</value>
- <value>efi</value>
- </enum>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>yes</value>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>Skylake-Client-IBRS</model>
- <vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='vmx'/>
- <feature policy='require' name='hypervisor'/>
- <feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='clflushopt'/>
- <feature policy='require' name='umip'/>
- <feature policy='require' name='xsaves'/>
- <feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='topoext'/>
- <feature policy='require' name='invtsc'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>qemu64</model>
- <model usable='yes'>qemu32</model>
- <model usable='no'>phenom</model>
- <model usable='yes'>pentium3</model>
- <model usable='yes'>pentium2</model>
- <model usable='yes'>pentium</model>
- <model usable='yes'>n270</model>
- <model usable='yes'>kvm64</model>
- <model usable='yes'>kvm32</model>
- <model usable='yes'>coreduo</model>
- <model usable='yes'>core2duo</model>
- <model usable='no'>athlon</model>
- <model usable='yes'>Westmere-IBRS</model>
- <model usable='yes'>Westmere</model>
- <model usable='no'>Skylake-Server-IBRS</model>
- <model usable='no'>Skylake-Server</model>
- <model usable='yes'>Skylake-Client-IBRS</model>
- <model usable='yes'>Skylake-Client</model>
- <model usable='yes'>SandyBridge-IBRS</model>
- <model usable='yes'>SandyBridge</model>
- <model usable='yes'>Penryn</model>
- <model usable='no'>Opteron_G5</model>
- <model usable='no'>Opteron_G4</model>
- <model usable='no'>Opteron_G3</model>
- <model usable='yes'>Opteron_G2</model>
- <model usable='yes'>Opteron_G1</model>
- <model usable='yes'>Nehalem-IBRS</model>
- <model usable='yes'>Nehalem</model>
- <model usable='yes'>IvyBridge-IBRS</model>
- <model usable='yes'>IvyBridge</model>
- <model usable='yes'>Haswell-noTSX-IBRS</model>
- <model usable='yes'>Haswell-noTSX</model>
- <model usable='yes'>Haswell-IBRS</model>
- <model usable='yes'>Haswell</model>
- <model usable='no'>EPYC-IBPB</model>
- <model usable='no'>EPYC</model>
- <model usable='yes'>Conroe</model>
- <model usable='yes'>Broadwell-noTSX-IBRS</model>
- <model usable='yes'>Broadwell-noTSX</model>
- <model usable='yes'>Broadwell-IBRS</model>
- <model usable='yes'>Broadwell</model>
- <model usable='yes'>486</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>spice</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>cirrus</value>
- <value>vmvga</value>
- <value>qxl</value>
- <value>virtio</value>
- <value>none</value>
- <value>bochs</value>
- <value>ramfb</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='yes'>
- <enum name='model'>
- <value>tpm-tis</value>
- <value>tpm-crb</value>
- </enum>
- <enum name='backendModel'>
- <value>passthrough</value>
- <value>emulator</value>
- </enum>
- </tpm>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='yes'/>
- <genid supported='yes'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
deleted file mode 100644
index 301101095c..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-x86_64</path>
- <domain>qemu</domain>
- <machine>pc-i440fx-3.0</machine>
- <arch>x86_64</arch>
- <vcpu max='255'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'>
- <value>bios</value>
- <value>efi</value>
- </enum>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='no'/>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>EPYC</model>
- <vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='monitor'/>
- <feature policy='require' name='hypervisor'/>
- <feature policy='require' name='erms'/>
- <feature policy='require' name='mpx'/>
- <feature policy='require' name='pcommit'/>
- <feature policy='require' name='clwb'/>
- <feature policy='require' name='pku'/>
- <feature policy='require' name='la57'/>
- <feature policy='require' name='3dnowext'/>
- <feature policy='require' name='3dnow'/>
- <feature policy='require' name='npt'/>
- <feature policy='disable' name='vme'/>
- <feature policy='disable' name='fma'/>
- <feature policy='disable' name='avx'/>
- <feature policy='disable' name='f16c'/>
- <feature policy='disable' name='rdrand'/>
- <feature policy='disable' name='avx2'/>
- <feature policy='disable' name='rdseed'/>
- <feature policy='disable' name='sha-ni'/>
- <feature policy='disable' name='xsavec'/>
- <feature policy='disable' name='fxsr_opt'/>
- <feature policy='disable' name='misalignsse'/>
- <feature policy='disable' name='3dnowprefetch'/>
- <feature policy='disable' name='osvw'/>
- <feature policy='disable' name='topoext'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>qemu64</model>
- <model usable='yes'>qemu32</model>
- <model usable='no'>phenom</model>
- <model usable='yes'>pentium3</model>
- <model usable='yes'>pentium2</model>
- <model usable='yes'>pentium</model>
- <model usable='yes'>n270</model>
- <model usable='yes'>kvm64</model>
- <model usable='yes'>kvm32</model>
- <model usable='yes'>coreduo</model>
- <model usable='yes'>core2duo</model>
- <model usable='yes'>athlon</model>
- <model usable='no'>Westmere-IBRS</model>
- <model usable='yes'>Westmere</model>
- <model usable='no'>Skylake-Server-IBRS</model>
- <model usable='no'>Skylake-Server</model>
- <model usable='no'>Skylake-Client-IBRS</model>
- <model usable='no'>Skylake-Client</model>
- <model usable='no'>SandyBridge-IBRS</model>
- <model usable='no'>SandyBridge</model>
- <model usable='yes'>Penryn</model>
- <model usable='no'>Opteron_G5</model>
- <model usable='no'>Opteron_G4</model>
- <model usable='no'>Opteron_G3</model>
- <model usable='yes'>Opteron_G2</model>
- <model usable='yes'>Opteron_G1</model>
- <model usable='no'>Nehalem-IBRS</model>
- <model usable='yes'>Nehalem</model>
- <model usable='no'>IvyBridge-IBRS</model>
- <model usable='no'>IvyBridge</model>
- <model usable='no'>Haswell-noTSX-IBRS</model>
- <model usable='no'>Haswell-noTSX</model>
- <model usable='no'>Haswell-IBRS</model>
- <model usable='no'>Haswell</model>
- <model usable='no'>EPYC-IBPB</model>
- <model usable='no'>EPYC</model>
- <model usable='yes'>Conroe</model>
- <model usable='no'>Broadwell-noTSX-IBRS</model>
- <model usable='no'>Broadwell-noTSX</model>
- <model usable='no'>Broadwell-IBRS</model>
- <model usable='no'>Broadwell</model>
- <model usable='yes'>486</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>ide</value>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>spice</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>cirrus</value>
- <value>vmvga</value>
- <value>qxl</value>
- <value>virtio</value>
- <value>none</value>
- <value>bochs</value>
- <value>ramfb</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='yes'>
- <enum name='model'>
- <value>tpm-tis</value>
- <value>tpm-crb</value>
- </enum>
- <enum name='backendModel'>
- <value>passthrough</value>
- <value>emulator</value>
- </enum>
- </tpm>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='yes'/>
- <genid supported='yes'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
deleted file mode 100644
index 8605db5cc8..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-ppc64</path>
- <domain>kvm</domain>
- <machine>pseries-3.0</machine>
- <arch>ppc64</arch>
- <vcpu max='1024'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'/>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='allow'>POWER8</model>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='unknown'>POWER9</model>
- <model usable='unknown'>POWER8</model>
- <model usable='unknown'>POWER7</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>virtio</value>
- <value>none</value>
- <value>bochs</value>
- <value>ramfb</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='no'/>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='no'/>
- <genid supported='no'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
deleted file mode 100644
index f49b6907ff..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-s390x</path>
- <domain>kvm</domain>
- <machine>s390-ccw-virtio-3.0</machine>
- <arch>s390x</arch>
- <vcpu max='248'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'/>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='no'/>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>z14-base</model>
- <feature policy='require' name='aen'/>
- <feature policy='require' name='cmmnt'/>
- <feature policy='require' name='aefsi'/>
- <feature policy='require' name='mepoch'/>
- <feature policy='require' name='msa8'/>
- <feature policy='require' name='msa7'/>
- <feature policy='require' name='msa6'/>
- <feature policy='require' name='msa5'/>
- <feature policy='require' name='msa4'/>
- <feature policy='require' name='msa3'/>
- <feature policy='require' name='msa2'/>
- <feature policy='require' name='msa1'/>
- <feature policy='require' name='sthyi'/>
- <feature policy='require' name='edat'/>
- <feature policy='require' name='ri'/>
- <feature policy='require' name='edat2'/>
- <feature policy='require' name='vx'/>
- <feature policy='require' name='ipter'/>
- <feature policy='require' name='mepochptff'/>
- <feature policy='require' name='vxeh'/>
- <feature policy='require' name='vxpd'/>
- <feature policy='require' name='esop'/>
- <feature policy='require' name='iep'/>
- <feature policy='require' name='cte'/>
- <feature policy='require' name='bpb'/>
- <feature policy='require' name='gs'/>
- <feature policy='require' name='ppa15'/>
- <feature policy='require' name='zpci'/>
- <feature policy='require' name='sea_esop2'/>
- <feature policy='require' name='te'/>
- <feature policy='require' name='cmm'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>z890.2</model>
- <model usable='yes'>z990.4</model>
- <model usable='yes'>z14ZR1</model>
- <model usable='yes'>z10BC.2</model>
- <model usable='yes'>z196.2</model>
- <model usable='yes'>z14</model>
- <model usable='yes'>z9BC-base</model>
- <model usable='yes'>zEC12-base</model>
- <model usable='yes'>z196-base</model>
- <model usable='yes'>z13-base</model>
- <model usable='yes'>z990.3</model>
- <model usable='yes'>z9EC</model>
- <model usable='yes'>zBC12</model>
- <model usable='yes'>z9EC.3</model>
- <model usable='yes'>z196.2-base</model>
- <model usable='no'>qemu</model>
- <model usable='yes'>zEC12.2-base</model>
- <model usable='yes'>z800-base</model>
- <model usable='yes'>z9EC.2</model>
- <model usable='yes'>z900.2-base</model>
- <model usable='yes'>z14ZR1-base</model>
- <model usable='yes'>z900.3</model>
- <model usable='yes'>z890-base</model>
- <model usable='yes'>z890</model>
- <model usable='yes'>z990.4-base</model>
- <model usable='yes'>z10BC.2-base</model>
- <model usable='yes'>z900.2</model>
- <model usable='yes'>z9BC.2-base</model>
- <model usable='yes'>z800</model>
- <model usable='yes'>z114</model>
- <model usable='yes'>z13</model>
- <model usable='yes'>z13s-base</model>
- <model usable='yes'>z990</model>
- <model usable='yes'>z990.2</model>
- <model usable='yes'>z14-base</model>
- <model usable='yes'>z890.2-base</model>
- <model usable='yes'>z196</model>
- <model usable='yes'>z10EC</model>
- <model usable='yes'>z13s</model>
- <model usable='yes'>z900</model>
- <model usable='yes'>z10EC.3</model>
- <model usable='yes'>z10EC.2-base</model>
- <model usable='yes'>z114-base</model>
- <model usable='yes'>z990.2-base</model>
- <model usable='yes'>z9EC.2-base</model>
- <model usable='yes'>z890.3</model>
- <model usable='yes'>z900.3-base</model>
- <model usable='yes'>z9BC.2</model>
- <model usable='yes'>z10BC</model>
- <model usable='yes'>z990.5</model>
- <model usable='yes'>zEC12.2</model>
- <model usable='yes'>z10EC-base</model>
- <model usable='yes'>z9EC-base</model>
- <model usable='yes'>z9EC.3-base</model>
- <model usable='yes'>zEC12</model>
- <model usable='yes'>z990.5-base</model>
- <model usable='yes'>z10BC-base</model>
- <model usable='yes'>z900-base</model>
- <model usable='yes'>z13.2</model>
- <model usable='yes'>zBC12-base</model>
- <model usable='yes'>z13.2-base</model>
- <model usable='yes'>z890.3-base</model>
- <model usable='yes'>z990-base</model>
- <model usable='yes'>z10EC.2</model>
- <model usable='yes'>z9BC</model>
- <model usable='yes'>z10EC.3-base</model>
- <model usable='yes'>z990.3-base</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>virtio</value>
- <value>none</value>
- <value>ramfb</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='no'/>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='no'/>
- <genid supported='no'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <s390-pv supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
deleted file mode 100644
index 650728566e..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-x86_64</path>
- <domain>kvm</domain>
- <machine>pc-i440fx-3.0</machine>
- <arch>x86_64</arch>
- <vcpu max='255'/>
- <iothreads supported='yes'/>
- <os supported='yes'>
- <enum name='firmware'>
- <value>bios</value>
- <value>efi</value>
- </enum>
- <loader supported='yes'>
- <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
- <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
- <value>/usr/share/OVMF/OVMF_CODE.fd</value>
- <enum name='type'>
- <value>rom</value>
- <value>pflash</value>
- </enum>
- <enum name='readonly'>
- <value>yes</value>
- <value>no</value>
- </enum>
- <enum name='secure'>
- <value>no</value>
- </enum>
- </loader>
- </os>
- <cpu>
- <mode name='host-passthrough' supported='yes'>
- <enum name='hostPassthroughMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='maximum' supported='yes'>
- <enum name='maximumMigratable'>
- <value>on</value>
- <value>off</value>
- </enum>
- </mode>
- <mode name='host-model' supported='yes'>
- <model fallback='forbid'>Skylake-Client-IBRS</model>
- <vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='vmx'/>
- <feature policy='require' name='hypervisor'/>
- <feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='clflushopt'/>
- <feature policy='require' name='umip'/>
- <feature policy='require' name='xsaves'/>
- <feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='topoext'/>
- <feature policy='require' name='invtsc'/>
- </mode>
- <mode name='custom' supported='yes'>
- <model usable='yes'>qemu64</model>
- <model usable='yes'>qemu32</model>
- <model usable='no'>phenom</model>
- <model usable='yes'>pentium3</model>
- <model usable='yes'>pentium2</model>
- <model usable='yes'>pentium</model>
- <model usable='yes'>n270</model>
- <model usable='yes'>kvm64</model>
- <model usable='yes'>kvm32</model>
- <model usable='yes'>coreduo</model>
- <model usable='yes'>core2duo</model>
- <model usable='no'>athlon</model>
- <model usable='yes'>Westmere-IBRS</model>
- <model usable='yes'>Westmere</model>
- <model usable='no'>Skylake-Server-IBRS</model>
- <model usable='no'>Skylake-Server</model>
- <model usable='yes'>Skylake-Client-IBRS</model>
- <model usable='yes'>Skylake-Client</model>
- <model usable='yes'>SandyBridge-IBRS</model>
- <model usable='yes'>SandyBridge</model>
- <model usable='yes'>Penryn</model>
- <model usable='no'>Opteron_G5</model>
- <model usable='no'>Opteron_G4</model>
- <model usable='no'>Opteron_G3</model>
- <model usable='yes'>Opteron_G2</model>
- <model usable='yes'>Opteron_G1</model>
- <model usable='yes'>Nehalem-IBRS</model>
- <model usable='yes'>Nehalem</model>
- <model usable='yes'>IvyBridge-IBRS</model>
- <model usable='yes'>IvyBridge</model>
- <model usable='yes'>Haswell-noTSX-IBRS</model>
- <model usable='yes'>Haswell-noTSX</model>
- <model usable='yes'>Haswell-IBRS</model>
- <model usable='yes'>Haswell</model>
- <model usable='no'>EPYC-IBPB</model>
- <model usable='no'>EPYC</model>
- <model usable='yes'>Conroe</model>
- <model usable='yes'>Broadwell-noTSX-IBRS</model>
- <model usable='yes'>Broadwell-noTSX</model>
- <model usable='yes'>Broadwell-IBRS</model>
- <model usable='yes'>Broadwell</model>
- <model usable='yes'>486</model>
- </mode>
- </cpu>
- <memoryBacking supported='yes'>
- <enum name='sourceType'>
- <value>file</value>
- <value>anonymous</value>
- <value>memfd</value>
- </enum>
- </memoryBacking>
- <devices>
- <disk supported='yes'>
- <enum name='diskDevice'>
- <value>disk</value>
- <value>cdrom</value>
- <value>floppy</value>
- <value>lun</value>
- </enum>
- <enum name='bus'>
- <value>ide</value>
- <value>fdc</value>
- <value>scsi</value>
- <value>virtio</value>
- <value>usb</value>
- <value>sata</value>
- </enum>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- </disk>
- <graphics supported='yes'>
- <enum name='type'>
- <value>sdl</value>
- <value>vnc</value>
- <value>spice</value>
- <value>egl-headless</value>
- </enum>
- </graphics>
- <video supported='yes'>
- <enum name='modelType'>
- <value>vga</value>
- <value>cirrus</value>
- <value>vmvga</value>
- <value>qxl</value>
- <value>virtio</value>
- <value>none</value>
- <value>bochs</value>
- <value>ramfb</value>
- </enum>
- </video>
- <hostdev supported='yes'>
- <enum name='mode'>
- <value>subsystem</value>
- </enum>
- <enum name='startupPolicy'>
- <value>default</value>
- <value>mandatory</value>
- <value>requisite</value>
- <value>optional</value>
- </enum>
- <enum name='subsysType'>
- <value>usb</value>
- <value>pci</value>
- <value>scsi</value>
- </enum>
- <enum name='capsType'/>
- <enum name='pciBackend'>
- <value>default</value>
- <value>vfio</value>
- </enum>
- </hostdev>
- <rng supported='yes'>
- <enum name='model'>
- <value>virtio</value>
- <value>virtio-transitional</value>
- <value>virtio-non-transitional</value>
- </enum>
- <enum name='backendModel'>
- <value>random</value>
- <value>egd</value>
- </enum>
- </rng>
- <filesystem supported='yes'>
- <enum name='driverType'>
- <value>path</value>
- <value>handle</value>
- </enum>
- </filesystem>
- <tpm supported='yes'>
- <enum name='model'>
- <value>tpm-tis</value>
- <value>tpm-crb</value>
- </enum>
- <enum name='backendModel'>
- <value>passthrough</value>
- <value>emulator</value>
- </enum>
- </tpm>
- </devices>
- <features>
- <gic supported='no'/>
- <vmcoreinfo supported='yes'/>
- <genid supported='yes'/>
- <backingStoreInput supported='no'/>
- <backup supported='no'/>
- <sev supported='no'/>
- </features>
-</domainCapabilities>
--
2.36.1
8:10 a.m.
New subject: [PATCH 02/11] qemuxml2(argv|xml)test: Drop qemu-3.1 version of 'cpu-Icelake-Server-pconfig'
Prior to qemu-3.2 we'd have to disable the 'pconfig' feature explicitly
which is no longer needed with new qemu. Remove the version locked to
qemu-3.1 as the 'latest' case sufficiently handles what we want to test.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 33 -------------------
tests/qemuxml2argvtest.c | 1 -
...pu-Icelake-Server-pconfig.x86_64-3.1.0.xml | 32 ------------------
tests/qemuxml2xmltest.c | 1 -
4 files changed, 67 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
deleted file mode 100644
index 5c9a0fd9d2..0000000000
--- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=test,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \
--machine pc-i440fx-3.1,usb=off,dump-guest-core=off \
--accel kvm \
--cpu Icelake-Server,pconfig=off,intel-pt=off \
--m 214 \
--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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 4ca1131377..3cbb428ee1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3424,7 +3424,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("vhost-user-vga");
DO_TEST_CAPS_LATEST("vhost-user-gpu-secondary");
- DO_TEST_CAPS_VER("cpu-Icelake-Server-pconfig", "3.1.0");
DO_TEST_CAPS_LATEST("cpu-Icelake-Server-pconfig");
DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-kvm-virt-4.2",
"aarch64");
diff --git a/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
b/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
deleted file mode 100644
index 0a2d113339..0000000000
--- a/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<domain type='kvm'>
- <name>test</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219100</memory>
- <currentMemory unit='KiB'>219100</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc-i440fx-3.1'>hvm</type>
- <boot dev='network'/>
- </os>
- <cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>Icelake-Server</model>
- <feature policy='disable' name='pconfig'/>
- </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='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 60114e3673..71bce98c17 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1353,7 +1353,6 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-graphics", "x86_64");
DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-graphics", "x86_64");
- DO_TEST_CAPS_VER("cpu-Icelake-Server-pconfig", "3.1.0");
DO_TEST_CAPS_LATEST("cpu-Icelake-Server-pconfig");
DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-kvm-virt-4.2",
"aarch64");
--
2.36.1
8:10 a.m.
New subject: [PATCH 03/11] qemuxml2argvtest: Drop 'qemu-4.1' versions of hyperv tests
The version-locked version of the test data is identical to the 'latest'
version so we can remove them.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../hyperv-off.x86_64-4.0.0.args | 31 -------------------
.../hyperv-panic.x86_64-4.0.0.args | 31 -------------------
.../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 31 -------------------
tests/qemuxml2argvtest.c | 3 --
4 files changed, 96 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
deleted file mode 100644
index be484daf84..0000000000
--- a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
+++ /dev/null
@@ -1,31 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--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/hyperv-panic.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
deleted file mode 100644
index 512f59169c..0000000000
--- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
+++ /dev/null
@@ -1,31 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,hv-crash \
--m 214 \
--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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
deleted file mode 100644
index 1efbc95985..0000000000
--- a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
+++ /dev/null
@@ -1,31 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu
'qemu64,hv-relaxed=on,hv-vapic=on,hv-spinlocks=0x2fff,hv-vpindex=on,hv-runtime=on,hv-synic=on,hv-stimer=on,hv-reset=on,hv-vendor-id=KVM
Hv,hv-frequencies=on,hv-reenlightenment=on,hv-tlbflush=on,hv-ipi=on,hv-evmcs=on' \
--m 214 \
--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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.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 3cbb428ee1..bdfb47f0e5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1269,11 +1269,8 @@ mymain(void)
DO_TEST_CAPS_VER("kvmclock+eoi-disabled", "4.0.0");
DO_TEST_CAPS_LATEST("kvmclock+eoi-disabled");
- DO_TEST_CAPS_VER("hyperv", "4.0.0");
DO_TEST_CAPS_LATEST("hyperv");
- DO_TEST_CAPS_VER("hyperv-off", "4.0.0");
DO_TEST_CAPS_LATEST("hyperv-off");
- DO_TEST_CAPS_VER("hyperv-panic", "4.0.0");
DO_TEST_CAPS_LATEST("hyperv-panic");
DO_TEST_CAPS_VER("hyperv-passthrough", "6.1.0");
DO_TEST_CAPS_LATEST("hyperv-passthrough");
--
2.36.1
8:10 a.m.
New subject: [PATCH 04/11] qemuxml2argvtest: Convert 'cpu-eoi-(disabled|enabled)' cases to VIR_TEST_CAPS_LATEST
The tested feature doesn't change across versions so we can use the
modern testing infrastructure.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...ed.args => cpu-eoi-disabled.x86_64-latest.args} | 14 ++++++++------
tests/qemuxml2argvdata/cpu-eoi-disabled.xml | 2 +-
...led.args => cpu-eoi-enabled.x86_64-latest.args} | 14 ++++++++------
tests/qemuxml2argvdata/cpu-eoi-enabled.xml | 2 +-
tests/qemuxml2argvtest.c | 6 ++++--
tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 2 +-
7 files changed, 24 insertions(+), 18 deletions(-)
rename tests/qemuxml2argvdata/{cpu-eoi-disabled.args =>
cpu-eoi-disabled.x86_64-latest.args} (53%)
rename tests/qemuxml2argvdata/{cpu-eoi-enabled.args =>
cpu-eoi-enabled.x86_64-latest.args} (53%)
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
b/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args
similarity index 53%
rename from tests/qemuxml2argvdata/cpu-eoi-disabled.args
rename to tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args
index b252446464..dfb4a53bfd 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args
@@ -6,15 +6,15 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
-cpu qemu32,kvm-pv-eoi=off \
-m 214 \
+-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 \
@@ -26,6 +26,8 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-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-eoi-disabled.xml
b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
index 657de0482a..c93e75e3e5 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
b/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args
similarity index 53%
rename from tests/qemuxml2argvdata/cpu-eoi-enabled.args
rename to tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args
index 849593269d..155d5ecef7 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args
@@ -6,15 +6,15 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
-cpu qemu32,kvm-pv-eoi=on \
-m 214 \
+-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 \
@@ -26,6 +26,8 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-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-eoi-enabled.xml
b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
index bc8934f260..1c24398f42 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index bdfb47f0e5..17d7ee9ab0 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1247,8 +1247,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("controller-usb-order");
- DO_TEST_NOCAPS("cpu-eoi-disabled");
- DO_TEST_NOCAPS("cpu-eoi-enabled");
DO_TEST("controller-order",
QEMU_CAPS_KVM,
QEMU_CAPS_PIIX3_USB_UHCI,
@@ -1258,6 +1256,10 @@ mymain(void)
QEMU_CAPS_USB_HUB,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DEVICE_CIRRUS_VGA);
+ /* 'eoi' cpu feature with an explicit CPU defined */
+ DO_TEST_CAPS_LATEST("cpu-eoi-disabled");
+ DO_TEST_CAPS_LATEST("cpu-eoi-enabled");
+ /* 'eoi' cpu feature without an explicit CPU defined */
DO_TEST_CAPS_VER("eoi-disabled", "4.0.0");
DO_TEST_CAPS_LATEST("eoi-disabled");
DO_TEST_CAPS_VER("eoi-enabled", "4.0.0");
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
index 7ae2c7034b..acd17da598 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
index bee4fd0240..49900aea9a 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
--
2.36.1
8:10 a.m.
New subject: [PATCH 05/11] qemuxml2argvtest: Remove qemu-4.0 versions of cpu feature test cases
The cpu feature formatting doesn't change between the versions thus we
can just keep the '-latest' versions.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../eoi-disabled.x86_64-4.0.0.args | 32 -------------------
.../eoi-enabled.x86_64-4.0.0.args | 32 -------------------
.../kvmclock+eoi-disabled.x86_64-4.0.0.args | 32 -------------------
.../pv-spinlock-disabled.x86_64-4.0.0.args | 32 -------------------
.../pv-spinlock-enabled.x86_64-4.0.0.args | 32 -------------------
tests/qemuxml2argvtest.c | 5 ---
6 files changed, 165 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
deleted file mode 100644
index 14080eabed..0000000000
--- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,kvm-pv-eoi=off \
--m 214 \
--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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--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/eoi-enabled.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
deleted file mode 100644
index f7ad06a1b5..0000000000
--- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,kvm-pv-eoi=on \
--m 214 \
--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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--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/kvmclock+eoi-disabled.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
deleted file mode 100644
index d1c15c4202..0000000000
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,kvmclock=off,kvm-pv-eoi=off \
--m 214 \
--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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--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/pv-spinlock-disabled.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
deleted file mode 100644
index f7055f4e38..0000000000
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,kvm-pv-unhalt=off \
--m 214 \
--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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--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/pv-spinlock-enabled.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
deleted file mode 100644
index ffb233f21c..0000000000
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,kvm-pv-unhalt=on \
--m 214 \
--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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 17d7ee9ab0..71ea3b4e0d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1260,15 +1260,10 @@ mymain(void)
DO_TEST_CAPS_LATEST("cpu-eoi-disabled");
DO_TEST_CAPS_LATEST("cpu-eoi-enabled");
/* 'eoi' cpu feature without an explicit CPU defined */
- DO_TEST_CAPS_VER("eoi-disabled", "4.0.0");
DO_TEST_CAPS_LATEST("eoi-disabled");
- DO_TEST_CAPS_VER("eoi-enabled", "4.0.0");
DO_TEST_CAPS_LATEST("eoi-enabled");
- DO_TEST_CAPS_VER("pv-spinlock-disabled", "4.0.0");
DO_TEST_CAPS_LATEST("pv-spinlock-disabled");
- DO_TEST_CAPS_VER("pv-spinlock-enabled", "4.0.0");
DO_TEST_CAPS_LATEST("pv-spinlock-enabled");
- DO_TEST_CAPS_VER("kvmclock+eoi-disabled", "4.0.0");
DO_TEST_CAPS_LATEST("kvmclock+eoi-disabled");
DO_TEST_CAPS_LATEST("hyperv");
--
2.36.1
8:10 a.m.
New subject: [PATCH 06/11] qemuxml2argvtest: Convert 'net-user' case to _LATEST
The tested net device has the same syntax with latest qemu so there's no
need to have a version-locked test for it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../net-user.x86_64-4.0.0.args | 35 -----------------
.../net-user.x86_64-latest.args | 38 +++++++++++++++++++
tests/qemuxml2argvtest.c | 2 +-
3 files changed, 39 insertions(+), 36 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
create mode 100644 tests/qemuxml2argvdata/net-user.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
deleted file mode 100644
index 2389919eb7..0000000000
--- a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--netdev user,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-user.x86_64-latest.args
b/tests/qemuxml2argvdata/net-user.x86_64-latest.args
new file mode 100644
index 0000000000..87423d4cad
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-user.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-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":"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}'
\
+-netdev user,id=hostnet0 \
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 71ea3b4e0d..324475475e 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1592,7 +1592,7 @@ mymain(void)
DO_TEST_NOCAPS("net-vhostuser-multiq");
DO_TEST_FAILURE_NOCAPS("net-vhostuser-fail");
DO_TEST_NOCAPS("net-user");
- DO_TEST_CAPS_ARCH_VER_FULL("net-user", "x86_64",
"4.0.0", ARG_FLAGS, FLAG_SLIRP_HELPER);
+ DO_TEST_CAPS_ARCH_LATEST_FULL("net-user", "x86_64", ARG_FLAGS,
FLAG_SLIRP_HELPER);
DO_TEST_NOCAPS("net-user-addr");
DO_TEST_NOCAPS("net-virtio");
DO_TEST("net-virtio-device",
--
2.36.1
8:10 a.m.
New subject: [PATCH 07/11] qemuxml2argvtest: Make 'qemu-ns' test case more stable
The test was showing that the 'blockdev' capability is properly added
despite although we didn't detect it yet. Unfortunately this test
can't be carried over once we bump minimum qemu version to qemu-4.2.
Make the test case future-proof by removing the qemu-4.0.0 version which
would become pointless and use only already deprecated capability flags
so that the test output does not change.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../qemu-ns.x86_64-4.0.0.args | 38 -------------------
tests/qemuxml2argvdata/qemu-ns.xml | 1 -
tests/qemuxml2argvtest.c | 1 -
.../qemu-ns.x86_64-latest.xml | 1 -
4 files changed, 41 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
deleted file mode 100644
index 284f32d6a1..0000000000
--- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-NS=ns \
-BAR='' \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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 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=ua-disk,bootindex=1,prop1=propval1,prop2=-321,prop3=123,prop4=on,prop5=off
\
--device 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.xml b/tests/qemuxml2argvdata/qemu-ns.xml
index 36bf582dec..dc98421226 100644
--- a/tests/qemuxml2argvdata/qemu-ns.xml
+++ b/tests/qemuxml2argvdata/qemu-ns.xml
@@ -30,7 +30,6 @@
</qemu:commandline>
<qemu:capabilities>
<qemu:add capability="vnc-colon"/>
- <qemu:add capability="blockdev"/>
<qemu:del capability="name"/>
</qemu:capabilities>
<qemu:override>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 324475475e..e14ed8b882 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2036,7 +2036,6 @@ mymain(void)
QEMU_CAPS_LAST,
ARG_END);
- DO_TEST_CAPS_VER("qemu-ns", "4.0.0");
DO_TEST_CAPS_LATEST("qemu-ns");
DO_TEST_NOCAPS("qemu-ns-no-env");
DO_TEST_NOCAPS("qemu-ns-alt");
diff --git a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml
index a8998ae582..b788038f29 100644
--- a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml
@@ -46,7 +46,6 @@
</qemu:commandline>
<qemu:capabilities>
<qemu:add capability='vnc-colon'/>
- <qemu:add capability='blockdev'/>
<qemu:del capability='name'/>
</qemu:capabilities>
<qemu:override>
--
2.36.1
8:55 a.m.
New subject: [PATCH 07/11] qemuxml2argvtest: Make 'qemu-ns' test case more stable
On a Thursday in 2022, Peter Krempa wrote:
The test was showing that the 'blockdev' capability is
properly added
despite although we didn't detect it yet. Unfortunately this test
d/despite /
or
d/although /
Jano
can't be carried over once we bump minimum qemu version to
qemu-4.2.
Make the test case future-proof by removing the qemu-4.0.0 version which
would become pointless and use only already deprecated capability flags
so that the test output does not change.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../qemu-ns.x86_64-4.0.0.args | 38 -------------------
tests/qemuxml2argvdata/qemu-ns.xml | 1 -
tests/qemuxml2argvtest.c | 1 -
.../qemu-ns.x86_64-latest.xml | 1 -
4 files changed, 41 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
8:10 a.m.
New subject: [PATCH 08/11] qemuxml2argvtest: Move real-caps versions of cpu-host tests out of the block setting fake host cpu
Make it obvious that the fake cpu does not apply to the test cases based
on real capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e14ed8b882..74a1baa018 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2120,12 +2120,13 @@ mymain(void)
DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM);
DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM);
DO_TEST_NOCAPS("cpu-host-model-cmt");
- DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM);
+ qemuTestSetHostCPU(&driver, driver.hostarch, NULL);
+
+ DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
DO_TEST_CAPS_VER("cpu-tsc-frequency", "4.0.0");
DO_TEST_CAPS_VER("cpu-translation", "4.0.0");
DO_TEST_CAPS_LATEST("cpu-translation");
- qemuTestSetHostCPU(&driver, driver.hostarch, NULL);
DO_TEST_NOCAPS("memtune");
DO_TEST_NOCAPS("memtune-unlimited");
--
2.36.1
8:10 a.m.
New subject: [PATCH 09/11] qemu: Remove qemu-4.0 version of 'cpu-translation' test case
The cpu commandline is identical with the '-latest' version so there's
no need for a separate case.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../cpu-translation.x86_64-4.0.0.args | 33 -------------------
tests/qemuxml2argvtest.c | 1 -
2 files changed, 34 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
deleted file mode 100644
index 09141106d5..0000000000
--- a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu
Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,kvm-pv-unhalt=on
\
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-fade-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 \
--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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 74a1baa018..a99b44bf2d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2125,7 +2125,6 @@ mymain(void)
DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
DO_TEST_CAPS_VER("cpu-tsc-frequency", "4.0.0");
- DO_TEST_CAPS_VER("cpu-translation", "4.0.0");
DO_TEST_CAPS_LATEST("cpu-translation");
DO_TEST_NOCAPS("memtune");
--
2.36.1
8:10 a.m.
New subject: [PATCH 10/11] qemucapabilitiestest: Fake proper version for 'caps_4.2.0.ppc64' case
The capabilities for that version were not updated from the development
version and thus would fail our upcoming minimum version change. Fake
the data to report 4.2.0.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies | 4 ++--
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
index d0b21ef123..4ed901c3de 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
@@ -17,8 +17,8 @@
{
"return": {
"qemu": {
- "micro": 50,
- "minor": 1,
+ "micro": 0,
+ "minor": 2,
"major": 4
},
"package": "v4.1.0-2198-g9e583f2"
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 1586f28ca5..7c5275210b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -159,7 +159,7 @@
<flag name='input-linux'/>
<flag name='query-display-options'/>
<flag name='virtio-blk.queue-size'/>
- <version>4001050</version>
+ <version>4002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900242</microcodeVersion>
<package>v4.1.0-2198-g9e583f2</package>
--
2.36.1
8:10 a.m.
New subject: [PATCH 11/11] qemucapabilitiestest: Fake proper version for 'caps_4.2.0.aarch64' case
The capabilities for that version were not updated from the development
version and thus would fail our upcoming minimum version change. Fake
the data to report 4.2.0.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies | 4 ++--
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index bd4a6bf41e..5321348322 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -17,8 +17,8 @@
{
"return": {
"qemu": {
- "micro": 50,
- "minor": 1,
+ "micro": 0,
+ "minor": 2,
"major": 4
},
"package": "v4.1.0-2221-g36609b4fa3"
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 833bf955f9..162ace7b2b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -162,7 +162,7 @@
<flag name='input-linux'/>
<flag name='query-display-options'/>
<flag name='virtio-blk.queue-size'/>
- <version>4001050</version>
+ <version>4002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700242</microcodeVersion>
<package>v4.1.0-2221-g36609b4fa3</package>
--
2.36.1
8:57 a.m.
On a Thursday in 2022, Peter Krempa wrote:
These patches originate from my upcoming series bumping minimum qemu
version to 4.2 and are valid even without the qemu version bump.
Peter Krempa (11):
test: domaincaps: Remove old test data
qemuxml2(argv|xml)test: Drop qemu-3.1 version of
'cpu-Icelake-Server-pconfig'
qemuxml2argvtest: Drop 'qemu-4.1' versions of hyperv tests
qemuxml2argvtest: Convert 'cpu-eoi-(disabled|enabled)' cases to
VIR_TEST_CAPS_LATEST
qemuxml2argvtest: Remove qemu-4.0 versions of cpu feature test cases
qemuxml2argvtest: Convert 'net-user' case to _LATEST
qemuxml2argvtest: Make 'qemu-ns' test case more stable
qemuxml2argvtest: Move real-caps versions of cpu-host tests out of the
block setting fake host cpu
qemu: Remove qemu-4.0 version of 'cpu-translation' test case
qemucapabilitiestest: Fake proper version for 'caps_4.2.0.ppc64' case
qemucapabilitiestest: Fake proper version for 'caps_4.2.0.aarch64'
case
.../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 191 ---------------
.../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 204 ----------------
[...]
.../qemu-ns.x86_64-latest.xml | 1 -
tests/qemuxml2xmltest.c | 1 -
43 files changed, 41 insertions(+), 3578 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
899
days inactive
899
days old
13 comments
2 participants
participants (2)
-
Ján Tomko -
Peter Krempa