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@xxxxxxxxxx>
---
tests/qemuxml2argvdata/fd-memory-no-numa-topology.args | 2 +-
tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology.args | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology.xml | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology2.args | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology2.xml | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology3.args | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology3.xml | 2 +-
.../memfd-memory-default-hugepage.x86_64-latest.args | 3 ++-
tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml | 2 +-
tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args | 3 ++-
tests/qemuxml2argvdata/memfd-memory-numa.xml | 2 +-
12 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index e7f7b3961d..d23c575553 100644
--- 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 eb3300b1fb..0749952750 100644
--- 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 b6f73648bc..4fbbc8185b 100644
--- 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 b7b5a19166..05ea164abc 100644
--- 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 a962414d13..1eeeaec0ce 100644
--- 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 07de0bd717..904e64f0cc 100644
--- 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 a963202792..d75b67916c 100644
--- 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 8711641b68..9785609c16 100644
--- 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 a655fb1f7c..5d256c42bc 100644
--- 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 ded56dd538..69d27efbe1 100644
--- 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 a655fb1f7c..5d256c42bc 100644
--- 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 ebe638f600..e3d5d92393 100644
--- 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>
--
2.24.1
