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: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>

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 \

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>

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 \

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>

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 \

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>

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 \

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>

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 \

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>

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 \

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>