diff --git a/tests/qemuxml2argvdata/hugepages-pages3.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args similarity index 78% rename from tests/qemuxml2argvdata/hugepages-pages3.args rename to tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args index 0835f2db61..c6e11dd6c2 100644 --- a/tests/qemuxml2argvdata/hugepages-pages3.args +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args @@ -25,8 +25,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-pages3.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml similarity index 77% rename from tests/qemuxml2argvdata/hugepages-pages3.xml rename to tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml index 3d3b3f3cc3..b19bdedb36 100644 --- a/tests/qemuxml2argvdata/hugepages-pages3.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml @@ -25,16 +25,10 @@ destroy /usr/bin/qemu-system-i686 - - - -
- - - + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c5ac4cd0e2..1a3ed9c985 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -963,7 +963,8 @@ mymain(void) DO_TEST("hugepages-numa-nodeset", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-pages3", QEMU_CAPS_OBJECT_MEMORY_RAM, + DO_TEST("hugepages-numa-nodeset-part", + QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-shared", QEMU_CAPS_OBJECT_MEMORY_RAM, diff --git a/tests/qemuxml2xmloutdata/hugepages-pages3.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml similarity index 67% rename from tests/qemuxml2xmloutdata/hugepages-pages3.xml rename to tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml index be21c3eddd..1230edfd02 100644 --- a/tests/qemuxml2xmloutdata/hugepages-pages3.xml +++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml @@ -25,23 +25,12 @@ destroy /usr/bin/qemu-system-i686 - - - - -
-
- -
- - -
- + diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 9821403d1e..15ced2a19f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -331,7 +331,7 @@ mymain(void) DO_TEST("hugepages-numa-default-2M", NONE); DO_TEST("hugepages-numa-default-dimm", NONE); DO_TEST("hugepages-numa-nodeset", NONE); - DO_TEST("hugepages-pages3", NONE); + DO_TEST("hugepages-numa-nodeset-part", NONE); DO_TEST("hugepages-pages4", NONE); DO_TEST("hugepages-pages5", NONE); DO_TEST("hugepages-pages6", NONE);