[PATCH 1/7] qemuxmlconftest: x86_64: Drop explicit use of '2.10' machine type

From: Peter Krempa <pkrempa(a)redhat.com&gt; New qemu will be deprecating them. Drop the use from test files not depending on the actual machine type. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/tseg-explicit-size.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args index e4259f32cd..36ae1a984d 100644 --- a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc-q35-2.10,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-machine q35,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ -global mch.extended-tseg-mbytes=48 \ -cpu qemu64 \ diff --git a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml index d0bb47cda8..50f48b8825 100644 --- a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-q35-2.10'>hvm</type> + <type arch='x86_64' machine='q35'>hvm</type> <boot dev='hd'/> </os> <features> diff --git a/tests/qemuxmlconfdata/tseg-explicit-size.xml b/tests/qemuxmlconfdata/tseg-explicit-size.xml index ae31210484..ab9d07014a 100644 --- a/tests/qemuxmlconfdata/tseg-explicit-size.xml +++ b/tests/qemuxmlconfdata/tseg-explicit-size.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-q35-2.10'>hvm</type> + <type arch='x86_64' machine='q35'>hvm</type> <boot dev='hd'/> </os> <features> -- 2.49.0