tests: qemudomainsnapshotxml2xmlout: Use real 'x86_64' capabilities in all test data

Use the platform which is getting most development for the snapshot XML
examples so that it's tested against latest capabilities.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
index 24b41ba7c5c401727199dfe1673ac8184821e346..736a260eab419a2c256415e633bfcd01d96315b6 100644 (file)
--- a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
@@ -31,15 +31,18 @@
     <currentMemory unit='KiB'>219100</currentMemory>
     <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
     <os>
-      <type arch='i686' machine='pc'>hvm</type>
+      <type arch='x86_64' machine='pc'>hvm</type>
       <boot dev='hd'/>
     </os>
+    <cpu mode='custom' match='exact' check='none'>
+      <model fallback='forbid'>qemu64</model>
+    </cpu>
     <clock offset='utc'/>
     <on_poweroff>destroy</on_poweroff>
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i386</emulator>
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <disk type='block' device='disk'>
         <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>
@@ -76,7 +79,7 @@
         <target dev='hdf' bus='ide'/>
         <address type='drive' controller='0' bus='5' target='0' unit='0'/>
       </disk>
-      <controller type='usb' index='0'>
+      <controller type='usb' index='0' model='piix3-uhci'>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
       </controller>
       <controller type='ide' index='0'>

diff --git a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
index eae4691c1cb4c6d9c3e18e2ad8163d3416929127..da717cb23614c337c21769a4d4c7d91d93f4f2b0 100644 (file)
--- a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
@@ -21,22 +21,25 @@
     <currentMemory unit='KiB'>219100</currentMemory>
     <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
     <os>
-      <type arch='i686' machine='pc'>hvm</type>
+      <type arch='x86_64' machine='pc'>hvm</type>
       <boot dev='hd'/>
     </os>
+    <cpu mode='custom' match='exact' check='none'>
+      <model fallback='forbid'>qemu64</model>
+    </cpu>
     <clock offset='utc'/>
     <on_poweroff>destroy</on_poweroff>
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i386</emulator>
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <disk type='block' device='disk' snapshot='no'>
         <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>
         <target dev='hda' bus='ide'/>
         <address type='drive' controller='0' bus='0' target='0' unit='0'/>
       </disk>
-      <controller type='usb' index='0'>
+      <controller type='usb' index='0' model='piix3-uhci'>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
       </controller>
       <controller type='ide' index='0'>

diff --git a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
index 1ddaa2a9aac711998a40eb96044bceff1a4baa8f..643f20269baa546f07f2419939c9a4ae768b95e4 100644 (file)
--- a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
@@ -14,22 +14,25 @@
     <currentMemory unit='KiB'>219100</currentMemory>
     <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
     <os>
-      <type arch='i686' machine='pc'>hvm</type>
+      <type arch='x86_64' machine='pc'>hvm</type>
       <boot dev='hd'/>
     </os>
+    <cpu mode='custom' match='exact' check='none'>
+      <model fallback='forbid'>qemu64</model>
+    </cpu>
     <clock offset='utc'/>
     <on_poweroff>destroy</on_poweroff>
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i386</emulator>
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <disk type='block' device='disk'>
         <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>
         <target dev='hda' bus='ide'/>
         <address type='drive' controller='0' bus='0' target='0' unit='0'/>
       </disk>
-      <controller type='usb' index='0'>
+      <controller type='usb' index='0' model='piix3-uhci'>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
       </controller>
       <controller type='ide' index='0'>

diff --git a/tests/qemudomainsnapshotxml2xmlout/metadata.xml b/tests/qemudomainsnapshotxml2xmlout/metadata.xml
index 4b14c9efde12a4c27493b171fb5e07103dd48845..3fae6aa9e4eda8494f036fba903bd2895925601b 100644 (file)
--- a/tests/qemudomainsnapshotxml2xmlout/metadata.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/metadata.xml
@@ -18,22 +18,25 @@
     <currentMemory unit='KiB'>219100</currentMemory>
     <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
     <os>
-      <type arch='i686' machine='pc'>hvm</type>
+      <type arch='x86_64' machine='pc'>hvm</type>
       <boot dev='hd'/>
     </os>
+    <cpu mode='custom' match='exact' check='none'>
+      <model fallback='forbid'>qemu64</model>
+    </cpu>
     <clock offset='utc'/>
     <on_poweroff>destroy</on_poweroff>
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i386</emulator>
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <disk type='block' device='disk'>
         <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>
         <target dev='hda' bus='ide'/>
         <address type='drive' controller='0' bus='0' target='0' unit='0'/>
       </disk>
-      <controller type='usb' index='0'>
+      <controller type='usb' index='0' model='piix3-uhci'>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
       </controller>
       <controller type='ide' index='0'>

diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.c
index a09404a9d518540588576fdb7a3cb964dab4d143..035c275b1429af9dcc4f13267d0937881de85eb0 100644 (file)
--- a/tests/qemudomainsnapshotxml2xmltest.c
+++ b/tests/qemudomainsnapshotxml2xmltest.c
@@ -109,11 +109,17 @@ testCompareXMLToXMLHelper(const void *data)
 static int
 mymain(void)
 {
+    g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps();
+    g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref);
     int ret = 0;
 
     if (qemuTestDriverInit(&driver) < 0)
         return EXIT_FAILURE;
 
+    if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "",
+                               capslatest, capscache, NULL, NULL) < 0)
+        return EXIT_FAILURE;
+
     virDomainXMLOptionSetMomentPostParse(driver.xmlopt,
                                          testSnapshotPostParse);