forked from rpms/libvirt
146 lines
5.1 KiB
Diff
146 lines
5.1 KiB
Diff
|
From 6047fac5e90c96d2d79b08e0c9d32ee7f0ad52cd Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <6047fac5e90c96d2d79b08e0c9d32ee7f0ad52cd@dist-git>
|
||
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Date: Wed, 7 Oct 2020 18:45:32 +0200
|
||
|
|
Subject: [PATCH] qemuxml2xmltest: Add "numatune-distance" test case
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This test case checks that expanding NUMA distance works. On
|
||
|
|
input we accept if only distance from A to B is specified. On the
|
||
|
|
output we format the B to A distance too.
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
||
|
|
(cherry picked from commit afb1ea67769d88290499c5c6a0c34982bad6e9c9)
|
||
|
|
|
||
|
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Message-Id: <6974ab2c0987840742965ea925adcc4395f72ec2.1602087923.git.mprivozn@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
.../qemuxml2xmloutdata/numatune-distances.xml | 96 +++++++++++++++++++
|
||
|
|
tests/qemuxml2xmltest.c | 1 +
|
||
|
|
2 files changed, 97 insertions(+)
|
||
|
|
create mode 100644 tests/qemuxml2xmloutdata/numatune-distances.xml
|
||
|
|
|
||
|
|
diff --git a/tests/qemuxml2xmloutdata/numatune-distances.xml b/tests/qemuxml2xmloutdata/numatune-distances.xml
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000000..48f89cb015
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/tests/qemuxml2xmloutdata/numatune-distances.xml
|
||
|
|
@@ -0,0 +1,96 @@
|
||
|
|
+<domain type='qemu'>
|
||
|
|
+ <name>QEMUGuest</name>
|
||
|
|
+ <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
|
||
|
|
+ <memory unit='KiB'>8388608</memory>
|
||
|
|
+ <currentMemory unit='KiB'>8388608</currentMemory>
|
||
|
|
+ <vcpu placement='static'>12</vcpu>
|
||
|
|
+ <os>
|
||
|
|
+ <type arch='x86_64' machine='pc'>hvm</type>
|
||
|
|
+ <boot dev='hd'/>
|
||
|
|
+ </os>
|
||
|
|
+ <features>
|
||
|
|
+ <acpi/>
|
||
|
|
+ <apic/>
|
||
|
|
+ <pae/>
|
||
|
|
+ </features>
|
||
|
|
+ <cpu>
|
||
|
|
+ <numa>
|
||
|
|
+ <cell id='0' cpus='0,11' memory='2097152' unit='KiB'>
|
||
|
|
+ <distances>
|
||
|
|
+ <sibling id='0' value='10'/>
|
||
|
|
+ <sibling id='1' value='21'/>
|
||
|
|
+ <sibling id='2' value='31'/>
|
||
|
|
+ <sibling id='3' value='41'/>
|
||
|
|
+ <sibling id='4' value='51'/>
|
||
|
|
+ <sibling id='5' value='61'/>
|
||
|
|
+ </distances>
|
||
|
|
+ </cell>
|
||
|
|
+ <cell id='1' cpus='1,10' memory='2097152' unit='KiB'>
|
||
|
|
+ <distances>
|
||
|
|
+ <sibling id='0' value='21'/>
|
||
|
|
+ <sibling id='1' value='10'/>
|
||
|
|
+ <sibling id='2' value='21'/>
|
||
|
|
+ <sibling id='3' value='31'/>
|
||
|
|
+ <sibling id='4' value='41'/>
|
||
|
|
+ <sibling id='5' value='51'/>
|
||
|
|
+ </distances>
|
||
|
|
+ </cell>
|
||
|
|
+ <cell id='2' cpus='2,9' memory='2097152' unit='KiB'>
|
||
|
|
+ <distances>
|
||
|
|
+ <sibling id='0' value='31'/>
|
||
|
|
+ <sibling id='1' value='21'/>
|
||
|
|
+ <sibling id='2' value='10'/>
|
||
|
|
+ <sibling id='3' value='21'/>
|
||
|
|
+ <sibling id='4' value='31'/>
|
||
|
|
+ <sibling id='5' value='41'/>
|
||
|
|
+ </distances>
|
||
|
|
+ </cell>
|
||
|
|
+ <cell id='3' cpus='3,8' memory='2097152' unit='KiB'>
|
||
|
|
+ <distances>
|
||
|
|
+ <sibling id='0' value='41'/>
|
||
|
|
+ <sibling id='1' value='31'/>
|
||
|
|
+ <sibling id='2' value='21'/>
|
||
|
|
+ <sibling id='3' value='10'/>
|
||
|
|
+ <sibling id='4' value='21'/>
|
||
|
|
+ <sibling id='5' value='31'/>
|
||
|
|
+ </distances>
|
||
|
|
+ </cell>
|
||
|
|
+ <cell id='4' cpus='4,7' memory='2097152' unit='KiB'>
|
||
|
|
+ <distances>
|
||
|
|
+ <sibling id='0' value='51'/>
|
||
|
|
+ <sibling id='1' value='41'/>
|
||
|
|
+ <sibling id='2' value='31'/>
|
||
|
|
+ <sibling id='3' value='21'/>
|
||
|
|
+ <sibling id='4' value='10'/>
|
||
|
|
+ <sibling id='5' value='21'/>
|
||
|
|
+ </distances>
|
||
|
|
+ </cell>
|
||
|
|
+ <cell id='5' cpus='5-6' memory='2097152' unit='KiB'>
|
||
|
|
+ <distances>
|
||
|
|
+ <sibling id='0' value='61'/>
|
||
|
|
+ <sibling id='1' value='51'/>
|
||
|
|
+ <sibling id='2' value='41'/>
|
||
|
|
+ <sibling id='3' value='31'/>
|
||
|
|
+ <sibling id='4' value='21'/>
|
||
|
|
+ <sibling id='5' value='10'/>
|
||
|
|
+ </distances>
|
||
|
|
+ </cell>
|
||
|
|
+ </numa>
|
||
|
|
+ </cpu>
|
||
|
|
+ <clock offset='utc'/>
|
||
|
|
+ <on_poweroff>destroy</on_poweroff>
|
||
|
|
+ <on_reboot>restart</on_reboot>
|
||
|
|
+ <on_crash>restart</on_crash>
|
||
|
|
+ <devices>
|
||
|
|
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
|
||
|
|
+ <controller type='usb' index='0'>
|
||
|
|
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
||
|
|
+ </controller>
|
||
|
|
+ <controller type='pci' index='0' model='pci-root'/>
|
||
|
|
+ <input type='mouse' bus='ps2'/>
|
||
|
|
+ <input type='keyboard' bus='ps2'/>
|
||
|
|
+ <memballoon model='virtio'>
|
||
|
|
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
||
|
|
+ </memballoon>
|
||
|
|
+ </devices>
|
||
|
|
+</domain>
|
||
|
|
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
||
|
|
index c8218e423e..6c3f5c4a9e 100644
|
||
|
|
--- a/tests/qemuxml2xmltest.c
|
||
|
|
+++ b/tests/qemuxml2xmltest.c
|
||
|
|
@@ -1104,6 +1104,7 @@ mymain(void)
|
||
|
|
DO_TEST("numatune-auto-prefer", NONE);
|
||
|
|
DO_TEST("numatune-memnode", QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_FILE);
|
||
|
|
DO_TEST("numatune-memnode-no-memory", QEMU_CAPS_OBJECT_MEMORY_FILE);
|
||
|
|
+ DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST);
|
||
|
|
|
||
|
|
DO_TEST("bios-nvram", NONE);
|
||
|
|
DO_TEST("bios-nvram-os-interleave", NONE);
|
||
|
|
--
|
||
|
|
2.29.2
|
||
|
|
|