qemucapabilitiestest: Test all capabilities

Enhance the test to cover all capabilities we probe for rather than
testing the flags only.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml b/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml
index 990661bf38e91a56204e8c555f0b3339b76bb020..32f981db0cd93f493f945de24823bf7ec14d0a4d 100644 (file)
--- a/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml
+++ b/tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml
@@ -3,6 +3,7 @@
   <domain>kvm</domain>
   <machine>pc-1.2</machine>
   <arch>x86_64</arch>
+  <vcpu max='255'/>
   <os supported='yes'>
     <loader supported='yes'>
       <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>

diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.caps
index 4fdb88b1c4308afaf26940e4813e5ca200c2f39b..257a12389606e87ffa04747662fe8ec2bc0c21da 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.caps
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.caps
@@ -1,4 +1,8 @@
 <qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
@@ -114,4 +118,42 @@
   <flag name='qxl.vram64_size_mb'/>
   <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
+  <version>1002002</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='qemu64'/>
+  <cpu name='phenom'/>
+  <cpu name='core2duo'/>
+  <cpu name='kvm64'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm32'/>
+  <cpu name='coreduo'/>
+  <cpu name='486'/>
+  <cpu name='pentium'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium3'/>
+  <cpu name='athlon'/>
+  <cpu name='n270'/>
+  <cpu name='Conroe'/>
+  <cpu name='Penryn'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Westmere'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G4'/>
+  <machine name='pc-1.2' alias='pc' maxCpus='0'/>
+  <machine name='xenpv' maxCpus='0'/>
+  <machine name='xenfv' maxCpus='0'/>
+  <machine name='isapc' maxCpus='0'/>
+  <machine name='pc-0.10' maxCpus='0'/>
+  <machine name='pc-0.11' maxCpus='0'/>
+  <machine name='pc-0.12' maxCpus='0'/>
+  <machine name='pc-0.13' maxCpus='0'/>
+  <machine name='pc-0.14' maxCpus='0'/>
+  <machine name='pc-0.15' maxCpus='0'/>
+  <machine name='pc-1.0' maxCpus='0'/>
+  <machine name='pc-1.1' maxCpus='0'/>
 </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.caps
index 6aac9c789d001aabfbae02286390e6e37eb88017..6f6a5b9b9528736a18d4282ea88b2f77644f5133 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.caps
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.caps
@@ -1,4 +1,8 @@
 <qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
@@ -130,4 +134,46 @@
   <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
+  <version>1003001</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='qemu64'/>
+  <cpu name='phenom'/>
+  <cpu name='core2duo'/>
+  <cpu name='kvm64'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm32'/>
+  <cpu name='coreduo'/>
+  <cpu name='486'/>
+  <cpu name='pentium'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium3'/>
+  <cpu name='athlon'/>
+  <cpu name='n270'/>
+  <cpu name='Conroe'/>
+  <cpu name='Penryn'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Westmere'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Haswell'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G5'/>
+  <machine name='pc-1.3' alias='pc' maxCpus='0'/>
+  <machine name='xenpv' maxCpus='0'/>
+  <machine name='q35-next' alias='q35' maxCpus='0'/>
+  <machine name='xenfv' maxCpus='0'/>
+  <machine name='isapc' maxCpus='0'/>
+  <machine name='pc-0.10' maxCpus='0'/>
+  <machine name='pc-0.11' maxCpus='0'/>
+  <machine name='pc-0.12' maxCpus='0'/>
+  <machine name='pc-0.13' maxCpus='0'/>
+  <machine name='pc-0.14' maxCpus='0'/>
+  <machine name='pc-0.15' maxCpus='0'/>
+  <machine name='pc-1.0' maxCpus='0'/>
+  <machine name='pc-1.1' maxCpus='0'/>
+  <machine name='pc-1.2' maxCpus='0'/>
 </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.caps
index b3440b5516cbca72f999010e222a09a06ba30e6e..18550e29babdc2ca585adfba3ce79240713d30fc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.caps
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.caps
@@ -1,4 +1,8 @@
 <qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
@@ -131,4 +135,47 @@
   <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
+  <version>1004002</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Haswell'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-1.4' alias='pc' maxCpus='0'/>
+  <machine name='xenpv' maxCpus='0'/>
+  <machine name='pc-q35-1.4' alias='q35' maxCpus='0'/>
+  <machine name='xenfv' maxCpus='0'/>
+  <machine name='isapc' maxCpus='0'/>
+  <machine name='pc-0.10' maxCpus='0'/>
+  <machine name='pc-0.11' maxCpus='0'/>
+  <machine name='pc-0.12' maxCpus='0'/>
+  <machine name='pc-0.13' maxCpus='0'/>
+  <machine name='pc-0.14' maxCpus='0'/>
+  <machine name='pc-0.15' maxCpus='0'/>
+  <machine name='pc-1.0' maxCpus='0'/>
+  <machine name='pc-1.1' maxCpus='0'/>
+  <machine name='pc-1.2' maxCpus='0'/>
+  <machine name='pc-1.3' maxCpus='0'/>
 </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.caps
index 69f1ae0cffd6716cd8d1a5ac221cfb68df53e468..72f09f7a6beead0e712c3112b77af189255c7d60 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.caps
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.caps
@@ -1,4 +1,8 @@
 <qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
@@ -140,4 +144,47 @@
   <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
+  <version>1005003</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Haswell'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-1.5' alias='pc' maxCpus='255'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-q35-1.5' alias='q35' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
 </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.caps
index 90ea076a14f5540085b5e18965e749d2411ebbcd..c612c11ecc00cce6a6394dd89831bdb328b447a2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.caps
@@ -1,4 +1,8 @@
 <qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
@@ -146,4 +150,51 @@
   <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
+  <version>1006000</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Haswell'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-1.6' alias='pc' maxCpus='255'/>
+  <machine name='xenpv' maxCpus='1'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='pc-q35-1.6' alias='q35' maxCpus='255'/>
+  <machine name='xenfv' maxCpus='128'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
 </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.caps
index 8fcdae23f4be76874bb19e3adefc506085e5bb7b..f4603c155f91ed3670a998d79d56267f698c2b84 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.caps
@@ -1,4 +1,8 @@
 <qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
@@ -146,4 +150,53 @@
   <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
+  <version>1006050</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Haswell'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-1.7' alias='pc' maxCpus='255'/>
+  <machine name='xenpv' maxCpus='1'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='pc-q35-1.6' maxCpus='255'/>
+  <machine name='pc-q35-1.7' alias='q35' maxCpus='255'/>
+  <machine name='xenfv' maxCpus='128'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+  <machine name='pc-i440fx-1.6' maxCpus='255'/>
 </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.caps
index ac5d29fbbffec61eb2c112401e6788f3dcc85c50..4663e192bc03096ef9b9a637a0c3662414dfa213 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.caps
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.caps
@@ -1,4 +1,8 @@
 <qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
@@ -164,4 +168,58 @@
   <flag name='debug-threads'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
+  <version>2001001</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Broadwell'/>
+  <cpu name='Haswell'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-2.1' alias='pc' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-q35-1.6' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='xenpv' maxCpus='1'/>
+  <machine name='pc-i440fx-1.6' maxCpus='255'/>
+  <machine name='pc-i440fx-1.7' maxCpus='255'/>
+  <machine name='pc-q35-2.1' alias='q35' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='xenfv' maxCpus='128'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-q35-2.0' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-q35-1.7' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-i440fx-2.0' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
 </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.caps
index 249a507e16a38458c5ceed358bb8a9b1200378a9..a8df7e1c41b729b81ac95b92efa7f54887e61441 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.caps
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.caps
@@ -1,4 +1,8 @@
 <qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
@@ -177,4 +181,65 @@
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
+  <version>2004000</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Broadwell'/>
+  <cpu name='Broadwell-noTSX'/>
+  <cpu name='Haswell'/>
+  <cpu name='Haswell-noTSX'/>
+  <cpu name='IvyBridge'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-q35-1.6' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='pc-i440fx-1.6' maxCpus='255'/>
+  <machine name='pc-q35-2.2' maxCpus='255'/>
+  <machine name='pc-i440fx-1.7' maxCpus='255'/>
+  <machine name='pc-q35-2.1' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-i440fx-2.2' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-i440fx-2.3' maxCpus='255'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+  <machine name='pc-q35-2.0' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-i440fx-2.1' maxCpus='255'/>
+  <machine name='pc-q35-1.7' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-i440fx-2.0' maxCpus='255'/>
+  <machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
+  <machine name='pc-q35-2.3' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
 </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.caps
index 9b30bbb77851b4005ac5c35f78c7e459e9cc0437..216017377e2629db5a70f8fd055dff18150d0231 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.caps
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.caps
@@ -1,4 +1,8 @@
 <qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
@@ -178,4 +182,65 @@
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
+  <version>2004000</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Broadwell'/>
+  <cpu name='Broadwell-noTSX'/>
+  <cpu name='Haswell'/>
+  <cpu name='Haswell-noTSX'/>
+  <cpu name='IvyBridge'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-q35-1.6' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='pc-i440fx-1.6' maxCpus='255'/>
+  <machine name='pc-q35-2.2' maxCpus='255'/>
+  <machine name='pc-i440fx-1.7' maxCpus='255'/>
+  <machine name='pc-q35-2.1' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-i440fx-2.2' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-i440fx-2.3' maxCpus='255'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+  <machine name='pc-q35-2.0' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-i440fx-2.1' maxCpus='255'/>
+  <machine name='pc-q35-1.7' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-i440fx-2.0' maxCpus='255'/>
+  <machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
+  <machine name='pc-q35-2.3' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
 </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.caps
index 905144aee87410ea801e6cafbfc8d89b222b61e7..9024d6388221f5f166822a86bcb0a630018686bb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.caps
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.caps
@@ -1,4 +1,8 @@
 <qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
@@ -183,4 +187,65 @@
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
+  <version>2005050</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Broadwell'/>
+  <cpu name='Broadwell-noTSX'/>
+  <cpu name='Haswell'/>
+  <cpu name='Haswell-noTSX'/>
+  <cpu name='IvyBridge'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-q35-1.6' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='pc-i440fx-1.6' maxCpus='255'/>
+  <machine name='pc-q35-2.2' maxCpus='255'/>
+  <machine name='pc-i440fx-1.7' maxCpus='255'/>
+  <machine name='pc-q35-2.1' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-i440fx-2.2' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-i440fx-2.3' maxCpus='255'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+  <machine name='pc-q35-2.0' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-i440fx-2.1' maxCpus='255'/>
+  <machine name='pc-q35-1.7' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-i440fx-2.0' maxCpus='255'/>
+  <machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
+  <machine name='pc-q35-2.3' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
 </qemuCaps>

diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 80f3cd8daa9b1d0effd9f9b04ae63fb195587da4..8b73a8910ae661e320d916c429bc44234c328706 100644 (file)
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -22,7 +22,8 @@
 #include "testutils.h"
 #include "testutilsqemu.h"
 #include "qemumonitortestutils.h"
-
+#define __QEMU_CAPSRIV_H_ALLOW__
+#include "qemu/qemu_capspriv.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
@@ -85,42 +86,17 @@ testQemuFeedMonitor(char *replies,
     return NULL;
 }
 
-static int
-testQemuCapsCompare(virQEMUCapsPtr capsExpected,
-                    virQEMUCapsPtr capsActual)
-{
-    int ret = 0;
-    size_t i;
-
-    for (i = 0; i < QEMU_CAPS_LAST; i++) {
-        if (virQEMUCapsGet(capsExpected, i) &&
-            !virQEMUCapsGet(capsActual, i)) {
-            fprintf(stderr, "Expected caps flag not set: %s\n",
-                    virQEMUCapsTypeToString(i));
-            ret = -1;
-        }
-
-        if (!virQEMUCapsGet(capsExpected, i) &&
-            virQEMUCapsGet(capsActual, i)) {
-            fprintf(stderr, "Unexpected caps flag set: %s\n",
-                    virQEMUCapsTypeToString(i));
-            ret = -1;
-        }
-    }
-
-    return ret;
-}
-
 static int
 testQemuCaps(const void *opaque)
 {
     int ret = -1;
     const testQemuData *data = opaque;
-    char *repliesFile = NULL, *capsFile = NULL;
+    char *repliesFile = NULL;
+    char *capsFile = NULL;
     char *replies = NULL;
     qemuMonitorTestPtr mon = NULL;
-    virQEMUCapsPtr capsExpected = NULL;
     virQEMUCapsPtr capsActual = NULL;
+    char *actual = NULL;
 
     if (virAsprintf(&repliesFile, "%s/qemucapabilitiesdata/%s.%s.replies",
                     abs_srcdir, data->base, data->archName) < 0 ||
@@ -134,17 +110,15 @@ testQemuCaps(const void *opaque)
     if (!(mon = testQemuFeedMonitor(replies, data->xmlopt)))
         goto cleanup;
 
-    if (!(capsExpected = qemuTestParseCapabilities(capsFile)))
-        goto cleanup;
-
-    if (!(capsActual = virQEMUCapsNew()))
+    if (!(capsActual = virQEMUCapsNew()) ||
+        virQEMUCapsInitQMPMonitor(capsActual,
+                                  qemuMonitorTestGetMonitor(mon)) < 0)
         goto cleanup;
 
-    if (virQEMUCapsInitQMPMonitor(capsActual,
-                                  qemuMonitorTestGetMonitor(mon)) < 0)
+    if (!(actual = virQEMUCapsFormatCache(capsActual, 0, 0)))
         goto cleanup;
 
-    if (testQemuCapsCompare(capsExpected, capsActual) < 0)
+    if (virtTestCompareToFile(actual, capsFile) < 0)
         goto cleanup;
 
     ret = 0;
@@ -152,8 +126,8 @@ testQemuCaps(const void *opaque)
     VIR_FREE(repliesFile);
     VIR_FREE(capsFile);
     VIR_FREE(replies);
+    VIR_FREE(actual);
     qemuMonitorTestFree(mon);
-    virObjectUnref(capsExpected);
     virObjectUnref(capsActual);
     return ret;
 }

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 114cd24265b33b00adae6e222df6b4d10fc22476..8f7f52b89c120c231a445dc1dccdf502173e3f0f 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -452,48 +452,19 @@ virQEMUCapsPtr
 qemuTestParseCapabilities(const char *capsFile)
 {
     virQEMUCapsPtr qemuCaps = NULL;
-    xmlDocPtr xml;
-    xmlXPathContextPtr ctxt = NULL;
-    ssize_t i, n;
-    xmlNodePtr *nodes = NULL;
+    time_t qemuctime;
+    time_t selfctime;
+    unsigned long version;
 
-    if (!(xml = virXMLParseFileCtxt(capsFile, &ctxt)))
+    if (!(qemuCaps = virQEMUCapsNew()) ||
+        virQEMUCapsLoadCache(qemuCaps, capsFile,
+                             &qemuctime, &selfctime, &version) < 0)
         goto error;
 
-    if ((n = virXPathNodeSet("/qemuCaps/flag", ctxt, &nodes)) < 0) {
-        fprintf(stderr, "failed to parse qemu capabilities flags");
-        goto error;
-    }
-
-    if (n > 0) {
-        if (!(qemuCaps = virQEMUCapsNew()))
-            goto error;
-
-        for (i = 0; i < n; i++) {
-            char *str = virXMLPropString(nodes[i], "name");
-            if (str) {
-                int flag = virQEMUCapsTypeFromString(str);
-                if (flag < 0) {
-                    fprintf(stderr, "Unknown qemu capabilities flag %s", str);
-                    VIR_FREE(str);
-                    goto error;
-                }
-                VIR_FREE(str);
-                virQEMUCapsSet(qemuCaps, flag);
-            }
-        }
-    }
-
-    VIR_FREE(nodes);
-    xmlFreeDoc(xml);
-    xmlXPathFreeContext(ctxt);
     return qemuCaps;
 
  error:
-    VIR_FREE(nodes);
     virObjectUnref(qemuCaps);
-    xmlFreeDoc(xml);
-    xmlXPathFreeContext(ctxt);
     return NULL;
 }