Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
.../domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml | 116 +++++++++++++++++++++
tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml | 116 +++++++++++++++++++++
tests/domaincapstest.c | 8 ++
3 files changed, 240 insertions(+)
create mode 100644 tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml
create mode 100644 tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml
diff --git a/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml
new file mode 100644
index 0000000..fe598e9
--- /dev/null
+++ b/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml
@@ -0,0 +1,116 @@
+<domainCapabilities>
+ <path>/usr/bin/qemu-system-x86_64</path>
+ <domain>qemu</domain>
+ <machine>pc-i440fx-2.8</machine>
+ <arch>x86_64</arch>
+ <vcpu max='255'/>
+ <os supported='yes'>
+ <loader supported='yes'>
+ <value>/usr/share/AAVMF/AAVMF_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>
+ </loader>
+ </os>
+ <cpu>
+ <mode name='host-passthrough' supported='no'/>
+ <mode name='host-model' supported='yes'>
+ <model fallback='allow'>Broadwell</model>
+ </mode>
+ <mode name='custom' supported='yes'>
+ <model usable='unknown'>qemu64</model>
+ <model usable='unknown'>qemu32</model>
+ <model usable='unknown'>phenom</model>
+ <model usable='unknown'>pentium3</model>
+ <model usable='unknown'>pentium2</model>
+ <model usable='unknown'>pentium</model>
+ <model usable='unknown'>n270</model>
+ <model usable='unknown'>kvm64</model>
+ <model usable='unknown'>kvm32</model>
+ <model usable='unknown'>coreduo</model>
+ <model usable='unknown'>core2duo</model>
+ <model usable='unknown'>athlon</model>
+ <model usable='unknown'>Westmere</model>
+ <model usable='unknown'>Skylake-Client</model>
+ <model usable='unknown'>SandyBridge</model>
+ <model usable='unknown'>Penryn</model>
+ <model usable='unknown'>Opteron_G5</model>
+ <model usable='unknown'>Opteron_G4</model>
+ <model usable='unknown'>Opteron_G3</model>
+ <model usable='unknown'>Opteron_G2</model>
+ <model usable='unknown'>Opteron_G1</model>
+ <model usable='unknown'>Nehalem</model>
+ <model usable='unknown'>IvyBridge</model>
+ <model usable='unknown'>Haswell</model>
+ <model usable='unknown'>Haswell-noTSX</model>
+ <model usable='unknown'>Conroe</model>
+ <model usable='unknown'>Broadwell</model>
+ <model usable='unknown'>Broadwell-noTSX</model>
+ <model usable='unknown'>486</model>
+ </mode>
+ </cpu>
+ <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>
+ </enum>
+ </disk>
+ <graphics supported='yes'>
+ <enum name='type'>
+ <value>sdl</value>
+ <value>vnc</value>
+ <value>spice</value>
+ </enum>
+ </graphics>
+ <video supported='yes'>
+ <enum name='modelType'>
+ <value>vga</value>
+ <value>cirrus</value>
+ <value>vmvga</value>
+ <value>qxl</value>
+ <value>virtio</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>kvm</value>
+ <value>vfio</value>
+ </enum>
+ </hostdev>
+ </devices>
+ <features>
+ <gic supported='no'/>
+ </features>
+</domainCapabilities>
diff --git a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml
new file mode 100644
index 0000000..7b8f90e
--- /dev/null
+++ b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml
@@ -0,0 +1,116 @@
+<domainCapabilities>
+ <path>/usr/bin/qemu-system-x86_64</path>
+ <domain>kvm</domain>
+ <machine>pc-i440fx-2.8</machine>
+ <arch>x86_64</arch>
+ <vcpu max='255'/>
+ <os supported='yes'>
+ <loader supported='yes'>
+ <value>/usr/share/AAVMF/AAVMF_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>
+ </loader>
+ </os>
+ <cpu>
+ <mode name='host-passthrough' supported='yes'/>
+ <mode name='host-model' supported='yes'>
+ <model fallback='allow'>Broadwell</model>
+ </mode>
+ <mode name='custom' supported='yes'>
+ <model usable='unknown'>qemu64</model>
+ <model usable='unknown'>qemu32</model>
+ <model usable='unknown'>phenom</model>
+ <model usable='unknown'>pentium3</model>
+ <model usable='unknown'>pentium2</model>
+ <model usable='unknown'>pentium</model>
+ <model usable='unknown'>n270</model>
+ <model usable='unknown'>kvm64</model>
+ <model usable='unknown'>kvm32</model>
+ <model usable='unknown'>coreduo</model>
+ <model usable='unknown'>core2duo</model>
+ <model usable='unknown'>athlon</model>
+ <model usable='unknown'>Westmere</model>
+ <model usable='unknown'>Skylake-Client</model>
+ <model usable='unknown'>SandyBridge</model>
+ <model usable='unknown'>Penryn</model>
+ <model usable='unknown'>Opteron_G5</model>
+ <model usable='unknown'>Opteron_G4</model>
+ <model usable='unknown'>Opteron_G3</model>
+ <model usable='unknown'>Opteron_G2</model>
+ <model usable='unknown'>Opteron_G1</model>
+ <model usable='unknown'>Nehalem</model>
+ <model usable='unknown'>IvyBridge</model>
+ <model usable='unknown'>Haswell</model>
+ <model usable='unknown'>Haswell-noTSX</model>
+ <model usable='unknown'>Conroe</model>
+ <model usable='unknown'>Broadwell</model>
+ <model usable='unknown'>Broadwell-noTSX</model>
+ <model usable='unknown'>486</model>
+ </mode>
+ </cpu>
+ <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>
+ </enum>
+ </disk>
+ <graphics supported='yes'>
+ <enum name='type'>
+ <value>sdl</value>
+ <value>vnc</value>
+ <value>spice</value>
+ </enum>
+ </graphics>
+ <video supported='yes'>
+ <enum name='modelType'>
+ <value>vga</value>
+ <value>cirrus</value>
+ <value>vmvga</value>
+ <value>qxl</value>
+ <value>virtio</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>kvm</value>
+ <value>vfio</value>
+ </enum>
+ </hostdev>
+ </devices>
+ <features>
+ <gic supported='no'/>
+ </features>
+</domainCapabilities>
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index e70fa05..fea5120 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -435,6 +435,14 @@ mymain(void)
"/usr/bin/qemu-system-ppc64", NULL,
"ppc64le", VIR_DOMAIN_VIRT_KVM);
+ DO_TEST_QEMU("2.8.0", "caps_2.8.0",
+ "/usr/bin/qemu-system-x86_64", NULL,
+ "x86_64", VIR_DOMAIN_VIRT_KVM);
+
+ DO_TEST_QEMU("2.8.0-tcg", "caps_2.8.0",
+ "/usr/bin/qemu-system-x86_64", NULL,
+ "x86_64", VIR_DOMAIN_VIRT_QEMU);
+
#endif /* WITH_QEMU */
#if WITH_LIBXL
--
2.10.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
