|
 |
99cbc7 |
From 56acff8784d001d6da89d04ea93d0bc840b6ef6e Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <56acff8784d001d6da89d04ea93d0bc840b6ef6e@dist-git>
|
|
|
99cbc7 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
99cbc7 |
Date: Mon, 13 Aug 2018 18:16:14 +0200
|
|
|
99cbc7 |
Subject: [PATCH] tests: rename hugepages-pages5 into hugepages-default-2M
|
|
|
99cbc7 |
MIME-Version: 1.0
|
|
|
99cbc7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
99cbc7 |
Content-Transfer-Encoding: 8bit
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Remove unnecessary XML elements as well.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 6110770324b42c8af8b4bc40a61d41ccd563f90d)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Conflicts:
|
|
|
99cbc7 |
tests/qemuxml2argvdata/hugepages-default-2M.args
|
|
|
99cbc7 |
- missing upstream commit <caccbba64a>
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1591235
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
...epages-pages5.args => hugepages-default-2M.args} | 5 +----
|
|
|
99cbc7 |
...ugepages-pages5.xml => hugepages-default-2M.xml} | 13 +------------
|
|
|
99cbc7 |
tests/qemuxml2argvtest.c | 2 +-
|
|
|
99cbc7 |
tests/qemuxml2xmloutdata/hugepages-default-2M.xml | 1 +
|
|
|
99cbc7 |
tests/qemuxml2xmloutdata/hugepages-pages5.xml | 1 -
|
|
|
99cbc7 |
tests/qemuxml2xmltest.c | 2 +-
|
|
|
99cbc7 |
6 files changed, 5 insertions(+), 19 deletions(-)
|
|
|
99cbc7 |
rename tests/qemuxml2argvdata/{hugepages-pages5.args => hugepages-default-2M.args} (75%)
|
|
|
99cbc7 |
rename tests/qemuxml2argvdata/{hugepages-pages5.xml => hugepages-default-2M.xml} (63%)
|
|
|
99cbc7 |
create mode 120000 tests/qemuxml2xmloutdata/hugepages-default-2M.xml
|
|
|
99cbc7 |
delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages5.xml
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/tests/qemuxml2argvdata/hugepages-pages5.args b/tests/qemuxml2argvdata/hugepages-default-2M.args
|
|
|
99cbc7 |
similarity index 75%
|
|
|
99cbc7 |
rename from tests/qemuxml2argvdata/hugepages-pages5.args
|
|
|
99cbc7 |
rename to tests/qemuxml2argvdata/hugepages-default-2M.args
|
|
|
99cbc7 |
index dc13abed10..d094be1252 100644
|
|
|
99cbc7 |
--- a/tests/qemuxml2argvdata/hugepages-pages5.args
|
|
|
99cbc7 |
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
|
|
|
99cbc7 |
@@ -23,7 +23,4 @@ path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
|
|
|
99cbc7 |
-no-shutdown \
|
|
|
99cbc7 |
-no-acpi \
|
|
|
99cbc7 |
-boot c \
|
|
|
99cbc7 |
--usb \
|
|
|
99cbc7 |
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
|
|
|
99cbc7 |
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
|
|
99cbc7 |
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
|
|
99cbc7 |
+-usb
|
|
|
99cbc7 |
diff --git a/tests/qemuxml2argvdata/hugepages-pages5.xml b/tests/qemuxml2argvdata/hugepages-default-2M.xml
|
|
|
99cbc7 |
similarity index 63%
|
|
|
99cbc7 |
rename from tests/qemuxml2argvdata/hugepages-pages5.xml
|
|
|
99cbc7 |
rename to tests/qemuxml2argvdata/hugepages-default-2M.xml
|
|
|
99cbc7 |
index f636c186de..ac219a7800 100644
|
|
|
99cbc7 |
--- a/tests/qemuxml2argvdata/hugepages-pages5.xml
|
|
|
99cbc7 |
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml
|
|
|
99cbc7 |
@@ -19,23 +19,12 @@
|
|
|
99cbc7 |
<on_crash>destroy</on_crash>
|
|
|
99cbc7 |
<devices>
|
|
|
99cbc7 |
<emulator>/usr/bin/qemu-system-i686</emulator>
|
|
|
99cbc7 |
- <disk type='block' device='disk'>
|
|
|
99cbc7 |
- <driver name='qemu' type='raw'/>
|
|
|
99cbc7 |
- <source dev='/dev/HostVG/QEMUGuest1'/>
|
|
|
99cbc7 |
- <target dev='hda' bus='ide'/>
|
|
|
99cbc7 |
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
|
99cbc7 |
- </disk>
|
|
|
99cbc7 |
<controller type='usb' index='0'>
|
|
|
99cbc7 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
|
|
99cbc7 |
</controller>
|
|
|
99cbc7 |
- <controller type='ide' index='0'>
|
|
|
99cbc7 |
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
|
|
|
99cbc7 |
- </controller>
|
|
|
99cbc7 |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
99cbc7 |
<input type='mouse' bus='ps2'/>
|
|
|
99cbc7 |
<input type='keyboard' bus='ps2'/>
|
|
|
99cbc7 |
- <memballoon model='virtio'>
|
|
|
99cbc7 |
- <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
|
|
99cbc7 |
- </memballoon>
|
|
|
99cbc7 |
+ <memballoon model='none'/>
|
|
|
99cbc7 |
</devices>
|
|
|
99cbc7 |
</domain>
|
|
|
99cbc7 |
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
|
99cbc7 |
index 1b6e8ded43..57cfce1b7b 100644
|
|
|
99cbc7 |
--- a/tests/qemuxml2argvtest.c
|
|
|
99cbc7 |
+++ b/tests/qemuxml2argvtest.c
|
|
|
99cbc7 |
@@ -953,6 +953,7 @@ mymain(void)
|
|
|
99cbc7 |
QEMU_CAPS_OBJECT_MEMORY_FILE,
|
|
|
99cbc7 |
QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
|
|
|
99cbc7 |
DO_TEST("hugepages-default", NONE);
|
|
|
99cbc7 |
+ DO_TEST("hugepages-default-2M", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-numa-default",
|
|
|
99cbc7 |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
99cbc7 |
DO_TEST("hugepages-numa-default-2M",
|
|
|
99cbc7 |
@@ -974,7 +975,6 @@ mymain(void)
|
|
|
99cbc7 |
QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
99cbc7 |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
99cbc7 |
DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
|
|
|
99cbc7 |
- DO_TEST("hugepages-pages5", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-pages6", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-pages7",
|
|
|
99cbc7 |
QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
|
|
|
99cbc7 |
diff --git a/tests/qemuxml2xmloutdata/hugepages-default-2M.xml b/tests/qemuxml2xmloutdata/hugepages-default-2M.xml
|
|
|
99cbc7 |
new file mode 120000
|
|
|
99cbc7 |
index 0000000000..8786948fdd
|
|
|
99cbc7 |
--- /dev/null
|
|
|
99cbc7 |
+++ b/tests/qemuxml2xmloutdata/hugepages-default-2M.xml
|
|
|
99cbc7 |
@@ -0,0 +1 @@
|
|
|
99cbc7 |
+../qemuxml2argvdata/hugepages-default-2M.xml
|
|
|
99cbc7 |
\ No newline at end of file
|
|
|
99cbc7 |
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages5.xml b/tests/qemuxml2xmloutdata/hugepages-pages5.xml
|
|
|
99cbc7 |
deleted file mode 120000
|
|
|
99cbc7 |
index cfead1c317..0000000000
|
|
|
99cbc7 |
--- a/tests/qemuxml2xmloutdata/hugepages-pages5.xml
|
|
|
99cbc7 |
+++ /dev/null
|
|
|
99cbc7 |
@@ -1 +0,0 @@
|
|
|
99cbc7 |
-../qemuxml2argvdata/hugepages-pages5.xml
|
|
|
99cbc7 |
\ No newline at end of file
|
|
|
99cbc7 |
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
|
99cbc7 |
index 9b3152821f..2f860e548c 100644
|
|
|
99cbc7 |
--- a/tests/qemuxml2xmltest.c
|
|
|
99cbc7 |
+++ b/tests/qemuxml2xmltest.c
|
|
|
99cbc7 |
@@ -333,12 +333,12 @@ mymain(void)
|
|
|
99cbc7 |
DO_TEST("pages-discard", NONE);
|
|
|
99cbc7 |
DO_TEST("pages-discard-hugepages", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-default", NONE);
|
|
|
99cbc7 |
+ DO_TEST("hugepages-default-2M", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-numa-default-2M", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-numa-default-dimm", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-numa-nodeset", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-numa-nodeset-part", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-numa-nodeset-nonexist", NONE);
|
|
|
99cbc7 |
- DO_TEST("hugepages-pages5", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-pages6", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-pages7", NONE);
|
|
|
99cbc7 |
DO_TEST("hugepages-shared", NONE);
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.18.0
|
|
|
99cbc7 |
|