tests: rename hugepages-pages5 into hugepages-default-2M

Remove unnecessary XML elements as well.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/tests/qemuxml2argvdata/hugepages-pages5.args b/tests/qemuxml2argvdata/hugepages-default-2M.args
similarity index 73%
rename from tests/qemuxml2argvdata/hugepages-pages5.args
rename to tests/qemuxml2argvdata/hugepages-default-2M.args
index 4fd70135d5e857686188c1d29ecafef5a861cd7c..6c5ade296c007cde0b242722711eb46f4f569437 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-pages5.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
@@ -22,8 +22,4 @@ path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\
-bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-usb

diff --git a/tests/qemuxml2argvdata/hugepages-pages5.xml b/tests/qemuxml2argvdata/hugepages-default-2M.xml
similarity index 63%
rename from tests/qemuxml2argvdata/hugepages-pages5.xml
rename to tests/qemuxml2argvdata/hugepages-default-2M.xml
index f636c186de34c566f14ea16f6f68266c1c015fc3..ac219a7800bc8f9576e4fb68396552c79455f3c6 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-pages5.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml
@@ -19,23 +19,12 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-i686</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
-    <controller type='ide' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-    </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f42baff4d42ea3d3d570351b1eb1dc10eeea2e1c..da961e0977628461bee20bdecd7b3c532f630734 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -952,6 +952,7 @@ mymain(void)
             QEMU_CAPS_OBJECT_MEMORY_FILE,
             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
     DO_TEST("hugepages-default", NONE);
+    DO_TEST("hugepages-default-2M", NONE);
     DO_TEST("hugepages-numa-default",
             QEMU_CAPS_OBJECT_MEMORY_FILE);
     DO_TEST("hugepages-numa-default-2M",
@@ -973,7 +974,6 @@ mymain(void)
             QEMU_CAPS_OBJECT_MEMORY_RAM,
             QEMU_CAPS_OBJECT_MEMORY_FILE);
     DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
-    DO_TEST("hugepages-pages5", NONE);
     DO_TEST("hugepages-pages6", NONE);
     DO_TEST("hugepages-pages7",
             QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,

diff --git a/tests/qemuxml2xmloutdata/hugepages-default-2M.xml b/tests/qemuxml2xmloutdata/hugepages-default-2M.xml
new file mode 120000 (symlink)
index 0000000..8786948
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-default-2M.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/hugepages-default-2M.xml
\ No newline at end of file

diff --git a/tests/qemuxml2xmloutdata/hugepages-pages5.xml b/tests/qemuxml2xmloutdata/hugepages-pages5.xml
deleted file mode 120000 (symlink)
index cfead1c..0000000
--- a/tests/qemuxml2xmloutdata/hugepages-pages5.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-pages5.xml
\ No newline at end of file

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 68b51693264f44b5a67e969828e2566677dac18c..1367160682d67e5883ad3f627d2af5a88aaedbbb 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -328,12 +328,12 @@ mymain(void)
     DO_TEST("pages-discard", NONE);
     DO_TEST("pages-discard-hugepages", NONE);
     DO_TEST("hugepages-default", NONE);
+    DO_TEST("hugepages-default-2M", NONE);
     DO_TEST("hugepages-numa-default-2M", NONE);
     DO_TEST("hugepages-numa-default-dimm", NONE);
     DO_TEST("hugepages-numa-nodeset", NONE);
     DO_TEST("hugepages-numa-nodeset-part", NONE);
     DO_TEST("hugepages-numa-nodeset-nonexist", NONE);
-    DO_TEST("hugepages-pages5", NONE);
     DO_TEST("hugepages-pages6", NONE);
     DO_TEST("hugepages-pages7", NONE);
     DO_TEST("hugepages-shared", NONE);