tests: qemuxml2argv: Use proper replacement for 'pc-i440fx-wily' machine

This machine type comes from downstream ubuntu 15.10. Replace it with a
somewhat equivalent qemu-2.3 machine type as we do have test data for
that.

The change allows the CPU code to pick a proper default CPU in the
'-latest' cases.

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

diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index e7f7b3961d2f9d431d9bc91cb4304709d2d8cae1..d23c5755532bc816364201e71096576370986da1 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name instance-00000092 \
 -S \
--machine pc-i440fx-wily,accel=kvm,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
 -m 14336 \
 -mem-prealloc \
 -mem-path /var/lib/libvirt/qemu/ram/libvirt/qemu/-1-instance-00000092/ram \

diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
index eb3300b1fb8ea3846e3dcffa9c87f1b41b0d11c3..0749952750e12068344f2d59898885f425e5dda4 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>8</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-wily'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index b6f73648bcd343852e5350a1116b112319bd472c..4fbbc8185ba8cd47ad040e9d95b85f24ea9cc2bd 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name instance-00000092 \
 -S \
--machine pc-i440fx-wily,accel=kvm,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
 -m 14336 \
 -mem-prealloc \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
index b7b5a19166ff647cdc5b21d6b7e946da2c4703ef..05ea164abceb5253eafce0f735bbf6c411efcf32 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>8</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-wily'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index a962414d1373a31e83889811e9b1d21abde68ef3..1eeeaec0ce4d47e0a96a81131936b0cbbe21ccd0 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name instance-00000092 \
 -S \
--machine pc-i440fx-wily,accel=kvm,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
 -m 28672 \
 -mem-prealloc \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
index 07de0bd7174baaeea93dd50489da418ade10e5be..904e64f0cc78b11727abe387aa048b3e65599ae2 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>20</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-wily'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index a96320279266922e17d583c116243c03a24fc137..d75b67916c379196dd9628bf3097685e8e086ff2 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name instance-00000092 \
 -S \
--machine pc-i440fx-wily,accel=kvm,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
 -m 43008 \
 -mem-prealloc \
 -realtime mlock=off \

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
index 8711641b682b5025e8f1c208724cbda8fba0ac48..9785609c16380e3873cfed0583537fd429c3bbc6 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
@@ -10,7 +10,7 @@
   </memoryBacking>
   <vcpu placement='static'>32</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-wily'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
index a655fb1f7c8a30cae736fe5eebefed181f638692..5d256c42bccaf759453bc0aa3ce85ab22d80a6e3 100644 (file)
--- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
 -S \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
--machine pc-i440fx-wily,accel=kvm,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
+-cpu qemu64 \
 -m 14336 \
 -mem-prealloc \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
index ded56dd5387fbbd1dd95c1c7065e2adceb2dc385..69d27efbe1a0e6d4518e41a8ab57c6efc568a96e 100644 (file)
--- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
+++ b/tests/qemuxml2argvdata/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-wily'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>

diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
index a655fb1f7c8a30cae736fe5eebefed181f638692..5d256c42bccaf759453bc0aa3ce85ab22d80a6e3 100644 (file)
--- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
 -S \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
--machine pc-i440fx-wily,accel=kvm,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
+-cpu qemu64 \
 -m 14336 \
 -mem-prealloc \
 -overcommit mem-lock=off \

diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml
index ebe638f600ff1439c9b5bf6811f16d54d88ee3fb..e3d5d9239322d0e8bf7915cc094fae1a1b89ea9a 100644 (file)
--- a/tests/qemuxml2argvdata/memfd-memory-numa.xml
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml
@@ -16,7 +16,7 @@
     <memnode cellid='0' mode='preferred' nodeset='3'/>
   </numatune>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-wily'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu>