|
 |
9c6c51 |
From b62a8d7fc457babdc57a93264fb8f75f8ecf7369 Mon Sep 17 00:00:00 2001
|
|
|
9c6c51 |
Message-Id: <b62a8d7fc457babdc57a93264fb8f75f8ecf7369@dist-git>
|
|
|
9c6c51 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
9c6c51 |
Date: Mon, 13 Aug 2018 19:21:49 +0200
|
|
|
9c6c51 |
Subject: [PATCH] tests: rename hugepages-pages8 into
|
|
|
9c6c51 |
hugepages-nodeset-nonexist
|
|
|
9c6c51 |
MIME-Version: 1.0
|
|
|
9c6c51 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9c6c51 |
Content-Transfer-Encoding: 8bit
|
|
|
9c6c51 |
|
|
|
9c6c51 |
Remove unnecessary XML elements as well.
|
|
|
9c6c51 |
|
|
|
9c6c51 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
9c6c51 |
(cherry picked from commit 67cffcbbdb4a7dcdc10681695e00615ffae8e726)
|
|
|
9c6c51 |
|
|
|
9c6c51 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
|
|
|
9c6c51 |
|
|
|
9c6c51 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
9c6c51 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
9c6c51 |
---
|
|
|
9c6c51 |
...es-pages8.xml => hugepages-nodeset-nonexist.xml} | 13 +------------
|
|
|
9c6c51 |
tests/qemuxml2argvtest.c | 7 ++++---
|
|
|
9c6c51 |
2 files changed, 5 insertions(+), 15 deletions(-)
|
|
|
9c6c51 |
rename tests/qemuxml2argvdata/{hugepages-pages8.xml => hugepages-nodeset-nonexist.xml} (64%)
|
|
|
9c6c51 |
|
|
|
9c6c51 |
diff --git a/tests/qemuxml2argvdata/hugepages-pages8.xml b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
|
|
|
9c6c51 |
similarity index 64%
|
|
|
9c6c51 |
rename from tests/qemuxml2argvdata/hugepages-pages8.xml
|
|
|
9c6c51 |
rename to tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
|
|
|
9c6c51 |
index 4cf4c1a8ad..477d3f1f2b 100644
|
|
|
9c6c51 |
--- a/tests/qemuxml2argvdata/hugepages-pages8.xml
|
|
|
9c6c51 |
+++ b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
|
|
|
9c6c51 |
@@ -19,23 +19,12 @@
|
|
|
9c6c51 |
<on_crash>destroy</on_crash>
|
|
|
9c6c51 |
<devices>
|
|
|
9c6c51 |
<emulator>/usr/bin/qemu-system-i686</emulator>
|
|
|
9c6c51 |
- <disk type='block' device='disk'>
|
|
|
9c6c51 |
- <driver name='qemu' type='raw'/>
|
|
|
9c6c51 |
- <source dev='/dev/HostVG/QEMUGuest1'/>
|
|
|
9c6c51 |
- <target dev='hda' bus='ide'/>
|
|
|
9c6c51 |
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
|
9c6c51 |
- </disk>
|
|
|
9c6c51 |
<controller type='usb' index='0'>
|
|
|
9c6c51 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
|
|
9c6c51 |
</controller>
|
|
|
9c6c51 |
- <controller type='ide' index='0'>
|
|
|
9c6c51 |
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
|
|
|
9c6c51 |
- </controller>
|
|
|
9c6c51 |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
9c6c51 |
<input type='mouse' bus='ps2'/>
|
|
|
9c6c51 |
<input type='keyboard' bus='ps2'/>
|
|
|
9c6c51 |
- <memballoon model='virtio'>
|
|
|
9c6c51 |
- <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
|
|
9c6c51 |
- </memballoon>
|
|
|
9c6c51 |
+ <memballoon model='none'/>
|
|
|
9c6c51 |
</devices>
|
|
|
9c6c51 |
</domain>
|
|
|
9c6c51 |
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
|
9c6c51 |
index f8fbca1806..d4251eff3e 100644
|
|
|
9c6c51 |
--- a/tests/qemuxml2argvtest.c
|
|
|
9c6c51 |
+++ b/tests/qemuxml2argvtest.c
|
|
|
9c6c51 |
@@ -959,6 +959,10 @@ mymain(void)
|
|
|
9c6c51 |
DO_TEST("hugepages-default", NONE);
|
|
|
9c6c51 |
DO_TEST("hugepages-default-2M", NONE);
|
|
|
9c6c51 |
DO_TEST("hugepages-default-system-size", NONE);
|
|
|
9c6c51 |
+ DO_TEST_FAILURE("hugepages-nodeset-nonexist",
|
|
|
9c6c51 |
+ QEMU_CAPS_DEVICE_PC_DIMM,
|
|
|
9c6c51 |
+ QEMU_CAPS_OBJECT_MEMORY_FILE,
|
|
|
9c6c51 |
+ QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
|
|
|
9c6c51 |
DO_TEST("hugepages-numa-default",
|
|
|
9c6c51 |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
9c6c51 |
DO_TEST("hugepages-numa-default-2M",
|
|
|
9c6c51 |
@@ -980,9 +984,6 @@ mymain(void)
|
|
|
9c6c51 |
QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
9c6c51 |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
9c6c51 |
DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
|
|
|
9c6c51 |
- DO_TEST_FAILURE("hugepages-pages8",
|
|
|
9c6c51 |
- QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
|
|
|
9c6c51 |
- QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
|
|
|
9c6c51 |
DO_TEST("hugepages-memaccess", QEMU_CAPS_OBJECT_MEMORY_FILE,
|
|
|
9c6c51 |
QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM,
|
|
|
9c6c51 |
QEMU_CAPS_NUMA);
|
|
|
9c6c51 |
--
|
|
|
9c6c51 |
2.18.0
|
|
|
9c6c51 |
|