|
 |
edecca |
From 29e9e0e5601599b9246a9365ca5ff123e2534fdd Mon Sep 17 00:00:00 2001
|
|
|
edecca |
Message-Id: <29e9e0e5601599b9246a9365ca5ff123e2534fdd@dist-git>
|
|
|
edecca |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
edecca |
Date: Mon, 13 Aug 2018 19:21:36 +0200
|
|
|
edecca |
Subject: [PATCH] tests: rename hugepages to hugepages-default
|
|
|
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 47b8c6a04af38d38cd5d425b65d052623d1e35ba)
|
|
|
edecca |
|
|
|
edecca |
Conflicts:
|
|
|
edecca |
tests/qemuxml2argvdata/hugepages-default.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 |
.../{hugepages.args => hugepages-default.args} | 2 --
|
|
|
edecca |
.../{hugepages.xml => hugepages-default.xml} | 5 -----
|
|
|
edecca |
tests/qemuxml2argvtest.c | 2 +-
|
|
|
edecca |
.../{hugepages.xml => hugepages-default.xml} | 6 ------
|
|
|
edecca |
tests/qemuxml2xmltest.c | 2 +-
|
|
|
edecca |
5 files changed, 2 insertions(+), 15 deletions(-)
|
|
|
edecca |
rename tests/qemuxml2argvdata/{hugepages.args => hugepages-default.args} (82%)
|
|
|
edecca |
rename tests/qemuxml2argvdata/{hugepages.xml => hugepages-default.xml} (79%)
|
|
|
edecca |
rename tests/qemuxml2xmloutdata/{hugepages.xml => hugepages-default.xml} (82%)
|
|
|
edecca |
|
|
|
edecca |
diff --git a/tests/qemuxml2argvdata/hugepages.args b/tests/qemuxml2argvdata/hugepages-default.args
|
|
|
edecca |
similarity index 82%
|
|
|
edecca |
rename from tests/qemuxml2argvdata/hugepages.args
|
|
|
edecca |
rename to tests/qemuxml2argvdata/hugepages-default.args
|
|
|
edecca |
index ea61ba930e..115da3ea35 100644
|
|
|
edecca |
--- a/tests/qemuxml2argvdata/hugepages.args
|
|
|
edecca |
+++ b/tests/qemuxml2argvdata/hugepages-default.args
|
|
|
edecca |
@@ -24,6 +24,4 @@ server,nowait \
|
|
|
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 |
diff --git a/tests/qemuxml2argvdata/hugepages.xml b/tests/qemuxml2argvdata/hugepages-default.xml
|
|
|
edecca |
similarity index 79%
|
|
|
edecca |
rename from tests/qemuxml2argvdata/hugepages.xml
|
|
|
edecca |
rename to tests/qemuxml2argvdata/hugepages-default.xml
|
|
|
edecca |
index 2e65902f1c..99f53828fe 100644
|
|
|
edecca |
--- a/tests/qemuxml2argvdata/hugepages.xml
|
|
|
edecca |
+++ b/tests/qemuxml2argvdata/hugepages-default.xml
|
|
|
edecca |
@@ -17,11 +17,6 @@
|
|
|
edecca |
<on_crash>destroy</on_crash>
|
|
|
edecca |
<devices>
|
|
|
edecca |
<emulator>/usr/bin/qemu-system-i686</emulator>
|
|
|
edecca |
- <disk type='block' device='disk'>
|
|
|
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 |
<controller type='ide' index='0'/>
|
|
|
edecca |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
edecca |
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
|
edecca |
index 3cff4ffb5e..01553ada38 100644
|
|
|
edecca |
--- a/tests/qemuxml2argvtest.c
|
|
|
edecca |
+++ b/tests/qemuxml2argvtest.c
|
|
|
edecca |
@@ -945,7 +945,7 @@ mymain(void)
|
|
|
edecca |
DO_TEST("pmu-feature", NONE);
|
|
|
edecca |
DO_TEST("pmu-feature-off", NONE);
|
|
|
edecca |
|
|
|
edecca |
- DO_TEST("hugepages", NONE);
|
|
|
edecca |
+ DO_TEST("hugepages-default", NONE);
|
|
|
edecca |
DO_TEST("hugepages-numa",
|
|
|
edecca |
QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
|
|
|
edecca |
QEMU_CAPS_VIRTIO_SCSI,
|
|
|
edecca |
diff --git a/tests/qemuxml2xmloutdata/hugepages.xml b/tests/qemuxml2xmloutdata/hugepages-default.xml
|
|
|
edecca |
similarity index 82%
|
|
|
edecca |
rename from tests/qemuxml2xmloutdata/hugepages.xml
|
|
|
edecca |
rename to tests/qemuxml2xmloutdata/hugepages-default.xml
|
|
|
edecca |
index f78ca95c1b..40043434ee 100644
|
|
|
edecca |
--- a/tests/qemuxml2xmloutdata/hugepages.xml
|
|
|
edecca |
+++ b/tests/qemuxml2xmloutdata/hugepages-default.xml
|
|
|
edecca |
@@ -17,12 +17,6 @@
|
|
|
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 |
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
|
edecca |
index e35644d479..f0cabc422d 100644
|
|
|
edecca |
--- a/tests/qemuxml2xmltest.c
|
|
|
edecca |
+++ b/tests/qemuxml2xmltest.c
|
|
|
edecca |
@@ -330,7 +330,7 @@ mymain(void)
|
|
|
edecca |
DO_TEST("pmu-feature", NONE);
|
|
|
edecca |
DO_TEST("pmu-feature-off", NONE);
|
|
|
edecca |
|
|
|
edecca |
- DO_TEST("hugepages", NONE);
|
|
|
edecca |
+ DO_TEST("hugepages-default", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages2", NONE);
|
|
|
edecca |
DO_TEST("hugepages-pages3", NONE);
|
|
|
edecca |
--
|
|
|
edecca |
2.18.0
|
|
|
edecca |
|