|
 |
7548c0 |
From 5fad3414910beac08371233414939433644a92e8 Mon Sep 17 00:00:00 2001
|
|
|
7548c0 |
Message-Id: <5fad3414910beac08371233414939433644a92e8@dist-git>
|
|
|
7548c0 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
7548c0 |
Date: Wed, 7 Oct 2020 18:45:31 +0200
|
|
|
7548c0 |
Subject: [PATCH] tests: qemuxml2argv: Use existing machine type for
|
|
|
7548c0 |
'numatune-distances' case
|
|
|
7548c0 |
MIME-Version: 1.0
|
|
|
7548c0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
7548c0 |
Content-Transfer-Encoding: 8bit
|
|
|
7548c0 |
|
|
|
7548c0 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
7548c0 |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
7548c0 |
(cherry picked from commit 99dcdf505e0856a5ebfb31f0047a1e24ec60b557)
|
|
|
7548c0 |
|
|
|
7548c0 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518
|
|
|
7548c0 |
|
|
|
7548c0 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
7548c0 |
Message-Id: <4af6d896e777397acd8b5945da6bf6bf071f2e98.1602087923.git.mprivozn@redhat.com>
|
|
|
7548c0 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
7548c0 |
---
|
|
|
7548c0 |
tests/qemuxml2argvdata/numatune-distances.args | 4 ++--
|
|
|
7548c0 |
tests/qemuxml2argvdata/numatune-distances.xml | 2 +-
|
|
|
7548c0 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
7548c0 |
|
|
|
7548c0 |
diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.args
|
|
|
7548c0 |
index 895efeab15..a20b40b5c5 100644
|
|
|
7548c0 |
--- a/tests/qemuxml2argvdata/numatune-distances.args
|
|
|
7548c0 |
+++ b/tests/qemuxml2argvdata/numatune-distances.args
|
|
|
7548c0 |
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
|
|
|
7548c0 |
/usr/bin/qemu-system-x86_64 \
|
|
|
7548c0 |
-name QEMUGuest \
|
|
|
7548c0 |
-S \
|
|
|
7548c0 |
--machine xenfv,accel=tcg,usb=off,dump-guest-core=off \
|
|
|
7548c0 |
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
|
|
|
7548c0 |
-m 12288 \
|
|
|
7548c0 |
-realtime mlock=off \
|
|
|
7548c0 |
-smp 12,sockets=12,cores=1,threads=1 \
|
|
|
7548c0 |
@@ -66,4 +66,4 @@ server,nowait \
|
|
|
7548c0 |
-rtc base=utc \
|
|
|
7548c0 |
-no-shutdown \
|
|
|
7548c0 |
-usb \
|
|
|
7548c0 |
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
|
|
|
7548c0 |
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
|
|
7548c0 |
diff --git a/tests/qemuxml2argvdata/numatune-distances.xml b/tests/qemuxml2argvdata/numatune-distances.xml
|
|
|
7548c0 |
index 0f33526b46..fa4de6aaf6 100644
|
|
|
7548c0 |
--- a/tests/qemuxml2argvdata/numatune-distances.xml
|
|
|
7548c0 |
+++ b/tests/qemuxml2argvdata/numatune-distances.xml
|
|
|
7548c0 |
@@ -5,7 +5,7 @@
|
|
|
7548c0 |
<currentMemory unit='KiB'>8388608</currentMemory>
|
|
|
7548c0 |
<vcpu placement='static'>12</vcpu>
|
|
|
7548c0 |
<os>
|
|
|
7548c0 |
- <type arch='x86_64' machine='xenfv'>hvm</type>
|
|
|
7548c0 |
+ <type arch='x86_64' machine='pc'>hvm</type>
|
|
|
7548c0 |
<boot dev='hd'/>
|
|
|
7548c0 |
</os>
|
|
|
7548c0 |
<features>
|
|
|
7548c0 |
--
|
|
|
7548c0 |
2.29.2
|
|
|
7548c0 |
|