From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 27 Aug 2025 14:34:39 +0000 (+0200)
Subject: qemuxmlconftest: Rename and strip specific machine type from 'x86_64-default-cpu... 
X-Git-Tag: v11.8.0-rc1~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1210230eb674d08091e1026d4c235875dc57ceb;p=thirdparty%2Flibvirt.git

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

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 59a4a21451..eb3d834a6c 100644
--- 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 3a610ab49f..0b33815d67 100644
--- 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 bf2678e674..461cfc3020 100644
--- 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 18b682e9b7..c82cf98fd2 100644
--- 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 bf9010ec57..15d756830f 100644
--- 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 ce432ef52f..c80ae0c126 100644
--- 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 74a54d6d87..a8fb64384c 100644
--- 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 634b59efa7..50ba5343e9 100644
--- 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 4e3b341800..01bce4109f 100644
--- 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 5971d03336..33981e6dd0 100644
--- 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 a0c1563fbd..59ebdd87a0 100644
--- 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 8e77a3ad92..cd293215e0 100644
--- 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 5d416be9db..36ad51185d 100644
--- 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");