From: Peter Krempa <pkre...@redhat.com>
New qemu will be deprecating them. Drop the use from test files not
depending on the actual machine type.
Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
.../pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args | 2 +-
tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.xml | 2 +-
.../pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args | 2 +-
tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args
b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args
index 17d71aee80..61ae4f23d3 100644
---
a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args
+++
b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args
@@ -10,7 +10,7 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-i440fx/.config \
-name guest=i440fx,debug-threads=on \
-S \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-i440fx/master-key.aes"}'
\
--machine
pc-i440fx-2.5,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
-cpu qemu64 \
-m size=1048576k \
diff --git a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.xml
b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.xml
index 5a78fe638d..b2ea7de4d4 100644
--- a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.xml
+++ b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<cpu mode='custom' match='exact' check='none'>
diff --git
a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args
b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args
index c2016a254a..9b257cb36d 100644
---
a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args
+++
b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args
@@ -10,7 +10,7 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-i440fx/.config \
-name guest=i440fx,debug-threads=on \
-S \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-i440fx/master-key.aes"}'
\
--machine
pc-i440fx-2.5,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
-cpu qemu64 \
-m size=1048576k \
diff --git a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.xml
b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.xml
index 002bfea99d..02bb776a92 100644
--- a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.xml
+++ b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<cpu mode='custom' match='exact' check='none'>
--
2.49.0
