|
 |
edecca |
From b7c7f867e4c46c09acb7c65ff4c5e66564bfa090 Mon Sep 17 00:00:00 2001
|
|
|
edecca |
Message-Id: <b7c7f867e4c46c09acb7c65ff4c5e66564bfa090@dist-git>
|
|
|
edecca |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
edecca |
Date: Mon, 13 Aug 2018 19:21:42 +0200
|
|
|
edecca |
Subject: [PATCH] tests: rename hugepages-pages2 into hugepages-numa-default-2M
|
|
|
edecca |
MIME-Version: 1.0
|
|
|
edecca |
Content-Type: text/plain; charset=UTF-8
|
|
|
edecca |
Content-Transfer-Encoding: 8bit
|
|
|
edecca |
|
|
|
edecca |
Remove unnecessary XML elements as well.
|
|
|
edecca |
|
|
|
edecca |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
edecca |
(cherry picked from commit 1abcfa5c17b4ea26f75b2b37281d4990eb6be20f)
|
|
|
edecca |
|
|
|
edecca |
Conflicts:
|
|
|
edecca |
tests/qemuxml2argvdata/hugepages-numa-default-2M.args
|
|
|
edecca |
- missing upstream commit <caccbba64a>
|
|
|
edecca |
|
|
|
edecca |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
|
|
|
edecca |
|
|
|
edecca |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
edecca |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
edecca |
---
|
|
|
edecca |
...s-pages2.args => hugepages-numa-default-2M.args} | 5 +----
|
|
|
edecca |
...ges-pages2.xml => hugepages-numa-default-2M.xml} | 8 +-------
|
|
|
edecca |
tests/qemuxml2argvtest.c | 5 +++--
|
|
|
edecca |
...ges-pages2.xml => hugepages-numa-default-2M.xml} | 13 +------------
|
|
|
edecca |
tests/qemuxml2xmltest.c | 2 +-
|
|
|
edecca |
5 files changed, 7 insertions(+), 26 deletions(-)
|
|
|
edecca |
rename tests/qemuxml2argvdata/{hugepages-pages2.args => hugepages-numa-default-2M.args} (77%)
|
|
|
edecca |
rename tests/qemuxml2argvdata/{hugepages-pages2.xml => hugepages-numa-default-2M.xml} (77%)
|
|
|
edecca |
rename tests/qemuxml2xmloutdata/{hugepages-pages2.xml => hugepages-numa-default-2M.xml} (67%)
|
|
|
edecca |
|
|
|
edecca |
diff --git a/tests/qemuxml2argvdata/hugepages-pages2.args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
|
|
|
edecca |
similarity index 77%
|
|
|
edecca |
rename from tests/qemuxml2argvdata/hugepages-pages2.args
|
|
|
edecca |
rename to tests/qemuxml2argvdata/hugepages-numa-default-2M.args
|
|
|
edecca |
index 21105ef844..2dfacefe4a 100644
|
|
|
edecca |
--- a/tests/qemuxml2argvdata/hugepages-pages2.args
|
|
|
edecca |
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
|
|
|
edecca |
@@ -25,7 +25,4 @@ path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
|
|
|
edecca |
-no-shutdown \
|
|
|
edecca |
-no-acpi \
|
|
|
edecca |
-boot c \
|
|
|
edecca |
--usb \
|
|
|
edecca |
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
|
|
|
edecca |
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
|
|
edecca |
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
|
|
edecca |
+-usb
|
|
|
edecca |
diff --git a/tests/qemuxml2argvdata/hugepages-pages2.xml b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
|
|
|
edecca |
similarity index 77%
|
|
|
edecca |
rename from tests/qemuxml2argvdata/hugepages-pages2.xml
|
|
|
edecca |
rename to tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
|
|
|
edecca |
index 3b2d72ef3c..357c77da2a 100644
|
|
|
edecca |
--- a/tests/qemuxml2argvdata/hugepages-pages2.xml
|
|
|
edecca |
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
|
|
|
edecca |
@@ -25,16 +25,10 @@
|
|
|
edecca |
<on_crash>destroy</on_crash>
|
|
|
edecca |
<devices>
|
|
|
edecca |
<emulator>/usr/bin/qemu-system-i686</emulator>
|
|
|
edecca |
- <disk type='block' device='disk'>
|
|
|
edecca |
- <source dev='/dev/HostVG/QEMUGuest1'/>
|
|
|
edecca |
- <target dev='hda' bus='ide'/>
|
|
|
edecca |
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
|
edecca |
- </disk>
|
|
|
edecca |
<controller type='usb' index='0'/>
|
|
|
edecca |
- <controller type='ide' index='0'/>
|
|
|
edecca |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
edecca |
<input type='mouse' bus='ps2'/>
|
|
|
edecca |
<input type='keyboard' bus='ps2'/>
|
|
|
edecca |
- <memballoon model='virtio'/>
|
|
|
edecca |
+ <memballoon model='none'/>
|
|
|
edecca |
</devices>
|
|
|
edecca |
</domain>
|
|
|
edecca |
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
|
edecca |
index 3bb5efbd8d..6a79918f67 100644
|
|
|
edecca |
--- a/tests/qemuxml2argvtest.c
|
|
|
edecca |
+++ b/tests/qemuxml2argvtest.c
|
|
|
edecca |
@@ -951,14 +951,15 @@ mymain(void)
|
|
|
edecca |
DO_TEST("hugepages-default", NONE);
|
|
|
edecca |
DO_TEST("hugepages-numa-default",
|
|
|
edecca |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
edecca |
+ DO_TEST("hugepages-numa-default-2M",
|
|
|
edecca |
+ QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
edecca |
+ QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
edecca |
DO_TEST("hugepages-numa-default-dimm",
|
|
|
edecca |
QEMU_CAPS_DEVICE_PC_DIMM,
|
|
|
edecca |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
edecca |
DO_TEST("hugepages-numa-nodeset",
|
|
|
edecca |
QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
edecca |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
edecca |
- DO_TEST("hugepages-pages2", QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
edecca |
- QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
edecca |
DO_TEST("hugepages-pages3", QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
edecca |
QEMU_CAPS_OBJECT_MEMORY_FILE,
|
|
|
edecca |
QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
|
|
|
edecca |
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages2.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
|
|
|
edecca |
similarity index 67%
|
|
|
edecca |
rename from tests/qemuxml2xmloutdata/hugepages-pages2.xml
|
|
|
edecca |
rename to tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
|
|
|
edecca |
index cd79960f1b..3777824e1a 100644
|
|
|
edecca |
--- a/tests/qemuxml2xmloutdata/hugepages-pages2.xml
|
|
|
edecca |
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
|
|
|
edecca |
@@ -25,23 +25,12 @@
|
|
|
edecca |
<on_crash>destroy</on_crash>
|
|
|
edecca |
<devices>
|
|
|
edecca |
<emulator>/usr/bin/qemu-system-i686</emulator>
|
|
|
edecca |
- <disk type='block' device='disk'>
|
|
|
edecca |
- <driver name='qemu' type='raw'/>
|
|
|
edecca |
- <source dev='/dev/HostVG/QEMUGuest1'/>
|
|
|
edecca |
- <target dev='hda' bus='ide'/>
|
|
|
edecca |
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
|
edecca |
- </disk>
|
|
|
edecca |
<controller type='usb' index='0'>
|
|
|
edecca |
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
|
|
edecca |
</controller>
|
|
|
edecca |
- <controller type='ide' index='0'>
|
|
|
edecca |
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
|
|
|
edecca |
- </controller>
|
|
|
edecca |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
edecca |
<input type='mouse' bus='ps2'/>
|
|
|
edecca |
<input type='keyboard' bus='ps2'/>
|
|
|
edecca |
- <memballoon model='virtio'>
|
|
|
edecca |
- <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
|
|
edecca |
- </memballoon>
|
|
|
edecca |
+ <memballoon model='none'/>
|
|
|
edecca |
</devices>
|
|
|
edecca |
</domain>
|
|
|
edecca |
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
|
edecca |
index 2c3d16495e..a4448ff168 100644
|
|
|
edecca |
--- a/tests/qemuxml2xmltest.c
|
|
|
edecca |
+++ b/tests/qemuxml2xmltest.c
|
|
|
edecca |
@@ -332,9 +332,9 @@ mymain(void)
|
|
|
edecca |
|
|
|
edecca |
DO_TEST("pages-discard", NONE);
|
|
|
edecca |
DO_TEST("hugepages-default", NONE);
|
|
|
edecca |
+ DO_TEST("hugepages-numa-default-2M", NONE);
|
|
|
edecca |
DO_TEST("hugepages-numa-default-dimm", NONE);
|
|
|
edecca |
DO_TEST("hugepages-numa-nodeset", NONE);
|
|
|
edecca |
- DO_TEST("hugepages-pages2", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages3", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages4", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages5", NONE);
|
|
|
edecca |
--
|
|
|
edecca |
2.18.0
|
|
|
edecca |
|