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