Blame SOURCES/libvirt-tests-rename-hugepages-pages8-into-hugepages-nodeset-nonexist.patch

51d9a2
From 172c5b605b5f0cc5145a44e3aa7603482a2e3817 Mon Sep 17 00:00:00 2001
51d9a2
Message-Id: <172c5b605b5f0cc5145a44e3aa7603482a2e3817@dist-git>
51d9a2
From: Pavel Hrdina <phrdina@redhat.com>
51d9a2
Date: Mon, 13 Aug 2018 18:16:17 +0200
51d9a2
Subject: [PATCH] tests: rename hugepages-pages8 into
51d9a2
 hugepages-nodeset-nonexist
51d9a2
MIME-Version: 1.0
51d9a2
Content-Type: text/plain; charset=UTF-8
51d9a2
Content-Transfer-Encoding: 8bit
51d9a2
51d9a2
Remove unnecessary XML elements as well.
51d9a2
51d9a2
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
51d9a2
(cherry picked from commit 67cffcbbdb4a7dcdc10681695e00615ffae8e726)
51d9a2
51d9a2
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1591235
51d9a2
51d9a2
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
51d9a2
Reviewed-by: Ján Tomko <jtomko@redhat.com>
51d9a2
---
51d9a2
 ...es-pages8.xml => hugepages-nodeset-nonexist.xml} | 13 +------------
51d9a2
 tests/qemuxml2argvtest.c                            |  7 ++++---
51d9a2
 2 files changed, 5 insertions(+), 15 deletions(-)
51d9a2
 rename tests/qemuxml2argvdata/{hugepages-pages8.xml => hugepages-nodeset-nonexist.xml} (64%)
51d9a2
51d9a2
diff --git a/tests/qemuxml2argvdata/hugepages-pages8.xml b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
51d9a2
similarity index 64%
51d9a2
rename from tests/qemuxml2argvdata/hugepages-pages8.xml
51d9a2
rename to tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
51d9a2
index 4cf4c1a8ad..477d3f1f2b 100644
51d9a2
--- a/tests/qemuxml2argvdata/hugepages-pages8.xml
51d9a2
+++ b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
51d9a2
@@ -19,23 +19,12 @@
51d9a2
   <on_crash>destroy</on_crash>
51d9a2
   <devices>
51d9a2
     <emulator>/usr/bin/qemu-system-i686</emulator>
51d9a2
-    <disk type='block' device='disk'>
51d9a2
-      <driver name='qemu' type='raw'/>
51d9a2
-      <source dev='/dev/HostVG/QEMUGuest1'/>
51d9a2
-      <target dev='hda' bus='ide'/>
51d9a2
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
51d9a2
-    </disk>
51d9a2
     <controller type='usb' index='0'>
51d9a2
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
51d9a2
     </controller>
51d9a2
-    <controller type='ide' index='0'>
51d9a2
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
51d9a2
-    </controller>
51d9a2
     <controller type='pci' index='0' model='pci-root'/>
51d9a2
     <input type='mouse' bus='ps2'/>
51d9a2
     <input type='keyboard' bus='ps2'/>
51d9a2
-    <memballoon model='virtio'>
51d9a2
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
51d9a2
-    </memballoon>
51d9a2
+    <memballoon model='none'/>
51d9a2
   </devices>
51d9a2
 </domain>
51d9a2
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
51d9a2
index f8fbca1806..d4251eff3e 100644
51d9a2
--- a/tests/qemuxml2argvtest.c
51d9a2
+++ b/tests/qemuxml2argvtest.c
51d9a2
@@ -959,6 +959,10 @@ mymain(void)
51d9a2
     DO_TEST("hugepages-default", NONE);
51d9a2
     DO_TEST("hugepages-default-2M", NONE);
51d9a2
     DO_TEST("hugepages-default-system-size", NONE);
51d9a2
+    DO_TEST_FAILURE("hugepages-nodeset-nonexist",
51d9a2
+                    QEMU_CAPS_DEVICE_PC_DIMM,
51d9a2
+                    QEMU_CAPS_OBJECT_MEMORY_FILE,
51d9a2
+                    QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
51d9a2
     DO_TEST("hugepages-numa-default",
51d9a2
             QEMU_CAPS_OBJECT_MEMORY_FILE);
51d9a2
     DO_TEST("hugepages-numa-default-2M",
51d9a2
@@ -980,9 +984,6 @@ mymain(void)
51d9a2
             QEMU_CAPS_OBJECT_MEMORY_RAM,
51d9a2
             QEMU_CAPS_OBJECT_MEMORY_FILE);
51d9a2
     DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
51d9a2
-    DO_TEST_FAILURE("hugepages-pages8",
51d9a2
-                    QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
51d9a2
-                    QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
51d9a2
     DO_TEST("hugepages-memaccess", QEMU_CAPS_OBJECT_MEMORY_FILE,
51d9a2
             QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM,
51d9a2
             QEMU_CAPS_NUMA);
51d9a2
-- 
51d9a2
2.18.0
51d9a2