[PATCH 09/10] qemudomaincheckpointxml2xmltest: Use real 'x86_64' capabilities in all test data

[Peter Krempa <pkrempa@xxxxxxxxxx>]

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@xxxxxxxxxx>
---
 .../internal-active-invalid.xml                          | 4 ++--
 .../internal-inactive-invalid.xml                        | 4 ++--
 tests/qemudomaincheckpointxml2xmlout/redefine.xml        | 9 ++++++---
 tests/qemudomaincheckpointxml2xmltest.c                  | 6 ++++++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml
index 2b6d8298c2..a31bf14500 100644
--- 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 427df0b4cf..ec51bc02ce 100644
--- 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 b7c9d9dc6c..6b60b267fc 100644
--- 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 d49dcd9143..0e195dae8d 100644
--- 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);

-- 
2.41.0