99cbc7
From bbfd839091e67153b9479e546914b819efed807a Mon Sep 17 00:00:00 2001
99cbc7
Message-Id: <bbfd839091e67153b9479e546914b819efed807a@dist-git>
99cbc7
From: Pavel Hrdina <phrdina@redhat.com>
99cbc7
Date: Mon, 13 Aug 2018 18:16:16 +0200
99cbc7
Subject: [PATCH] tests: rename hugepages-pages7 into pages-dimm-discard
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 7e0ac26867da8b3b1464b7649a53fdd6dde8d9ab)
99cbc7
99cbc7
Conflicts:
99cbc7
    tests/qemuxml2argvdata/pages-dimm-discard.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
 ...ges-pages7.args => pages-dimm-discard.args} | 16 +++++-----------
99cbc7
 ...pages-pages7.xml => pages-dimm-discard.xml} | 18 +-----------------
99cbc7
 tests/qemuxml2argvtest.c                       |  7 ++++---
99cbc7
 tests/qemuxml2xmloutdata/hugepages-pages7.xml  |  1 -
99cbc7
 .../qemuxml2xmloutdata/pages-dimm-discard.xml  |  1 +
99cbc7
 tests/qemuxml2xmltest.c                        |  2 +-
99cbc7
 6 files changed, 12 insertions(+), 33 deletions(-)
99cbc7
 rename tests/qemuxml2argvdata/{hugepages-pages7.args => pages-dimm-discard.args} (65%)
99cbc7
 rename tests/qemuxml2argvdata/{hugepages-pages7.xml => pages-dimm-discard.xml} (73%)
99cbc7
 delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages7.xml
99cbc7
 create mode 120000 tests/qemuxml2xmloutdata/pages-dimm-discard.xml
99cbc7
99cbc7
diff --git a/tests/qemuxml2argvdata/hugepages-pages7.args b/tests/qemuxml2argvdata/pages-dimm-discard.args
99cbc7
similarity index 65%
99cbc7
rename from tests/qemuxml2argvdata/hugepages-pages7.args
99cbc7
rename to tests/qemuxml2argvdata/pages-dimm-discard.args
99cbc7
index 02a98026eb..97184e074a 100644
99cbc7
--- a/tests/qemuxml2argvdata/hugepages-pages7.args
99cbc7
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
99cbc7
@@ -10,16 +10,14 @@ QEMU_AUDIO_DRV=none \
99cbc7
 -machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \
99cbc7
 -m size=1048576k,slots=16,maxmem=1099511627776k \
99cbc7
 -smp 2,sockets=2,cores=1,threads=1 \
99cbc7
--mem-prealloc \
99cbc7
--mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \
99cbc7
 -numa node,nodeid=0,cpus=0-1,mem=1024 \
99cbc7
 -object memory-backend-file,id=memdimm0,prealloc=yes,\
99cbc7
 mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,\
99cbc7
 host-nodes=1-3,policy=bind \
99cbc7
 -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
99cbc7
--object memory-backend-file,id=memdimm1,prealloc=yes,\
99cbc7
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-fedora,discard-data=yes,share=no,\
99cbc7
-size=536870912 \
99cbc7
+-object memory-backend-file,id=memdimm1,\
99cbc7
+mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-fedora/dimm1,\
99cbc7
+discard-data=yes,share=no,size=536870912 \
99cbc7
 -device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
99cbc7
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
99cbc7
 -display none \
99cbc7
@@ -30,10 +28,6 @@ server,nowait \
99cbc7
 -mon chardev=charmonitor,id=monitor,mode=control \
99cbc7
 -rtc base=utc \
99cbc7
 -no-shutdown \
99cbc7
+-no-acpi \
99cbc7
 -boot c \
99cbc7
--usb \
99cbc7
--drive file=/var/lib/libvirt/images/fedora.qcow2,format=qcow2,if=none,\
99cbc7
-id=drive-virtio-disk0 \
99cbc7
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk0,\
99cbc7
-id=virtio-disk0 \
99cbc7
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
99cbc7
+-usb
99cbc7
diff --git a/tests/qemuxml2argvdata/hugepages-pages7.xml b/tests/qemuxml2argvdata/pages-dimm-discard.xml
99cbc7
similarity index 73%
99cbc7
rename from tests/qemuxml2argvdata/hugepages-pages7.xml
99cbc7
rename to tests/qemuxml2argvdata/pages-dimm-discard.xml
99cbc7
index 28c72f85a7..3d233687e1 100644
99cbc7
--- a/tests/qemuxml2argvdata/hugepages-pages7.xml
99cbc7
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.xml
99cbc7
@@ -4,19 +4,11 @@
99cbc7
   <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory>
99cbc7
   <memory unit='KiB'>2621439</memory>
99cbc7
   <currentMemory unit='KiB'>2621439</currentMemory>
99cbc7
-  <memoryBacking>
99cbc7
-    <hugepages/>
99cbc7
-  </memoryBacking>
99cbc7
   <vcpu placement='static'>2</vcpu>
99cbc7
   <os>
99cbc7
     <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
99cbc7
     <boot dev='hd'/>
99cbc7
   </os>
99cbc7
-  <features>
99cbc7
-    <acpi/>
99cbc7
-    <apic/>
99cbc7
-    <pae/>
99cbc7
-  </features>
99cbc7
   <cpu>
99cbc7
     <numa>
99cbc7
       <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
99cbc7
@@ -28,21 +20,13 @@
99cbc7
   <on_crash>restart</on_crash>
99cbc7
   <devices>
99cbc7
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
99cbc7
-    <disk type='file' device='disk'>
99cbc7
-      <driver name='qemu' type='qcow2'/>
99cbc7
-      <source file='/var/lib/libvirt/images/fedora.qcow2'/>
99cbc7
-      <target dev='vda' bus='virtio'/>
99cbc7
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
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='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
     <memory model='dimm' discard='no'>
99cbc7
       <source>
99cbc7
         <nodemask>1-3</nodemask>
99cbc7
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
99cbc7
index 1aab23408d..f8fbca1806 100644
99cbc7
--- a/tests/qemuxml2argvtest.c
99cbc7
+++ b/tests/qemuxml2argvtest.c
99cbc7
@@ -952,6 +952,10 @@ mymain(void)
99cbc7
             QEMU_CAPS_OBJECT_MEMORY_RAM,
99cbc7
             QEMU_CAPS_OBJECT_MEMORY_FILE,
99cbc7
             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
99cbc7
+    DO_TEST("pages-dimm-discard",
99cbc7
+            QEMU_CAPS_DEVICE_PC_DIMM,
99cbc7
+            QEMU_CAPS_OBJECT_MEMORY_FILE,
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
@@ -976,9 +980,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-pages7",
99cbc7
-            QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
99cbc7
-            QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
99cbc7
     DO_TEST_FAILURE("hugepages-pages8",
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-pages7.xml b/tests/qemuxml2xmloutdata/hugepages-pages7.xml
99cbc7
deleted file mode 120000
99cbc7
index b4ce4defda..0000000000
99cbc7
--- a/tests/qemuxml2xmloutdata/hugepages-pages7.xml
99cbc7
+++ /dev/null
99cbc7
@@ -1 +0,0 @@
99cbc7
-../qemuxml2argvdata/hugepages-pages7.xml
99cbc7
\ No newline at end of file
99cbc7
diff --git a/tests/qemuxml2xmloutdata/pages-dimm-discard.xml b/tests/qemuxml2xmloutdata/pages-dimm-discard.xml
99cbc7
new file mode 120000
99cbc7
index 0000000000..05bbef8d65
99cbc7
--- /dev/null
99cbc7
+++ b/tests/qemuxml2xmloutdata/pages-dimm-discard.xml
99cbc7
@@ -0,0 +1 @@
99cbc7
+../qemuxml2argvdata/pages-dimm-discard.xml
99cbc7
\ No newline at end of file
99cbc7
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
99cbc7
index a3555b348e..6afc48f98e 100644
99cbc7
--- a/tests/qemuxml2xmltest.c
99cbc7
+++ b/tests/qemuxml2xmltest.c
99cbc7
@@ -332,6 +332,7 @@ mymain(void)
99cbc7
 
99cbc7
     DO_TEST("pages-discard", NONE);
99cbc7
     DO_TEST("pages-discard-hugepages", NONE);
99cbc7
+    DO_TEST("pages-dimm-discard", NONE);
99cbc7
     DO_TEST("hugepages-default", NONE);
99cbc7
     DO_TEST("hugepages-default-2M", NONE);
99cbc7
     DO_TEST("hugepages-default-system-size", NONE);
99cbc7
@@ -340,7 +341,6 @@ mymain(void)
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-pages7", NONE);
99cbc7
     DO_TEST("hugepages-shared", NONE);
99cbc7
     DO_TEST("hugepages-memaccess", NONE);
99cbc7
     DO_TEST("hugepages-memaccess2", NONE);
99cbc7
-- 
99cbc7
2.18.0
99cbc7