[PATCH 4/4] numatune: Add tests to validate the persistent XML

[Osier Yang <jyang@xxxxxxxxxx>]

The added tests can only be used to validate if the persistent XML
is correct, can not check if the NUMA policy is correctly set, we
may need write specific tests to do it.
---
 .../qemuxml2argvdata/qemuxml2argv-numa-memory.args |    4 +++
 .../qemuxml2argvdata/qemuxml2argv-numa-memory.xml  |   28 ++++++++++++++++++++
 tests/qemuxml2argvtest.c                           |    2 +
 tests/qemuxml2xmltest.c                            |    2 +
 4 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numa-memory.args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numa-memory.xml

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numa-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numa-memory.args
new file mode 100644
index 0000000..f44b73a
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numa-memory.args
@@ -0,0 +1,4 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
+-S -M pc -m 214 -smp 2 -nographic -monitor \
+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numa-memory.xml b/tests/qemuxml2argvdata/qemuxml2argv-numa-memory.xml
new file mode 100644
index 0000000..d350f7c
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numa-memory.xml
@@ -0,0 +1,28 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory>219136</memory>
+  <currentMemory>219136</currentMemory>
+  <vcpu>2</vcpu>
+  <numatune>
+    <memory model='interleave' nodeset='0'/>
+  </numatune>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' unit='0'/>
+    </disk>
+    <controller type='ide' index='0'/>
+    <memballoon model='virtio'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index a7e4cc0..880c59d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -480,6 +480,8 @@ mymain(void)
 
     DO_TEST("smp", false, QEMU_CAPS_SMP_TOPOLOGY);
 
+    DO_TEST("numa-memory", false, NONE);
+
     DO_TEST("cpu-topology1", false, QEMU_CAPS_SMP_TOPOLOGY);
     DO_TEST("cpu-topology2", false, QEMU_CAPS_SMP_TOPOLOGY);
     DO_TEST("cpu-topology3", false, NONE);
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 5bfbcab..a9d40ca 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -180,6 +180,8 @@ mymain(void)
 
     DO_TEST("smp");
 
+    DO_TEST("numa-memory");
+
     /* These tests generate different XML */
     DO_TEST_DIFFERENT("balloon-device-auto");
     DO_TEST_DIFFERENT("channel-virtio-auto");
-- 
1.7.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list