edecca
From b78dc3ab1a744d408803f28658ce3680ae544460 Mon Sep 17 00:00:00 2001
edecca
Message-Id: <b78dc3ab1a744d408803f28658ce3680ae544460@dist-git>
edecca
From: Pavel Hrdina <phrdina@redhat.com>
edecca
Date: Mon, 13 Aug 2018 19:21:46 +0200
edecca
Subject: [PATCH] tests: rename hugepages-pages5 into hugepages-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 6110770324b42c8af8b4bc40a61d41ccd563f90d)
edecca
edecca
Conflicts:
edecca
    tests/qemuxml2argvdata/hugepages-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
 ...epages-pages5.args => hugepages-default-2M.args} |  5 +----
edecca
 ...ugepages-pages5.xml => hugepages-default-2M.xml} | 13 +------------
edecca
 tests/qemuxml2argvtest.c                            |  2 +-
edecca
 tests/qemuxml2xmloutdata/hugepages-default-2M.xml   |  1 +
edecca
 tests/qemuxml2xmloutdata/hugepages-pages5.xml       |  1 -
edecca
 tests/qemuxml2xmltest.c                             |  2 +-
edecca
 6 files changed, 5 insertions(+), 19 deletions(-)
edecca
 rename tests/qemuxml2argvdata/{hugepages-pages5.args => hugepages-default-2M.args} (75%)
edecca
 rename tests/qemuxml2argvdata/{hugepages-pages5.xml => hugepages-default-2M.xml} (63%)
edecca
 create mode 120000 tests/qemuxml2xmloutdata/hugepages-default-2M.xml
edecca
 delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages5.xml
edecca
edecca
diff --git a/tests/qemuxml2argvdata/hugepages-pages5.args b/tests/qemuxml2argvdata/hugepages-default-2M.args
edecca
similarity index 75%
edecca
rename from tests/qemuxml2argvdata/hugepages-pages5.args
edecca
rename to tests/qemuxml2argvdata/hugepages-default-2M.args
edecca
index dc13abed10..d094be1252 100644
edecca
--- a/tests/qemuxml2argvdata/hugepages-pages5.args
edecca
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
edecca
@@ -23,7 +23,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-pages5.xml b/tests/qemuxml2argvdata/hugepages-default-2M.xml
edecca
similarity index 63%
edecca
rename from tests/qemuxml2argvdata/hugepages-pages5.xml
edecca
rename to tests/qemuxml2argvdata/hugepages-default-2M.xml
edecca
index f636c186de..ac219a7800 100644
edecca
--- a/tests/qemuxml2argvdata/hugepages-pages5.xml
edecca
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml
edecca
@@ -19,23 +19,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 1b6e8ded43..57cfce1b7b 100644
edecca
--- a/tests/qemuxml2argvtest.c
edecca
+++ b/tests/qemuxml2argvtest.c
edecca
@@ -953,6 +953,7 @@ mymain(void)
edecca
             QEMU_CAPS_OBJECT_MEMORY_FILE,
edecca
             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
edecca
     DO_TEST("hugepages-default", NONE);
edecca
+    DO_TEST("hugepages-default-2M", NONE);
edecca
     DO_TEST("hugepages-numa-default",
edecca
             QEMU_CAPS_OBJECT_MEMORY_FILE);
edecca
     DO_TEST("hugepages-numa-default-2M",
edecca
@@ -974,7 +975,6 @@ mymain(void)
edecca
             QEMU_CAPS_OBJECT_MEMORY_RAM,
edecca
             QEMU_CAPS_OBJECT_MEMORY_FILE);
edecca
     DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
edecca
-    DO_TEST("hugepages-pages5", NONE);
edecca
     DO_TEST("hugepages-pages6", NONE);
edecca
     DO_TEST("hugepages-pages7",
edecca
             QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
edecca
diff --git a/tests/qemuxml2xmloutdata/hugepages-default-2M.xml b/tests/qemuxml2xmloutdata/hugepages-default-2M.xml
edecca
new file mode 120000
edecca
index 0000000000..8786948fdd
edecca
--- /dev/null
edecca
+++ b/tests/qemuxml2xmloutdata/hugepages-default-2M.xml
edecca
@@ -0,0 +1 @@
edecca
+../qemuxml2argvdata/hugepages-default-2M.xml
edecca
\ No newline at end of file
edecca
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages5.xml b/tests/qemuxml2xmloutdata/hugepages-pages5.xml
edecca
deleted file mode 120000
edecca
index cfead1c317..0000000000
edecca
--- a/tests/qemuxml2xmloutdata/hugepages-pages5.xml
edecca
+++ /dev/null
edecca
@@ -1 +0,0 @@
edecca
-../qemuxml2argvdata/hugepages-pages5.xml
edecca
\ No newline at end of file
edecca
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
edecca
index 9b3152821f..2f860e548c 100644
edecca
--- a/tests/qemuxml2xmltest.c
edecca
+++ b/tests/qemuxml2xmltest.c
edecca
@@ -333,12 +333,12 @@ mymain(void)
edecca
     DO_TEST("pages-discard", NONE);
edecca
     DO_TEST("pages-discard-hugepages", NONE);
edecca
     DO_TEST("hugepages-default", NONE);
edecca
+    DO_TEST("hugepages-default-2M", 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-numa-nodeset-part", 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
     DO_TEST("hugepages-shared", NONE);
edecca
-- 
edecca
2.18.0
edecca