|
 |
51d9a2 |
From 836a7bbfff3c9f8a1aafad455dade0f64b6fa57d Mon Sep 17 00:00:00 2001
|
|
|
51d9a2 |
Message-Id: <836a7bbfff3c9f8a1aafad455dade0f64b6fa57d@dist-git>
|
|
|
51d9a2 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
51d9a2 |
Date: Mon, 13 Aug 2018 18:16:11 +0200
|
|
|
51d9a2 |
Subject: [PATCH] tests: extract pages-discard-hugepages out of
|
|
|
51d9a2 |
hugepages-pages3
|
|
|
51d9a2 |
MIME-Version: 1.0
|
|
|
51d9a2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
51d9a2 |
Content-Transfer-Encoding: 8bit
|
|
|
51d9a2 |
|
|
|
51d9a2 |
Similar thing happens as for pages-discard, it is not passed to QEMU.
|
|
|
51d9a2 |
|
|
|
51d9a2 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
51d9a2 |
(cherry picked from commit 9a6674c0ff5c5857fcf9b8e5aded1f524cf75d44)
|
|
|
51d9a2 |
|
|
|
51d9a2 |
Conflicts:
|
|
|
51d9a2 |
tests/qemuxml2argvdata/pages-discard-hugepages.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-pages3.args | 3 +-
|
|
|
51d9a2 |
tests/qemuxml2argvdata/hugepages-pages3.xml | 4 +--
|
|
|
51d9a2 |
.../pages-discard-hugepages.args | 28 +++++++++++++++
|
|
|
51d9a2 |
.../pages-discard-hugepages.xml | 34 +++++++++++++++++++
|
|
|
51d9a2 |
tests/qemuxml2argvtest.c | 7 ++--
|
|
|
51d9a2 |
tests/qemuxml2xmloutdata/hugepages-pages3.xml | 4 +--
|
|
|
51d9a2 |
.../pages-discard-hugepages.xml | 1 +
|
|
|
51d9a2 |
tests/qemuxml2xmltest.c | 1 +
|
|
|
51d9a2 |
8 files changed, 74 insertions(+), 8 deletions(-)
|
|
|
51d9a2 |
create mode 100644 tests/qemuxml2argvdata/pages-discard-hugepages.args
|
|
|
51d9a2 |
create mode 100644 tests/qemuxml2argvdata/pages-discard-hugepages.xml
|
|
|
51d9a2 |
create mode 120000 tests/qemuxml2xmloutdata/pages-discard-hugepages.xml
|
|
|
51d9a2 |
|
|
|
51d9a2 |
diff --git a/tests/qemuxml2argvdata/hugepages-pages3.args b/tests/qemuxml2argvdata/hugepages-pages3.args
|
|
|
51d9a2 |
index d55265cdd8..2fc701ca22 100644
|
|
|
51d9a2 |
--- a/tests/qemuxml2argvdata/hugepages-pages3.args
|
|
|
51d9a2 |
+++ b/tests/qemuxml2argvdata/hugepages-pages3.args
|
|
|
51d9a2 |
@@ -13,8 +13,7 @@ QEMU_AUDIO_DRV=none \
|
|
|
51d9a2 |
-object memory-backend-ram,id=ram-node0,size=268435456 \
|
|
|
51d9a2 |
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
|
|
|
51d9a2 |
-object memory-backend-file,id=ram-node1,prealloc=yes,\
|
|
|
51d9a2 |
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,\
|
|
|
51d9a2 |
-discard-data=yes,size=805306368 \
|
|
|
51d9a2 |
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,size=805306368 \
|
|
|
51d9a2 |
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
|
|
|
51d9a2 |
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
|
|
|
51d9a2 |
-display none \
|
|
|
51d9a2 |
diff --git a/tests/qemuxml2argvdata/hugepages-pages3.xml b/tests/qemuxml2argvdata/hugepages-pages3.xml
|
|
|
51d9a2 |
index 147acc4c95..3d3b3f3cc3 100644
|
|
|
51d9a2 |
--- a/tests/qemuxml2argvdata/hugepages-pages3.xml
|
|
|
51d9a2 |
+++ b/tests/qemuxml2argvdata/hugepages-pages3.xml
|
|
|
51d9a2 |
@@ -15,8 +15,8 @@
|
|
|
51d9a2 |
</os>
|
|
|
51d9a2 |
<cpu>
|
|
|
51d9a2 |
<numa>
|
|
|
51d9a2 |
- <cell id='0' cpus='0' memory='262144' unit='KiB' discard='no'/>
|
|
|
51d9a2 |
- <cell id='1' cpus='1' memory='786432' unit='KiB' discard='yes'/>
|
|
|
51d9a2 |
+ <cell id='0' cpus='0' memory='262144' unit='KiB'/>
|
|
|
51d9a2 |
+ <cell id='1' cpus='1' memory='786432' unit='KiB'/>
|
|
|
51d9a2 |
</numa>
|
|
|
51d9a2 |
</cpu>
|
|
|
51d9a2 |
<clock offset='utc'/>
|
|
|
51d9a2 |
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args b/tests/qemuxml2argvdata/pages-discard-hugepages.args
|
|
|
51d9a2 |
new file mode 100644
|
|
|
51d9a2 |
index 0000000000..2dfacefe4a
|
|
|
51d9a2 |
--- /dev/null
|
|
|
51d9a2 |
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.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 SomeDummyHugepagesGuest \
|
|
|
51d9a2 |
+-S \
|
|
|
51d9a2 |
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
|
|
|
51d9a2 |
+-m 1024 \
|
|
|
51d9a2 |
+-smp 2,sockets=2,cores=1,threads=1 \
|
|
|
51d9a2 |
+-mem-prealloc \
|
|
|
51d9a2 |
+-mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
|
|
|
51d9a2 |
+-numa node,nodeid=0,cpus=0,mem=256 \
|
|
|
51d9a2 |
+-numa node,nodeid=1,cpus=1,mem=768 \
|
|
|
51d9a2 |
+-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
|
|
|
51d9a2 |
+-display none \
|
|
|
51d9a2 |
+-no-user-config \
|
|
|
51d9a2 |
+-nodefaults \
|
|
|
51d9a2 |
+-chardev socket,id=charmonitor,\
|
|
|
51d9a2 |
+path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,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-hugepages.xml b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
|
|
|
51d9a2 |
new file mode 100644
|
|
|
51d9a2 |
index 0000000000..d1620d1946
|
|
|
51d9a2 |
--- /dev/null
|
|
|
51d9a2 |
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
|
|
|
51d9a2 |
@@ -0,0 +1,34 @@
|
|
|
51d9a2 |
+<domain type='qemu'>
|
|
|
51d9a2 |
+ <name>SomeDummyHugepagesGuest</name>
|
|
|
51d9a2 |
+ <uuid>ef1bdff4-27f3-4e85-a807-5fb4d58463cc</uuid>
|
|
|
51d9a2 |
+ <memory unit='KiB'>1048576</memory>
|
|
|
51d9a2 |
+ <currentMemory unit='KiB'>1048576</currentMemory>
|
|
|
51d9a2 |
+ <memoryBacking>
|
|
|
51d9a2 |
+ <hugepages/>
|
|
|
51d9a2 |
+ </memoryBacking>
|
|
|
51d9a2 |
+ <vcpu placement='static'>2</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='262144' unit='KiB' discard='no'/>
|
|
|
51d9a2 |
+ <cell id='1' cpus='1' memory='786432' unit='KiB' discard='yes'/>
|
|
|
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 6a79918f67..a95d2c1915 100644
|
|
|
51d9a2 |
--- a/tests/qemuxml2argvtest.c
|
|
|
51d9a2 |
+++ b/tests/qemuxml2argvtest.c
|
|
|
51d9a2 |
@@ -948,6 +948,10 @@ mymain(void)
|
|
|
51d9a2 |
DO_TEST("pages-discard",
|
|
|
51d9a2 |
QEMU_CAPS_OBJECT_MEMORY_FILE,
|
|
|
51d9a2 |
QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
|
|
|
51d9a2 |
+ DO_TEST("pages-discard-hugepages",
|
|
|
51d9a2 |
+ QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
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 |
@@ -961,8 +965,7 @@ mymain(void)
|
|
|
51d9a2 |
QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
51d9a2 |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
51d9a2 |
DO_TEST("hugepages-pages3", 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-shared",
|
|
|
51d9a2 |
QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
51d9a2 |
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
51d9a2 |
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages3.xml b/tests/qemuxml2xmloutdata/hugepages-pages3.xml
|
|
|
51d9a2 |
index 90e6efa5ea..be21c3eddd 100644
|
|
|
51d9a2 |
--- a/tests/qemuxml2xmloutdata/hugepages-pages3.xml
|
|
|
51d9a2 |
+++ b/tests/qemuxml2xmloutdata/hugepages-pages3.xml
|
|
|
51d9a2 |
@@ -15,8 +15,8 @@
|
|
|
51d9a2 |
</os>
|
|
|
51d9a2 |
<cpu>
|
|
|
51d9a2 |
<numa>
|
|
|
51d9a2 |
- <cell id='0' cpus='0' memory='262144' unit='KiB' discard='no'/>
|
|
|
51d9a2 |
- <cell id='1' cpus='1' memory='786432' unit='KiB' discard='yes'/>
|
|
|
51d9a2 |
+ <cell id='0' cpus='0' memory='262144' unit='KiB'/>
|
|
|
51d9a2 |
+ <cell id='1' cpus='1' memory='786432' unit='KiB'/>
|
|
|
51d9a2 |
</numa>
|
|
|
51d9a2 |
</cpu>
|
|
|
51d9a2 |
<clock offset='utc'/>
|
|
|
51d9a2 |
diff --git a/tests/qemuxml2xmloutdata/pages-discard-hugepages.xml b/tests/qemuxml2xmloutdata/pages-discard-hugepages.xml
|
|
|
51d9a2 |
new file mode 120000
|
|
|
51d9a2 |
index 0000000000..3d2f0682dc
|
|
|
51d9a2 |
--- /dev/null
|
|
|
51d9a2 |
+++ b/tests/qemuxml2xmloutdata/pages-discard-hugepages.xml
|
|
|
51d9a2 |
@@ -0,0 +1 @@
|
|
|
51d9a2 |
+../qemuxml2argvdata/pages-discard-hugepages.xml
|
|
|
51d9a2 |
\ No newline at end of file
|
|
|
51d9a2 |
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
|
51d9a2 |
index a4448ff168..83c0ffdfe2 100644
|
|
|
51d9a2 |
--- a/tests/qemuxml2xmltest.c
|
|
|
51d9a2 |
+++ b/tests/qemuxml2xmltest.c
|
|
|
51d9a2 |
@@ -331,6 +331,7 @@ mymain(void)
|
|
|
51d9a2 |
DO_TEST("pmu-feature-off", NONE);
|
|
|
51d9a2 |
|
|
|
51d9a2 |
DO_TEST("pages-discard", NONE);
|
|
|
51d9a2 |
+ DO_TEST("pages-discard-hugepages", NONE);
|
|
|
51d9a2 |
DO_TEST("hugepages-default", NONE);
|
|
|
51d9a2 |
DO_TEST("hugepages-numa-default-2M", NONE);
|
|
|
51d9a2 |
DO_TEST("hugepages-numa-default-dimm", NONE);
|
|
|
51d9a2 |
--
|
|
|
51d9a2 |
2.18.0
|
|
|
51d9a2 |
|