[PATCH 2/5] qemuxmlconftest: Remove specific machine type from 'devices-acpi-index'

Peter Krempa via Devel posted 5 patches 2 weeks, 3 days ago
[PATCH 2/5] qemuxmlconftest: Remove specific machine type from 'devices-acpi-index'
Posted by Peter Krempa via Devel 2 weeks, 3 days ago
From: Peter Krempa <pkrempa@redhat.com>

ACPI index support doesn't depend on the machine type and
'pc-i440fx-5.0' will be removed from qemu-11.0.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args | 2 +-
 tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.xml  | 2 +-
 tests/qemuxmlconfdata/devices-acpi-index.xml                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args
index b58a078370..394793be2c 100644
--- a/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -name guest=fdr-br,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}' \
--machine pc-i440fx-5.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
 -accel tcg \
 -cpu qemu64 \
 -m size=2097152k \
diff --git a/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.xml b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.xml
index 3c6b384e8a..d274fba701 100644
--- a/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-5.0'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>
diff --git a/tests/qemuxmlconfdata/devices-acpi-index.xml b/tests/qemuxmlconfdata/devices-acpi-index.xml
index 5d0176e7fe..ca140b6329 100644
--- a/tests/qemuxmlconfdata/devices-acpi-index.xml
+++ b/tests/qemuxmlconfdata/devices-acpi-index.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static' cpuset='0-1'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-5.0'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>
-- 
2.52.0