tests: rename hugepages to hugepages-default

Remove unnecessary XML elements as well.

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

diff --git a/tests/qemuxml2argvdata/hugepages.args b/tests/qemuxml2argvdata/hugepages-default.args
similarity index 80%
rename from tests/qemuxml2argvdata/hugepages.args
rename to tests/qemuxml2argvdata/hugepages-default.args
index 73fb967a336482c14e11eb8b8dbeb13f57d2f921..b63cb543a5edc433478e08e49e605fdcc98188dc 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -23,7 +23,4 @@ server,nowait \
 -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

diff --git a/tests/qemuxml2argvdata/hugepages.xml b/tests/qemuxml2argvdata/hugepages-default.xml
similarity index 79%
rename from tests/qemuxml2argvdata/hugepages.xml
rename to tests/qemuxml2argvdata/hugepages-default.xml
index 2e65902f1cf1b1d4c488b9cc8be8fe56c012e78f..99f53828fe68d3aab5f797c5c22246dfa628d7b7 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages.xml
+++ b/tests/qemuxml2argvdata/hugepages-default.xml
@@ -17,11 +17,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-i686</emulator>
-    <disk type='block' device='disk'>
-      <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'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 71e59473992dfd6b8c8f38467af203e1ac5385aa..5b309cb9aad8fcb039f82d91b8d7f7cd6f901ab0 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -944,7 +944,7 @@ mymain(void)
     DO_TEST("pmu-feature", NONE);
     DO_TEST("pmu-feature-off", NONE);
 
-    DO_TEST("hugepages", NONE);
+    DO_TEST("hugepages-default", NONE);
     DO_TEST("hugepages-numa",
             QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
             QEMU_CAPS_VIRTIO_SCSI,

diff --git a/tests/qemuxml2xmloutdata/hugepages.xml b/tests/qemuxml2xmloutdata/hugepages-default.xml
similarity index 82%
rename from tests/qemuxml2xmloutdata/hugepages.xml
rename to tests/qemuxml2xmloutdata/hugepages-default.xml
index f78ca95c1b823d6212b3b18446e951069ae66e54..40043434eef98a2df6328677a3f0f98b19968641 100644 (file)
--- a/tests/qemuxml2xmloutdata/hugepages.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-default.xml
@@ -17,12 +17,6 @@
   <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>

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index fb68275204ceed9063bfbb7d7f5695e804445047..31617b1cc12cf0b737178cc309a5eca4cee6a2e7 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -325,7 +325,7 @@ mymain(void)
     DO_TEST("pmu-feature", NONE);
     DO_TEST("pmu-feature-off", NONE);
 
-    DO_TEST("hugepages", NONE);
+    DO_TEST("hugepages-default", NONE);
     DO_TEST("hugepages-pages", NONE);
     DO_TEST("hugepages-pages2", NONE);
     DO_TEST("hugepages-pages3", NONE);