提交 47b8c6a0 编写于 作者: P Pavel Hrdina

tests: rename hugepages to hugepages-default

Remove unnecessary XML elements as well.
Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
上级 5d40272e
...@@ -23,7 +23,4 @@ server,nowait \ ...@@ -23,7 +23,4 @@ server,nowait \
-no-shutdown \ -no-shutdown \
-no-acpi \ -no-acpi \
-usb \ -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 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-i686</emulator> <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='usb' index='0'/>
<controller type='ide' index='0'/> <controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/> <controller type='pci' index='0' model='pci-root'/>
......
...@@ -944,7 +944,7 @@ mymain(void) ...@@ -944,7 +944,7 @@ mymain(void)
DO_TEST("pmu-feature", NONE); DO_TEST("pmu-feature", NONE);
DO_TEST("pmu-feature-off", NONE); DO_TEST("pmu-feature-off", NONE);
DO_TEST("hugepages", NONE); DO_TEST("hugepages-default", NONE);
DO_TEST("hugepages-numa", DO_TEST("hugepages-numa",
QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
......
...@@ -17,12 +17,6 @@ ...@@ -17,12 +17,6 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-i686</emulator> <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'> <controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
......
...@@ -325,7 +325,7 @@ mymain(void) ...@@ -325,7 +325,7 @@ mymain(void)
DO_TEST("pmu-feature", NONE); DO_TEST("pmu-feature", NONE);
DO_TEST("pmu-feature-off", NONE); DO_TEST("pmu-feature-off", NONE);
DO_TEST("hugepages", NONE); DO_TEST("hugepages-default", NONE);
DO_TEST("hugepages-pages", NONE); DO_TEST("hugepages-pages", NONE);
DO_TEST("hugepages-pages2", NONE); DO_TEST("hugepages-pages2", NONE);
DO_TEST("hugepages-pages3", NONE); DO_TEST("hugepages-pages3", NONE);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册