From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 13 Jan 2022 15:14:42 +0000 (+0100)
Subject: qemuxml2(argv|xml)data: x86-kvm-32-on-64: Add machine type
X-Git-Tag: v8.1.0-rc1~437
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a1e6c1ab123239e12bbdaf6b398b0721db8f63b;p=thirdparty%2Flibvirt.git

qemuxml2(argv|xml)data: x86-kvm-32-on-64: Add machine type

The machine type doesn't change the test result and prevents tests being
changed every time we are about to update real capabilities to a new
qemu.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-latest.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-latest.args
index fe326b6943..cfe1abab60 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-kvm/.config \
 -name guest=kvm,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-kvm/master-key.aes"}' \
--machine pc-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -m 4096 \
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.xml b/tests/qemuxml2argvdata/x86-kvm-32-on-64.xml
index 37f53bf2af..35ddbd0630 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.xml
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.xml
@@ -3,7 +3,7 @@
   <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
   <memory unit='KiB'>4194304</memory>
   <os>
-    <type arch='i686'>hvm</type>
+    <type arch='i686' machine='pc'>hvm</type>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
diff --git a/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-latest.xml
index b51fb18788..c5e9c4fe22 100644
--- a/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='i686' machine='pc-i440fx-6.2'>hvm</type>
+    <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>