|
 |
edecca |
From 12dd0446ce6df2388e169e6f33438e538f016e60 Mon Sep 17 00:00:00 2001
|
|
|
edecca |
Message-Id: <12dd0446ce6df2388e169e6f33438e538f016e60@dist-git>
|
|
|
edecca |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
edecca |
Date: Mon, 13 Aug 2018 19:21:45 +0200
|
|
|
edecca |
Subject: [PATCH] tests: rename hugepages-pages4 into
|
|
|
edecca |
hugepages-numa-nodeset-nonexist
|
|
|
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 5534edcb9e0cd462f2bae8acb92bd9b85aa874f0)
|
|
|
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 |
....xml => hugepages-numa-nodeset-nonexist.xml} | 17 +----------------
|
|
|
edecca |
tests/qemuxml2argvtest.c | 5 +++--
|
|
|
edecca |
.../hugepages-numa-nodeset-nonexist.xml | 1 +
|
|
|
edecca |
tests/qemuxml2xmloutdata/hugepages-pages4.xml | 1 -
|
|
|
edecca |
tests/qemuxml2xmltest.c | 2 +-
|
|
|
edecca |
5 files changed, 6 insertions(+), 20 deletions(-)
|
|
|
edecca |
rename tests/qemuxml2argvdata/{hugepages-pages4.xml => hugepages-numa-nodeset-nonexist.xml} (66%)
|
|
|
edecca |
create mode 120000 tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml
|
|
|
edecca |
delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages4.xml
|
|
|
edecca |
|
|
|
edecca |
diff --git a/tests/qemuxml2argvdata/hugepages-pages4.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
|
|
|
edecca |
similarity index 66%
|
|
|
edecca |
rename from tests/qemuxml2argvdata/hugepages-pages4.xml
|
|
|
edecca |
rename to tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
|
|
|
edecca |
index 9f79881a59..8211d72be9 100644
|
|
|
edecca |
--- a/tests/qemuxml2argvdata/hugepages-pages4.xml
|
|
|
edecca |
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
|
|
|
edecca |
@@ -10,10 +10,6 @@
|
|
|
edecca |
</hugepages>
|
|
|
edecca |
</memoryBacking>
|
|
|
edecca |
<vcpu placement='static'>4</vcpu>
|
|
|
edecca |
- <numatune>
|
|
|
edecca |
- <memory mode='strict' nodeset='0-3'/>
|
|
|
edecca |
- <memnode cellid='3' mode='strict' nodeset='3'/>
|
|
|
edecca |
- </numatune>
|
|
|
edecca |
<os>
|
|
|
edecca |
<type arch='i686' machine='pc'>hvm</type>
|
|
|
edecca |
<boot dev='hd'/>
|
|
|
edecca |
@@ -32,23 +28,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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
|
edecca |
index 5a41bbe6e0..1b6e8ded43 100644
|
|
|
edecca |
--- a/tests/qemuxml2argvtest.c
|
|
|
edecca |
+++ b/tests/qemuxml2argvtest.c
|
|
|
edecca |
@@ -967,12 +967,13 @@ mymain(void)
|
|
|
edecca |
DO_TEST("hugepages-numa-nodeset-part",
|
|
|
edecca |
QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
edecca |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
edecca |
+ DO_TEST_FAILURE("hugepages-numa-nodeset-nonexist",
|
|
|
edecca |
+ QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
edecca |
+ QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
edecca |
DO_TEST("hugepages-shared",
|
|
|
edecca |
QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
edecca |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
edecca |
DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
|
|
|
edecca |
- DO_TEST_FAILURE("hugepages-pages4",
|
|
|
edecca |
- QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
edecca |
DO_TEST("hugepages-pages5", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages6", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages7",
|
|
|
edecca |
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml
|
|
|
edecca |
new file mode 120000
|
|
|
edecca |
index 0000000000..d490edca69
|
|
|
edecca |
--- /dev/null
|
|
|
edecca |
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml
|
|
|
edecca |
@@ -0,0 +1 @@
|
|
|
edecca |
+../qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
|
|
|
edecca |
\ No newline at end of file
|
|
|
edecca |
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages4.xml b/tests/qemuxml2xmloutdata/hugepages-pages4.xml
|
|
|
edecca |
deleted file mode 120000
|
|
|
edecca |
index 127e66e64f..0000000000
|
|
|
edecca |
--- a/tests/qemuxml2xmloutdata/hugepages-pages4.xml
|
|
|
edecca |
+++ /dev/null
|
|
|
edecca |
@@ -1 +0,0 @@
|
|
|
edecca |
-../qemuxml2argvdata/hugepages-pages4.xml
|
|
|
edecca |
\ No newline at end of file
|
|
|
edecca |
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
|
edecca |
index bb7b0ce481..9b3152821f 100644
|
|
|
edecca |
--- a/tests/qemuxml2xmltest.c
|
|
|
edecca |
+++ b/tests/qemuxml2xmltest.c
|
|
|
edecca |
@@ -337,7 +337,7 @@ mymain(void)
|
|
|
edecca |
DO_TEST("hugepages-numa-default-dimm", NONE);
|
|
|
edecca |
DO_TEST("hugepages-numa-nodeset", NONE);
|
|
|
edecca |
DO_TEST("hugepages-numa-nodeset-part", NONE);
|
|
|
edecca |
- DO_TEST("hugepages-pages4", NONE);
|
|
|
edecca |
+ DO_TEST("hugepages-numa-nodeset-nonexist", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages5", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages6", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages7", NONE);
|
|
|
edecca |
--
|
|
|
edecca |
2.18.0
|
|
|
edecca |
|