qemuxmlconftest: x86_64: Drop explicit use of '2.12' machine type

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@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args
index 7e2fb83a985ecfaa5f59b12a15891fb212763fa4..6dd97dfbe78dafa0acc340c9f319c0910756ec83 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -name guest=TPM-VM,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \
--machine pc-i440fx-2.12,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/tpm-emulator-crb-profile.xml b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.xml
index 40224f43a7984dd9782b02db7f44fb46ea7a8b5e..522ccc516db7147c0255b592e26e927f6236a42b 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.xml
+++ b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>512288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>

diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args
index e79552a60330056712642a9e89abfbf7ede5bbc7..9ff9ac0db269e60b8833a4750b5a5caee48b4ef6 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -name guest=TPM-VM,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \
--machine pc-i440fx-2.12,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/tpm-emulator-tpm2-enc.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.xml
index e0c657645d97443a39b5fc2c0fa26b97ace0e9f8..e6746d5739aab635a95aee14ab0e713086439797 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.xml
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>512288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>

diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
index e79552a60330056712642a9e89abfbf7ede5bbc7..9ff9ac0db269e60b8833a4750b5a5caee48b4ef6 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -name guest=TPM-VM,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \
--machine pc-i440fx-2.12,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/tpm-emulator-tpm2-pstate.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.xml
index 42e93cfcbe1d5e5bb88c4ae5daf48fbcbdaefeb5..6569b5e4dd24b08436c5ce87ca4e8604175592c6 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.xml
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>512288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>

diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args
index e79552a60330056712642a9e89abfbf7ede5bbc7..9ff9ac0db269e60b8833a4750b5a5caee48b4ef6 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -name guest=TPM-VM,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \
--machine pc-i440fx-2.12,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/tpm-emulator-tpm2.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml
index 3d6300f544a718d4039d1c9cf1959c9c06340943..bf780a6597b92785e79285b9f4c5017db812586a 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>512288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>

diff --git a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args
index e79552a60330056712642a9e89abfbf7ede5bbc7..9ff9ac0db269e60b8833a4750b5a5caee48b4ef6 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -name guest=TPM-VM,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \
--machine pc-i440fx-2.12,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/tpm-emulator.xml b/tests/qemuxmlconfdata/tpm-emulator.xml
index b98a3693b788e5eb27c14679386c58762c8ce615..a7e6ec715941c61d30f882c209c8f0c0a1323cd9 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-emulator.xml
+++ b/tests/qemuxmlconfdata/tpm-emulator.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>512288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>

diff --git a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args
index f181cc2fa4074d5439edca947452e8948e36d386..5ddf21a4c70231929455548f9407ac53ae11443c 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -name guest=TPM-VM,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \
--machine pc-i440fx-2.12,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/tpm-external.xml b/tests/qemuxmlconfdata/tpm-external.xml
index c8f9c72b1f151909e00fd5c6d86c57aa0c5ef21e..92af4a375c3fe96ea215b48b8cf9dafca278549b 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-external.xml
+++ b/tests/qemuxmlconfdata/tpm-external.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>512288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>

diff --git a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
index 96da874a6bc8caee14ac6bd628e3cd01da1f993a..cd210b50a036eeb48f9f02d90c121e0f41e37c66 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -name guest=TPM-VM,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \
--machine pc-i440fx-2.12,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/tpm-passthrough-crb.xml b/tests/qemuxmlconfdata/tpm-passthrough-crb.xml
index 47c622bd848975691e8ec7e646075e12348675b8..c2cf153647ce1303563f7521bd04ca2976a1e48f 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-passthrough-crb.xml
+++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>512288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>

diff --git a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
index 970869eaec6b4fc83501e0733eb91498331d4008..cab016b666f92b182a9fbd158683b3521c3ed000 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -name guest=TPM-VM,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \
--machine pc-i440fx-2.12,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/tpm-passthrough.xml b/tests/qemuxmlconfdata/tpm-passthrough.xml
index 1555de4e86231ecff1d16624e627312fc0d4ff30..fe8de6cfe59388da469da826cf13affe612d6ec4 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-passthrough.xml
+++ b/tests/qemuxmlconfdata/tpm-passthrough.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>512288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>