Blame SOURCES/libvirt-tests-rename-hugepages-pages6-into-hugepages-default-system-size.patch

99cbc7
From 77aaad5d32de197cb3c18c54061fbe807d1f907a Mon Sep 17 00:00:00 2001
99cbc7
Message-Id: <77aaad5d32de197cb3c18c54061fbe807d1f907a@dist-git>
99cbc7
From: Pavel Hrdina <phrdina@redhat.com>
99cbc7
Date: Mon, 13 Aug 2018 18:16:15 +0200
99cbc7
Subject: [PATCH] tests: rename hugepages-pages6 into
99cbc7
 hugepages-default-system-size
99cbc7
MIME-Version: 1.0
99cbc7
Content-Type: text/plain; charset=UTF-8
99cbc7
Content-Transfer-Encoding: 8bit
99cbc7
99cbc7
Remove unnecessary XML elements as well.
99cbc7
99cbc7
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
99cbc7
(cherry picked from commit 3d553f4d4bfa94bc0ba4111454a85a0f16cf89c3)
99cbc7
99cbc7
Conflicts:
99cbc7
    tests/qemuxml2argvdata/hugepages-default-system-size.args
99cbc7
        - missing upstream commit <caccbba64a>
99cbc7
99cbc7
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1591235
99cbc7
99cbc7
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
99cbc7
Reviewed-by: Ján Tomko <jtomko@redhat.com>
99cbc7
---
99cbc7
 ...ges6.args => hugepages-default-system-size.args} |  5 +----
99cbc7
 ...pages6.xml => hugepages-default-system-size.xml} | 13 +------------
99cbc7
 tests/qemuxml2argvtest.c                            |  2 +-
99cbc7
 .../hugepages-default-system-size.xml               |  1 +
99cbc7
 tests/qemuxml2xmloutdata/hugepages-pages6.xml       |  1 -
99cbc7
 tests/qemuxml2xmltest.c                             |  2 +-
99cbc7
 6 files changed, 5 insertions(+), 19 deletions(-)
99cbc7
 rename tests/qemuxml2argvdata/{hugepages-pages6.args => hugepages-default-system-size.args} (72%)
99cbc7
 rename tests/qemuxml2argvdata/{hugepages-pages6.xml => hugepages-default-system-size.xml} (63%)
99cbc7
 create mode 120000 tests/qemuxml2xmloutdata/hugepages-default-system-size.xml
99cbc7
 delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages6.xml
99cbc7
99cbc7
diff --git a/tests/qemuxml2argvdata/hugepages-pages6.args b/tests/qemuxml2argvdata/hugepages-default-system-size.args
99cbc7
similarity index 72%
99cbc7
rename from tests/qemuxml2argvdata/hugepages-pages6.args
99cbc7
rename to tests/qemuxml2argvdata/hugepages-default-system-size.args
99cbc7
index 51467c0ae1..eeb7d142ce 100644
99cbc7
--- a/tests/qemuxml2argvdata/hugepages-pages6.args
99cbc7
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
99cbc7
@@ -21,7 +21,4 @@ path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
99cbc7
 -no-shutdown \
99cbc7
 -no-acpi \
99cbc7
 -boot c \
99cbc7
--usb \
99cbc7
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
99cbc7
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
99cbc7
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
99cbc7
+-usb
99cbc7
diff --git a/tests/qemuxml2argvdata/hugepages-pages6.xml b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
99cbc7
similarity index 63%
99cbc7
rename from tests/qemuxml2argvdata/hugepages-pages6.xml
99cbc7
rename to tests/qemuxml2argvdata/hugepages-default-system-size.xml
99cbc7
index fc4f57fbc0..8a809ead5e 100644
99cbc7
--- a/tests/qemuxml2argvdata/hugepages-pages6.xml
99cbc7
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
99cbc7
@@ -19,23 +19,12 @@
99cbc7
   <on_crash>destroy</on_crash>
99cbc7
   <devices>
99cbc7
     <emulator>/usr/bin/qemu-system-i686</emulator>
99cbc7
-    <disk type='block' device='disk'>
99cbc7
-      <driver name='qemu' type='raw'/>
99cbc7
-      <source dev='/dev/HostVG/QEMUGuest1'/>
99cbc7
-      <target dev='hda' bus='ide'/>
99cbc7
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
99cbc7
-    </disk>
99cbc7
     <controller type='usb' index='0'>
99cbc7
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
99cbc7
     </controller>
99cbc7
-    <controller type='ide' index='0'>
99cbc7
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
99cbc7
-    </controller>
99cbc7
     <controller type='pci' index='0' model='pci-root'/>
99cbc7
     <input type='mouse' bus='ps2'/>
99cbc7
     <input type='keyboard' bus='ps2'/>
99cbc7
-    <memballoon model='virtio'>
99cbc7
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
99cbc7
-    </memballoon>
99cbc7
+    <memballoon model='none'/>
99cbc7
   </devices>
99cbc7
 </domain>
99cbc7
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
99cbc7
index 57cfce1b7b..1aab23408d 100644
99cbc7
--- a/tests/qemuxml2argvtest.c
99cbc7
+++ b/tests/qemuxml2argvtest.c
99cbc7
@@ -954,6 +954,7 @@ mymain(void)
99cbc7
             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
99cbc7
     DO_TEST("hugepages-default", NONE);
99cbc7
     DO_TEST("hugepages-default-2M", NONE);
99cbc7
+    DO_TEST("hugepages-default-system-size", NONE);
99cbc7
     DO_TEST("hugepages-numa-default",
99cbc7
             QEMU_CAPS_OBJECT_MEMORY_FILE);
99cbc7
     DO_TEST("hugepages-numa-default-2M",
99cbc7
@@ -975,7 +976,6 @@ mymain(void)
99cbc7
             QEMU_CAPS_OBJECT_MEMORY_RAM,
99cbc7
             QEMU_CAPS_OBJECT_MEMORY_FILE);
99cbc7
     DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
99cbc7
-    DO_TEST("hugepages-pages6", NONE);
99cbc7
     DO_TEST("hugepages-pages7",
99cbc7
             QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
99cbc7
             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
99cbc7
diff --git a/tests/qemuxml2xmloutdata/hugepages-default-system-size.xml b/tests/qemuxml2xmloutdata/hugepages-default-system-size.xml
99cbc7
new file mode 120000
99cbc7
index 0000000000..e64e3fb282
99cbc7
--- /dev/null
99cbc7
+++ b/tests/qemuxml2xmloutdata/hugepages-default-system-size.xml
99cbc7
@@ -0,0 +1 @@
99cbc7
+../qemuxml2argvdata/hugepages-default-system-size.xml
99cbc7
\ No newline at end of file
99cbc7
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages6.xml b/tests/qemuxml2xmloutdata/hugepages-pages6.xml
99cbc7
deleted file mode 120000
99cbc7
index 584b7c92c8..0000000000
99cbc7
--- a/tests/qemuxml2xmloutdata/hugepages-pages6.xml
99cbc7
+++ /dev/null
99cbc7
@@ -1 +0,0 @@
99cbc7
-../qemuxml2argvdata/hugepages-pages6.xml
99cbc7
\ No newline at end of file
99cbc7
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
99cbc7
index 2f860e548c..a3555b348e 100644
99cbc7
--- a/tests/qemuxml2xmltest.c
99cbc7
+++ b/tests/qemuxml2xmltest.c
99cbc7
@@ -334,12 +334,12 @@ mymain(void)
99cbc7
     DO_TEST("pages-discard-hugepages", NONE);
99cbc7
     DO_TEST("hugepages-default", NONE);
99cbc7
     DO_TEST("hugepages-default-2M", NONE);
99cbc7
+    DO_TEST("hugepages-default-system-size", NONE);
99cbc7
     DO_TEST("hugepages-numa-default-2M", NONE);
99cbc7
     DO_TEST("hugepages-numa-default-dimm", NONE);
99cbc7
     DO_TEST("hugepages-numa-nodeset", NONE);
99cbc7
     DO_TEST("hugepages-numa-nodeset-part", NONE);
99cbc7
     DO_TEST("hugepages-numa-nodeset-nonexist", NONE);
99cbc7
-    DO_TEST("hugepages-pages6", NONE);
99cbc7
     DO_TEST("hugepages-pages7", NONE);
99cbc7
     DO_TEST("hugepages-shared", NONE);
99cbc7
     DO_TEST("hugepages-memaccess", NONE);
99cbc7
-- 
99cbc7
2.18.0
99cbc7