51d9a2
From 8116b6969acb01f6d1e651540b41829a6f6eaa9d Mon Sep 17 00:00:00 2001
51d9a2
Message-Id: <8116b6969acb01f6d1e651540b41829a6f6eaa9d@dist-git>
51d9a2
From: Pavel Hrdina <phrdina@redhat.com>
51d9a2
Date: Mon, 13 Aug 2018 18:16:08 +0200
51d9a2
Subject: [PATCH] tests: extract pages-discard out of hugepages-pages
51d9a2
MIME-Version: 1.0
51d9a2
Content-Type: text/plain; charset=UTF-8
51d9a2
Content-Transfer-Encoding: 8bit
51d9a2
51d9a2
>From the args output you can see that the 'discard' feature is not
51d9a2
honored if you don't use hugepages, that is a bug, following patche
51d9a2
will fix it.
51d9a2
51d9a2
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
51d9a2
(cherry picked from commit aa6a5e09953fea6d379dcb3a330a3fb6d0cf0a0b)
51d9a2
51d9a2
Conflicts:
51d9a2
    tests/qemuxml2argvdata/pages-discard.args
51d9a2
        - missing upstream commit <caccbba64a>
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
 tests/qemuxml2argvdata/hugepages-pages.args  | 12 +++----
51d9a2
 tests/qemuxml2argvdata/hugepages-pages.xml   |  3 +-
51d9a2
 tests/qemuxml2argvdata/pages-discard.args    | 28 +++++++++++++++
51d9a2
 tests/qemuxml2argvdata/pages-discard.xml     | 36 ++++++++++++++++++++
51d9a2
 tests/qemuxml2argvtest.c                     |  6 ++--
51d9a2
 tests/qemuxml2xmloutdata/hugepages-pages.xml |  3 +-
51d9a2
 tests/qemuxml2xmloutdata/pages-discard.xml   |  1 +
51d9a2
 tests/qemuxml2xmltest.c                      |  1 +
51d9a2
 8 files changed, 78 insertions(+), 12 deletions(-)
51d9a2
 create mode 100644 tests/qemuxml2argvdata/pages-discard.args
51d9a2
 create mode 100644 tests/qemuxml2argvdata/pages-discard.xml
51d9a2
 create mode 120000 tests/qemuxml2xmloutdata/pages-discard.xml
51d9a2
51d9a2
diff --git a/tests/qemuxml2argvdata/hugepages-pages.args b/tests/qemuxml2argvdata/hugepages-pages.args
51d9a2
index b52cd581d5..7ece0272a0 100644
51d9a2
--- a/tests/qemuxml2argvdata/hugepages-pages.args
51d9a2
+++ b/tests/qemuxml2argvdata/hugepages-pages.args
51d9a2
@@ -11,20 +11,20 @@ QEMU_AUDIO_DRV=none \
51d9a2
 -m 4096 \
51d9a2
 -smp 4,sockets=4,cores=1,threads=1 \
51d9a2
 -object memory-backend-file,id=ram-node0,prealloc=yes,\
51d9a2
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,discard-data=yes,\
51d9a2
-size=1073741824,host-nodes=0-3,policy=bind \
51d9a2
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
51d9a2
+host-nodes=0-3,policy=bind \
51d9a2
 -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
51d9a2
 -object memory-backend-file,id=ram-node1,prealloc=yes,\
51d9a2
 mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
51d9a2
 host-nodes=0-3,policy=bind \
51d9a2
 -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
51d9a2
 -object memory-backend-file,id=ram-node2,prealloc=yes,\
51d9a2
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,discard-data=yes,\
51d9a2
-size=1073741824,host-nodes=0-3,policy=bind \
51d9a2
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
51d9a2
+host-nodes=0-3,policy=bind \
51d9a2
 -numa node,nodeid=2,cpus=2,memdev=ram-node2 \
51d9a2
 -object memory-backend-file,id=ram-node3,prealloc=yes,\
51d9a2
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,discard-data=yes,\
51d9a2
-size=1073741824,host-nodes=3,policy=bind \
51d9a2
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
51d9a2
+host-nodes=3,policy=bind \
51d9a2
 -numa node,nodeid=3,cpus=3,memdev=ram-node3 \
51d9a2
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
51d9a2
 -display none \
51d9a2
diff --git a/tests/qemuxml2argvdata/hugepages-pages.xml b/tests/qemuxml2argvdata/hugepages-pages.xml
51d9a2
index cba83e754c..f9270782d4 100644
51d9a2
--- a/tests/qemuxml2argvdata/hugepages-pages.xml
51d9a2
+++ b/tests/qemuxml2argvdata/hugepages-pages.xml
51d9a2
@@ -8,7 +8,6 @@
51d9a2
       <page size='2048' unit='KiB' nodeset='1'/>
51d9a2
       <page size='1048576' unit='KiB' nodeset='0,2-3'/>
51d9a2
     </hugepages>
51d9a2
-    <discard/>
51d9a2
   </memoryBacking>
51d9a2
   <vcpu placement='static'>4</vcpu>
51d9a2
   <numatune>
51d9a2
@@ -22,7 +21,7 @@
51d9a2
   <cpu>
51d9a2
     <numa>
51d9a2
       <cell id='0' cpus='0' memory='1048576' unit='KiB'/>
51d9a2
-      <cell id='1' cpus='1' memory='1048576' unit='KiB' discard='no'/>
51d9a2
+      <cell id='1' cpus='1' memory='1048576' unit='KiB'/>
51d9a2
       <cell id='2' cpus='2' memory='1048576' unit='KiB'/>
51d9a2
       <cell id='3' cpus='3' memory='1048576' unit='KiB'/>
51d9a2
     </numa>
51d9a2
diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argvdata/pages-discard.args
51d9a2
new file mode 100644
51d9a2
index 0000000000..9db8c72a22
51d9a2
--- /dev/null
51d9a2
+++ b/tests/qemuxml2argvdata/pages-discard.args
51d9a2
@@ -0,0 +1,28 @@
51d9a2
+LC_ALL=C \
51d9a2
+PATH=/bin \
51d9a2
+HOME=/home/test \
51d9a2
+USER=test \
51d9a2
+LOGNAME=test \
51d9a2
+QEMU_AUDIO_DRV=none \
51d9a2
+/usr/bin/qemu-system-i686 \
51d9a2
+-name QEMUGuest1 \
51d9a2
+-S \
51d9a2
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
51d9a2
+-m 4096 \
51d9a2
+-smp 4,sockets=4,cores=1,threads=1 \
51d9a2
+-numa node,nodeid=0,cpus=0,mem=1024 \
51d9a2
+-numa node,nodeid=1,cpus=1,mem=1024 \
51d9a2
+-numa node,nodeid=2,cpus=2,mem=1024 \
51d9a2
+-numa node,nodeid=3,cpus=3,mem=1024 \
51d9a2
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
51d9a2
+-display none \
51d9a2
+-no-user-config \
51d9a2
+-nodefaults \
51d9a2
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
51d9a2
+server,nowait \
51d9a2
+-mon chardev=charmonitor,id=monitor,mode=control \
51d9a2
+-rtc base=utc \
51d9a2
+-no-shutdown \
51d9a2
+-no-acpi \
51d9a2
+-boot c \
51d9a2
+-usb
51d9a2
diff --git a/tests/qemuxml2argvdata/pages-discard.xml b/tests/qemuxml2argvdata/pages-discard.xml
51d9a2
new file mode 100644
51d9a2
index 0000000000..a8c6b74d95
51d9a2
--- /dev/null
51d9a2
+++ b/tests/qemuxml2argvdata/pages-discard.xml
51d9a2
@@ -0,0 +1,36 @@
51d9a2
+<domain type='qemu'>
51d9a2
+  <name>QEMUGuest1</name>
51d9a2
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
51d9a2
+  <memory unit='KiB'>4194304</memory>
51d9a2
+  <currentMemory unit='KiB'>4194304</currentMemory>
51d9a2
+  <memoryBacking>
51d9a2
+    <discard/>
51d9a2
+  </memoryBacking>
51d9a2
+  <vcpu placement='static'>4</vcpu>
51d9a2
+  <os>
51d9a2
+    <type arch='i686' machine='pc'>hvm</type>
51d9a2
+    <boot dev='hd'/>
51d9a2
+  </os>
51d9a2
+  <cpu>
51d9a2
+    <numa>
51d9a2
+      <cell id='0' cpus='0' memory='1048576' unit='KiB'/>
51d9a2
+      <cell id='1' cpus='1' memory='1048576' unit='KiB' discard='no'/>
51d9a2
+      <cell id='2' cpus='2' memory='1048576' unit='KiB'/>
51d9a2
+      <cell id='3' cpus='3' memory='1048576' unit='KiB'/>
51d9a2
+    </numa>
51d9a2
+  </cpu>
51d9a2
+  <clock offset='utc'/>
51d9a2
+  <on_poweroff>destroy</on_poweroff>
51d9a2
+  <on_reboot>restart</on_reboot>
51d9a2
+  <on_crash>destroy</on_crash>
51d9a2
+  <devices>
51d9a2
+    <emulator>/usr/bin/qemu-system-i686</emulator>
51d9a2
+    <controller type='usb' index='0'>
51d9a2
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
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='none'/>
51d9a2
+  </devices>
51d9a2
+</domain>
51d9a2
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
51d9a2
index 19fb7a0931..ea26d17a63 100644
51d9a2
--- a/tests/qemuxml2argvtest.c
51d9a2
+++ b/tests/qemuxml2argvtest.c
51d9a2
@@ -945,6 +945,9 @@ mymain(void)
51d9a2
     DO_TEST("pmu-feature", NONE);
51d9a2
     DO_TEST("pmu-feature-off", NONE);
51d9a2
 
51d9a2
+    DO_TEST("pages-discard",
51d9a2
+            QEMU_CAPS_OBJECT_MEMORY_FILE,
51d9a2
+            QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
51d9a2
     DO_TEST("hugepages-default", NONE);
51d9a2
     DO_TEST("hugepages-numa-default",
51d9a2
             QEMU_CAPS_OBJECT_MEMORY_FILE);
51d9a2
@@ -953,8 +956,7 @@ mymain(void)
51d9a2
             QEMU_CAPS_OBJECT_MEMORY_FILE);
51d9a2
     DO_TEST("hugepages-pages",
51d9a2
             QEMU_CAPS_OBJECT_MEMORY_RAM,
51d9a2
-            QEMU_CAPS_OBJECT_MEMORY_FILE,
51d9a2
-            QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
51d9a2
+            QEMU_CAPS_OBJECT_MEMORY_FILE);
51d9a2
     DO_TEST("hugepages-pages2", QEMU_CAPS_OBJECT_MEMORY_RAM,
51d9a2
             QEMU_CAPS_OBJECT_MEMORY_FILE);
51d9a2
     DO_TEST("hugepages-pages3", QEMU_CAPS_OBJECT_MEMORY_RAM,
51d9a2
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages.xml b/tests/qemuxml2xmloutdata/hugepages-pages.xml
51d9a2
index 292454588e..498610a217 100644
51d9a2
--- a/tests/qemuxml2xmloutdata/hugepages-pages.xml
51d9a2
+++ b/tests/qemuxml2xmloutdata/hugepages-pages.xml
51d9a2
@@ -8,7 +8,6 @@
51d9a2
       <page size='2048' unit='KiB' nodeset='1'/>
51d9a2
       <page size='1048576' unit='KiB' nodeset='0,2-3'/>
51d9a2
     </hugepages>
51d9a2
-    <discard/>
51d9a2
   </memoryBacking>
51d9a2
   <vcpu placement='static'>4</vcpu>
51d9a2
   <numatune>
51d9a2
@@ -22,7 +21,7 @@
51d9a2
   <cpu>
51d9a2
     <numa>
51d9a2
       <cell id='0' cpus='0' memory='1048576' unit='KiB'/>
51d9a2
-      <cell id='1' cpus='1' memory='1048576' unit='KiB' discard='no'/>
51d9a2
+      <cell id='1' cpus='1' memory='1048576' unit='KiB'/>
51d9a2
       <cell id='2' cpus='2' memory='1048576' unit='KiB'/>
51d9a2
       <cell id='3' cpus='3' memory='1048576' unit='KiB'/>
51d9a2
     </numa>
51d9a2
diff --git a/tests/qemuxml2xmloutdata/pages-discard.xml b/tests/qemuxml2xmloutdata/pages-discard.xml
51d9a2
new file mode 120000
51d9a2
index 0000000000..4d22fef81f
51d9a2
--- /dev/null
51d9a2
+++ b/tests/qemuxml2xmloutdata/pages-discard.xml
51d9a2
@@ -0,0 +1 @@
51d9a2
+../qemuxml2argvdata/pages-discard.xml
51d9a2
\ No newline at end of file
51d9a2
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
51d9a2
index 5900f4de61..b4bd9ebc4c 100644
51d9a2
--- a/tests/qemuxml2xmltest.c
51d9a2
+++ b/tests/qemuxml2xmltest.c
51d9a2
@@ -330,6 +330,7 @@ mymain(void)
51d9a2
     DO_TEST("pmu-feature", NONE);
51d9a2
     DO_TEST("pmu-feature-off", NONE);
51d9a2
 
51d9a2
+    DO_TEST("pages-discard", NONE);
51d9a2
     DO_TEST("hugepages-default", NONE);
51d9a2
     DO_TEST("hugepages-numa-default-dimm", NONE);
51d9a2
     DO_TEST("hugepages-pages", NONE);
51d9a2
-- 
51d9a2
2.18.0
51d9a2