qemudomaincheckpointxml2xmltest: Use real 'x86_64' capabilities in all test data

Use the platform which is getting most development for the checkpoint 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/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml
index 2b6d8298c2b399eb4f772198cb4e38f66e0cb01e..a31bf145007704cc2ea9b4dd6c0b189bf772bf65 100644 (file)
--- a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml
+++ b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml
@@ -16,7 +16,7 @@
     <currentMemory unit='KiB'>219136</currentMemory>
     <vcpu placement='static'>1</vcpu>
     <os>
-      <type arch='i686' machine='pc'>hvm</type>
+      <type arch='x86_64' machine='pc'>hvm</type>
       <boot dev='hd'/>
     </os>
     <clock offset='utc'/>
@@ -24,7 +24,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>
       <disk type='file' device='disk'>
         <driver name='qemu' type='qcow2'/>
         <source file='/tmp/data.img'/>

diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml
index 427df0b4cf379bf6fb3a5edeb12f4c92e48d8e08..ec51bc02ce6a18ea46e1f0804fad116f8cf94248 100644 (file)
--- a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml
+++ b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml
@@ -16,7 +16,7 @@
     <currentMemory unit='KiB'>219136</currentMemory>
     <vcpu placement='static'>1</vcpu>
     <os>
-      <type arch='i686' machine='pc'>hvm</type>
+      <type arch='x86_64' machine='pc'>hvm</type>
       <boot dev='hd'/>
     </os>
     <clock offset='utc'/>
@@ -24,7 +24,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>
       <disk type='file' device='disk'>
         <driver name='qemu' type='qcow2'/>
         <source file='/tmp/data.img'/>

diff --git a/tests/qemudomaincheckpointxml2xmlout/redefine.xml b/tests/qemudomaincheckpointxml2xmlout/redefine.xml
index b7c9d9dc6c0cea2e902e421881cf77d95ce7e0c8..6b60b267fcb4d36144a485e6aa7c69763a0e277e 100644 (file)
--- a/tests/qemudomaincheckpointxml2xmlout/redefine.xml
+++ b/tests/qemudomaincheckpointxml2xmlout/redefine.xml
@@ -14,15 +14,18 @@
     <currentMemory unit='KiB'>219136</currentMemory>
     <vcpu placement='static'>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'/>
@@ -48,7 +51,7 @@
         <target dev='vdb' bus='virtio'/>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
       </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/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c
index d49dcd91431b747472c3cfa0bc6cb69088509d47..0e195dae8d2199138ff9464be378abc9e036b882 100644 (file)
--- a/tests/qemudomaincheckpointxml2xmltest.c
+++ b/tests/qemudomaincheckpointxml2xmltest.c
@@ -131,11 +131,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,
                                          testCheckpointPostParse);