qemuxmlconftest: Don't use soon-to-be-removed machine types

Latest qemu will be dropping some very old machine types (2.0 - 2.3) and
some of our tests use them. As in none of the cases the test actually
needs given machine type, switch them to 'pc' instead.

In one case 'numavcpus-topology-mismatch' this caused switch to a more
modern syntax for NUMA memory specification, but the test is testing a
different aspect, thus we can modernize this.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
index d07006fe643478de0549a45bec6d79cf1fc66c66..cdfa9dd447323ab4000fd011c4dbcad49d41ef1f 100644 (file)
--- a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-rhel7/.config \
 -name guest=rhel7,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-rhel7/master-key.aes"}' \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel kvm \
 -cpu qemu64 \
 -m size=2097152k \

diff --git a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml
index 7692ffca5f44c323adc9c4bdea37a86073de79e9..63197d5f33ba8686d7ccc2a21fad96410a91fb21 100644 (file)
--- a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>

diff --git a/tests/qemuxmlconfdata/controller-usb-order.xml b/tests/qemuxmlconfdata/controller-usb-order.xml
index 6cc0f503ff53c805fdbc32371a7cd6f7f7d6a801..c227e54a9e2f8abf6f27e28d841460abbffc216c 100644 (file)
--- a/tests/qemuxmlconfdata/controller-usb-order.xml
+++ b/tests/qemuxmlconfdata/controller-usb-order.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args
index 76a61dc9851b38700f2ea06b4c6ad4e61354b73f..de6bcb3db2a0db201cd3c07d14dd03ef8c13ea36 100644 (file)
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -name guest=encryptdisk,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \
--machine pc-i440fx-2.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.xml
index e3a9463e432cb89fac4eb09e2729fa61b449b994..20201a51a75a9d2051a2a1afd67767189235058c 100644 (file)
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>

diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml
index 8c2c008dc36056599db94de6bd187eb63d81eee0..448e26383285d7683f1bd3756cba87a1ad16c6da 100644 (file)
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args
index 734f63b31e46e83c045b765dfce021326639af92..af178782b9e0cd743a8bc244faa0883748eb5510 100644 (file)
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -name guest=encryptdisk,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \
--machine pc-i440fx-2.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml
index d9f4ad17d99809737e033be8d27eb5add2ecbe61..9eb8071925bcfaba51e344351034666dd47ba0dc 100644 (file)
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>

diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml
index 37d9900e744fa014e980276cbc534b2d494306a7..bd28d0b6e509ab73e8ecaa6e3c27e960c01e208c 100644 (file)
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
index b5c2e16cb091763fe93a54f07f9691599d6ae1a1..4b6afbb85db5a8d42623a338fa8b0ed829c54914 100644 (file)
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -name guest=encryptdisk,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \
--machine pc-i440fx-2.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml
index 99bba52db57153c2bc77775c19a65f4436f94136..c7f4571a05a30c286895babc9f5b08ec13d807e7 100644 (file)
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>

diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml
index d1fcf2da61277961f107d0ed1f10c31bde62308a..d45f7e71c8dcfeb685b16436950cfa74a5e3254b 100644 (file)
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxmlconfdata/luks-disk-invalid.xml b/tests/qemuxmlconfdata/luks-disk-invalid.xml
index bea769584bf56a0552979f3fe246cae84b3e7416..36c7e9298002af086c13dea3452be5857b68bcbe 100644 (file)
--- a/tests/qemuxmlconfdata/luks-disk-invalid.xml
+++ b/tests/qemuxmlconfdata/luks-disk-invalid.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
index a4de92bb31340fd1240310422cf12b0b499e6297..6eedd9a33fd6cf2b6888d1b709d74920026c6f65 100644 (file)
--- a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -name guest=encryptdisk,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \
--machine pc-i440fx-2.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml
index ed9df66413bdae6522a2d0a6396fecb6fa25f772..6e5f495c4cd282c7c8f002c89acd0bb2a9458ead 100644 (file)
--- a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>

diff --git a/tests/qemuxmlconfdata/luks-disks-source.xml b/tests/qemuxmlconfdata/luks-disks-source.xml
index 293877df9e7a4cf80c7feb74bdf8831970645fe0..a16f088fbbe8700423c2931da71c1b3e075ee25b 100644 (file)
--- a/tests/qemuxmlconfdata/luks-disks-source.xml
+++ b/tests/qemuxmlconfdata/luks-disks-source.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
index 2788fe4fc1e67ef90984d7a882b611eda63fd90b..a8dc1b4f535563231feca0ac20f7ba08fe66ce88 100644 (file)
--- a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -name guest=encryptdisk,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \
--machine pc-i440fx-2.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/luks-disks.xml b/tests/qemuxmlconfdata/luks-disks.xml
index 93718daaf4a3d03b578727fe61fa5b02d9f595a1..e430ac0585d7082038d737badd1e05035806a9f3 100644 (file)
--- a/tests/qemuxmlconfdata/luks-disks.xml
+++ b/tests/qemuxmlconfdata/luks-disks.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>524288</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>

diff --git a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
index f850d7be607709c22755fbf0a197eabb8ea93b1a..ad4620175e1324a93b24de96404e7aa0b93cfea6 100644 (file)
--- a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -name guest=instance-00000092,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}' \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,acpi=off \
 -accel kvm \
 -cpu qemu64 \
 -m size=14680064k \

diff --git a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml
index a70bd53134932d14557d4c5fad222fbf93acf030..4ff3892adf34e87cf871ba04ddbd7e7784a5ede3 100644 (file)
--- a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml
+++ b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml
@@ -14,7 +14,7 @@
     <memnode cellid='0' mode='preferred' nodeset='3'/>
   </numatune>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>

diff --git a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
index dbe2b82a56dabd5bcd50e15457786e537149c30b..861d9fb18c06331229994a2b5e013a3d498c46c6 100644 (file)
--- a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -name guest=instance-00000092,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}' \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off,nvdimm=on,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,nvdimm=on,acpi=off \
 -accel kvm \
 -cpu qemu64 \
 -m size=14680064k,slots=16,maxmem=1099511627776k \

diff --git a/tests/qemuxmlconfdata/memfd-memory-numa.xml b/tests/qemuxmlconfdata/memfd-memory-numa.xml
index 0c5d7ba4ef6a005783a57a77a22e68fde0206f18..0b1464feba5d616018d9d270907f42915a383891 100644 (file)
--- a/tests/qemuxmlconfdata/memfd-memory-numa.xml
+++ b/tests/qemuxmlconfdata/memfd-memory-numa.xml
@@ -17,7 +17,7 @@
     <memnode cellid='0' mode='preferred' nodeset='3'/>
   </numatune>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>

diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
index 72b025c2f6041ae307061d8f3e7d6046ddb0e446..0d4866d277bb0fa741fee60455af1f3e0c3a83a3 100644 (file)
--- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
@@ -10,14 +10,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-dummy/.config \
 -name guest=dummy,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-dummy/master-key.aes"}' \
--machine pc-i440fx-2.3,usb=off,dump-guest-core=off,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,acpi=off \
 -accel kvm \
 -cpu qemu64 \
 -m size=7864320k,slots=16,maxmem=16777216k \
 -overcommit mem-lock=off \
 -smp 12,sockets=12,cores=1,threads=1 \
--numa node,nodeid=0,cpus=0-1,cpus=5,cpus=7-11,mem=3840 \
--numa node,nodeid=1,cpus=2-4,cpus=6,mem=3840 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":4026531840,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=0,cpus=0-1,cpus=5,cpus=7-11,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":4026531840,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=1,cpus=2-4,cpus=6,memdev=ram-node1 \
 -uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \
 -display none \
 -no-user-config \

diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml
index fdf7e83587fc7153c9673b52402d2630954410d3..13ed2e5eee2d7a93752bb01de370665bd4db2441 100644 (file)
--- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml
@@ -9,7 +9,7 @@
     <memory mode='strict' placement='auto'/>
   </numatune>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>

diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml
index d3b2c1297ed635e4944913003fef1a51739b22ae..6f512100f29790834f248036f6f5bbd05abbeded 100644 (file)
--- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml
+++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml
@@ -9,7 +9,7 @@
     <memory mode='strict' placement='auto'/>
   </numatune>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>