|
 |
c1c534 |
From d41c109a5c9a6224201acdd0efde034776cfa49e Mon Sep 17 00:00:00 2001
|
|
|
c1c534 |
Message-Id: <d41c109a5c9a6224201acdd0efde034776cfa49e@dist-git>
|
|
|
c1c534 |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
c1c534 |
Date: Fri, 2 Feb 2018 15:21:28 +0100
|
|
|
c1c534 |
Subject: [PATCH] tests: Add test for properly removing cachetune entries
|
|
|
c1c534 |
|
|
|
c1c534 |
Cachetune for unavailable vCPUs should be cleared the same way vcpupin and other
|
|
|
c1c534 |
things do, so let's add tests for it.
|
|
|
c1c534 |
|
|
|
c1c534 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
c1c534 |
(cherry picked from commit 958e0431a93b5d330dcc3fa5984a85e5c789eead)
|
|
|
c1c534 |
|
|
|
c1c534 |
https://bugzilla.redhat.com/show_bug.cgi?id=1540817
|
|
|
c1c534 |
|
|
|
c1c534 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
c1c534 |
---
|
|
|
c1c534 |
.../generic-cachetune-extra-tunes.xml | 33 ++++++++++++++++++++++
|
|
|
c1c534 |
.../generic-cachetune-extra-tunes.xml | 30 ++++++++++++++++++++
|
|
|
c1c534 |
tests/genericxml2xmltest.c | 1 +
|
|
|
c1c534 |
3 files changed, 64 insertions(+)
|
|
|
c1c534 |
create mode 100644 tests/genericxml2xmlindata/generic-cachetune-extra-tunes.xml
|
|
|
c1c534 |
create mode 100644 tests/genericxml2xmloutdata/generic-cachetune-extra-tunes.xml
|
|
|
c1c534 |
|
|
|
c1c534 |
diff --git a/tests/genericxml2xmlindata/generic-cachetune-extra-tunes.xml b/tests/genericxml2xmlindata/generic-cachetune-extra-tunes.xml
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..d3b01a8ecd
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/genericxml2xmlindata/generic-cachetune-extra-tunes.xml
|
|
|
c1c534 |
@@ -0,0 +1,33 @@
|
|
|
c1c534 |
+<domain type='qemu'>
|
|
|
c1c534 |
+ <name>QEMUGuest1</name>
|
|
|
c1c534 |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c1c534 |
+ <memory unit='KiB'>219136</memory>
|
|
|
c1c534 |
+ <currentMemory unit='KiB'>219136</currentMemory>
|
|
|
c1c534 |
+ <vcpu placement='static'>2</vcpu>
|
|
|
c1c534 |
+ <cputune>
|
|
|
c1c534 |
+ <cachetune vcpus='0-3'>
|
|
|
c1c534 |
+ <cache id='0' level='3' type='code' size='7680' unit='KiB'/>
|
|
|
c1c534 |
+ <cache id='1' level='3' type='data' size='3840' unit='KiB'/>
|
|
|
c1c534 |
+ </cachetune>
|
|
|
c1c534 |
+ <cachetune vcpus='100'>
|
|
|
c1c534 |
+ <cache id='1' level='3' type='code' size='6' unit='MiB'/>
|
|
|
c1c534 |
+ </cachetune>
|
|
|
c1c534 |
+ </cputune>
|
|
|
c1c534 |
+ <os>
|
|
|
c1c534 |
+ <type arch='i686' machine='pc'>hvm</type>
|
|
|
c1c534 |
+ <boot dev='hd'/>
|
|
|
c1c534 |
+ </os>
|
|
|
c1c534 |
+ <clock offset='utc'/>
|
|
|
c1c534 |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
c1c534 |
+ <on_reboot>restart</on_reboot>
|
|
|
c1c534 |
+ <on_crash>destroy</on_crash>
|
|
|
c1c534 |
+ <devices>
|
|
|
c1c534 |
+ <emulator>/usr/bin/qemu-system-i686</emulator>
|
|
|
c1c534 |
+ <controller type='usb' index='0'/>
|
|
|
c1c534 |
+ <controller type='ide' index='0'/>
|
|
|
c1c534 |
+ <controller type='pci' index='0' model='pci-root'/>
|
|
|
c1c534 |
+ <input type='mouse' bus='ps2'/>
|
|
|
c1c534 |
+ <input type='keyboard' bus='ps2'/>
|
|
|
c1c534 |
+ <memballoon model='virtio'/>
|
|
|
c1c534 |
+ </devices>
|
|
|
c1c534 |
+</domain>
|
|
|
c1c534 |
diff --git a/tests/genericxml2xmloutdata/generic-cachetune-extra-tunes.xml b/tests/genericxml2xmloutdata/generic-cachetune-extra-tunes.xml
|
|
|
c1c534 |
new file mode 100644
|
|
|
c1c534 |
index 0000000000..db85af08da
|
|
|
c1c534 |
--- /dev/null
|
|
|
c1c534 |
+++ b/tests/genericxml2xmloutdata/generic-cachetune-extra-tunes.xml
|
|
|
c1c534 |
@@ -0,0 +1,30 @@
|
|
|
c1c534 |
+<domain type='qemu'>
|
|
|
c1c534 |
+ <name>QEMUGuest1</name>
|
|
|
c1c534 |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c1c534 |
+ <memory unit='KiB'>219136</memory>
|
|
|
c1c534 |
+ <currentMemory unit='KiB'>219136</currentMemory>
|
|
|
c1c534 |
+ <vcpu placement='static'>2</vcpu>
|
|
|
c1c534 |
+ <cputune>
|
|
|
c1c534 |
+ <cachetune vcpus='0-1'>
|
|
|
c1c534 |
+ <cache id='0' level='3' type='code' size='7680' unit='KiB'/>
|
|
|
c1c534 |
+ <cache id='1' level='3' type='data' size='3840' unit='KiB'/>
|
|
|
c1c534 |
+ </cachetune>
|
|
|
c1c534 |
+ </cputune>
|
|
|
c1c534 |
+ <os>
|
|
|
c1c534 |
+ <type arch='i686' machine='pc'>hvm</type>
|
|
|
c1c534 |
+ <boot dev='hd'/>
|
|
|
c1c534 |
+ </os>
|
|
|
c1c534 |
+ <clock offset='utc'/>
|
|
|
c1c534 |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
c1c534 |
+ <on_reboot>restart</on_reboot>
|
|
|
c1c534 |
+ <on_crash>destroy</on_crash>
|
|
|
c1c534 |
+ <devices>
|
|
|
c1c534 |
+ <emulator>/usr/bin/qemu-system-i686</emulator>
|
|
|
c1c534 |
+ <controller type='usb' index='0'/>
|
|
|
c1c534 |
+ <controller type='ide' index='0'/>
|
|
|
c1c534 |
+ <controller type='pci' index='0' model='pci-root'/>
|
|
|
c1c534 |
+ <input type='mouse' bus='ps2'/>
|
|
|
c1c534 |
+ <input type='keyboard' bus='ps2'/>
|
|
|
c1c534 |
+ <memballoon model='virtio'/>
|
|
|
c1c534 |
+ </devices>
|
|
|
c1c534 |
+</domain>
|
|
|
c1c534 |
diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
|
|
|
c1c534 |
index 4ced5c349c..4c3f32a816 100644
|
|
|
c1c534 |
--- a/tests/genericxml2xmltest.c
|
|
|
c1c534 |
+++ b/tests/genericxml2xmltest.c
|
|
|
c1c534 |
@@ -133,6 +133,7 @@ mymain(void)
|
|
|
c1c534 |
DO_TEST("cachetune");
|
|
|
c1c534 |
DO_TEST("cachetune-small");
|
|
|
c1c534 |
DO_TEST("cachetune-cdp");
|
|
|
c1c534 |
+ DO_TEST_DIFFERENT("cachetune-extra-tunes");
|
|
|
c1c534 |
DO_TEST_FULL("cachetune-colliding-allocs", false, true,
|
|
|
c1c534 |
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
|
|
|
c1c534 |
DO_TEST_FULL("cachetune-colliding-tunes", false, true,
|
|
|
c1c534 |
--
|
|
|
c1c534 |
2.16.1
|
|
|
c1c534 |
|