qemuxmlconftest: Rename and strip specific machine type from 'x86_64-default-cpu...

qemu-10.2 which we're about to add capabilities dump for will remove the
'4.2' machine type per deprecation policy.

The 'x86_64-default-cpu-*' still reference it. Since there is no
functional difference when upgrading the tests to the latest machine
type (pc/q35 alias as handled internally by qemuxmlconftest) let's
rename and modernize these.

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

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args
similarity index 95%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args
rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args
index 59a4a21451db213ece2006790a4103614eb31b0e..eb3d834a6c907f5baeca7374d9e751e83d27840b 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
--machine pc-i440fx-4.2,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 kvm \
 -cpu qemu64 \
 -m size=4194304k \

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.xml
index 3a610ab49fea0573a5b9110d89100c4126de1b66..0b33815d67f60881bd7f6dc95c98cf93613be5ff 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.xml
similarity index 90%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.xml
index bf2678e674ea79d89b92acdb57071e6f58a06f35..461cfc302024a3a3d3decc3dc2f41f53ddfe5980 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.xml
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.xml
@@ -5,7 +5,7 @@
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args
similarity index 96%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args
rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args
index 18b682e9b7e693c1b1f776fc61d3f138fa8a4638..c82cf98fd2ffc4ea47fff17ab45aa41bd45f729a 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
--machine pc-q35-4.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
+-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
 -accel kvm \
 -cpu qemu64 \
 -m size=4194304k \

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.xml
similarity index 97%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.xml
index bf9010ec57703c62782abad3b3674534e804c20a..15d756830f3d49f75db63bf71442b631e117a6e0 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.2'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.xml
similarity index 90%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.xml
index ce432ef52f41ac98f10a67e71ad309cee3965a6c..c80ae0c126b26241407c38f19d9673ce641f7ecf 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.xml
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.xml
@@ -5,7 +5,7 @@
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.2'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args
similarity index 95%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args
rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args
index 74a54d6d876026da67eb5bef3c480b3b99b4203a..a8fb64384c25887bcb3bdbc0e69c142dd7c48842 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
--machine pc-i440fx-4.2,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=4194304k \

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.xml
index 634b59efa7de792370b7263547fb8018e0a4046e..50ba5343e9cfb225e4ee05c39a81aeb204ad15f7 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.xml
similarity index 90%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.xml
index 4e3b3418009fe34d3753b19e6924c1b8fca93dcf..01bce4109f8a2d526f659fbfdfe926a6edfff515 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.xml
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.xml
@@ -5,7 +5,7 @@
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.2'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args
similarity index 96%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args
rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args
index 5971d033369f4f64ae7ea73a284a1c03a64b7315..33981e6dd0035c6ec1cf0fc48f5ea59d798cbb64 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
--machine pc-q35-4.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
+-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
 -accel tcg \
 -cpu qemu64 \
 -m size=4194304k \

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.xml
similarity index 97%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.xml
index a0c1563fbdb10db6857a125dd450528d324fa69c..59ebdd87a01c1c964eeee1d44e7925e45f21e2f8 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-4.2'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.xml
similarity index 90%
rename from tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.xml
rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.xml
index 8e77a3ad9239f9ffde9d8c807a5248189c60e172..cd293215e0a2ae02ac71f519661ab17ae041c8ad 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.xml
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.xml
@@ -5,7 +5,7 @@
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-4.2'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 5d416be9db599bfb11152c2799952b7cdb2f8d49..36ad51185dbd4b8341adf99a380f3b825068229e 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -2985,10 +2985,10 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-tcg-pseries-4.2", "ppc64");
     DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-4.2", "s390x");
     DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-4.2", "s390x");
-    DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-pc-4.2", "x86_64");
-    DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-pc-4.2", "x86_64");
-    DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-q35-4.2", "x86_64");
-    DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-q35-4.2", "x86_64");
+    DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-pc", "x86_64");
+    DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-pc", "x86_64");
+    DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-q35", "x86_64");
+    DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-q35", "x86_64");
     DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-features", "x86_64");
 
     DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-features-aia", "riscv64");