[PATCH 05/21] tests: qemuxml2argvdata: Remove use of 'pc-1.0' and 'pc-1.2' machine types
Peter Krempa
pkrempa at redhat.com
Thu Jan 6 09:44:04 UTC 2022
There's nothing special about the tests requiring to use very old
machine types. Most usage is cargo-culted from other tests. Switch all
the tests to use 'pc' instead.
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
...launch-security-sev-missing-platform-info.x86_64-2.12.0.args | 2 +-
.../launch-security-sev-missing-platform-info.xml | 2 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-addr.xml | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.xml | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.xml | 2 +-
tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml | 2 +-
tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml | 2 +-
tests/qemuxml2argvdata/pci-bridge.args | 2 +-
tests/qemuxml2argvdata/pci-bridge.xml | 2 +-
tests/qemuxml2argvdata/pci-many.args | 2 +-
tests/qemuxml2argvdata/pci-many.xml | 2 +-
tests/qemuxml2argvdata/pci-root-address.xml | 2 +-
tests/qemuxml2argvdata/pci-root-nonzero-index.xml | 2 +-
tests/qemuxml2argvdata/pcihole64-gib.xml | 2 +-
tests/qemuxml2argvdata/pcihole64-none.xml | 2 +-
tests/qemuxml2argvdata/pcihole64.args | 2 +-
tests/qemuxml2argvdata/pcihole64.xml | 2 +-
tests/qemuxml2xmloutdata/pci-autoadd-addr.xml | 2 +-
tests/qemuxml2xmloutdata/pci-autoadd-idx.xml | 2 +-
tests/qemuxml2xmloutdata/pci-autofill-addr.xml | 2 +-
tests/qemuxml2xmloutdata/pci-bridge.xml | 2 +-
tests/qemuxml2xmloutdata/pci-many.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64-gib.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64-none.xml | 2 +-
tests/qemuxml2xmloutdata/pcihole64.xml | 2 +-
28 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args
index 20ad935a68..f7000ea11d 100644
--- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-1.0,usb=off,dump-guest-core=off,memory-encryption=lsec0 \
+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,memory-encryption=lsec0 \
-accel kvm \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml
index 41ec4cb872..b4f3eb4998 100644
--- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml
+++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.0'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index 4643e87933..b77611bbdd 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=fdr-br,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.xml b/tests/qemuxml2argvdata/pci-autoadd-addr.xml
index 57b920ba09..fec2b151ed 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.xml
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index bf1f0460d1..b9ec27af3f 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=fdr-br,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.xml b/tests/qemuxml2argvdata/pci-autoadd-idx.xml
index 0a72956f9e..614a60329e 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.xml
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args
index d30b31e7f5..002bd37416 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=fdr-br,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.xml b/tests/qemuxml2argvdata/pci-autofill-addr.xml
index a601c50ab9..1d5dbf9b23 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.xml
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
diff --git a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml b/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml
index e298d66618..ef7b828233 100644
--- a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml
+++ b/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml
@@ -4,7 +4,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
diff --git a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml b/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml
index 790827ae04..36a5fafae0 100644
--- a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml
+++ b/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml
@@ -4,7 +4,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args
index d9a7b78b97..9608f79dfa 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=fdr-br,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-bridge.xml b/tests/qemuxml2argvdata/pci-bridge.xml
index c28adfe43e..886b8ae641 100644
--- a/tests/qemuxml2argvdata/pci-bridge.xml
+++ b/tests/qemuxml2argvdata/pci-bridge.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index b098fbaeab..0139f12ccd 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=fdr-br,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-many.xml b/tests/qemuxml2argvdata/pci-many.xml
index 28654d5a48..e5603f04b6 100644
--- a/tests/qemuxml2argvdata/pci-many.xml
+++ b/tests/qemuxml2argvdata/pci-many.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuxml2argvdata/pci-root-address.xml b/tests/qemuxml2argvdata/pci-root-address.xml
index 2f5058b330..08b4c61619 100644
--- a/tests/qemuxml2argvdata/pci-root-address.xml
+++ b/tests/qemuxml2argvdata/pci-root-address.xml
@@ -4,7 +4,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
diff --git a/tests/qemuxml2argvdata/pci-root-nonzero-index.xml b/tests/qemuxml2argvdata/pci-root-nonzero-index.xml
index 5d0dcc7dd5..49fd0f6e60 100644
--- a/tests/qemuxml2argvdata/pci-root-nonzero-index.xml
+++ b/tests/qemuxml2argvdata/pci-root-nonzero-index.xml
@@ -4,7 +4,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
diff --git a/tests/qemuxml2argvdata/pcihole64-gib.xml b/tests/qemuxml2argvdata/pcihole64-gib.xml
index ef5237edd7..a82c847fda 100644
--- a/tests/qemuxml2argvdata/pcihole64-gib.xml
+++ b/tests/qemuxml2argvdata/pcihole64-gib.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/pcihole64-none.xml b/tests/qemuxml2argvdata/pcihole64-none.xml
index 5f96ef3b0d..e924747418 100644
--- a/tests/qemuxml2argvdata/pcihole64-none.xml
+++ b/tests/qemuxml2argvdata/pcihole64-none.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args
index 69733910e6..45e49c7a3f 100644
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-name guest=foo,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
--machine pc-1.2,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pcihole64.xml b/tests/qemuxml2argvdata/pcihole64.xml
index 7ed2ce3ba4..0b289b1733 100644
--- a/tests/qemuxml2argvdata/pcihole64.xml
+++ b/tests/qemuxml2argvdata/pcihole64.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml b/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
index cff6b2fa4d..2670c9d951 100644
--- a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
+++ b/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml b/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
index f42c77d219..8812868ba8 100644
--- a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
+++ b/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
index 30dc7625ec..e12dc4bae3 100644
--- a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
+++ b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/pci-bridge.xml b/tests/qemuxml2xmloutdata/pci-bridge.xml
index d95660a381..46e42a8bc3 100644
--- a/tests/qemuxml2xmloutdata/pci-bridge.xml
+++ b/tests/qemuxml2xmloutdata/pci-bridge.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuxml2xmloutdata/pci-many.xml b/tests/qemuxml2xmloutdata/pci-many.xml
index b610e3aa3c..635bccc696 100644
--- a/tests/qemuxml2xmloutdata/pci-many.xml
+++ b/tests/qemuxml2xmloutdata/pci-many.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-gib.xml b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
index d9b821bfe2..1ad7ca40d8 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-gib.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-none.xml b/tests/qemuxml2xmloutdata/pcihole64-none.xml
index f4941bc67b..c4b12510bf 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-none.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-none.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/pcihole64.xml b/tests/qemuxml2xmloutdata/pcihole64.xml
index 52d61603aa..5058107227 100644
--- a/tests/qemuxml2xmloutdata/pcihole64.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='x86_64' machine='pc-1.2'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
--
2.31.1
More information about the libvir-list
mailing list