qemuxmlconftest: Prepare 'fd-memory-numa-topology4' for removal of 'pc-i440fx-5.0'

Per commit message of 3f390db2e2ed33cda8e which added the
'fd-memory-numa-topology4' case, it's supposed to test memory
preallocation setting in the NUMA setup.

Now the 5.0 machine type is the last one supporting the old-style NUMA
config and thus also the only way to test the formatting of
'--mem-prealloc' commandline option for qemu, which was since replaced
by a property in the memory backend object.

Thus to preserve the idea of this test, add
'fd-memory-numa-topology4-old-machine' test case pinned to qemu-10.2,
which will use pc-i440fx-5.0 and modernize the normal case using the
latest qemu version by dropping the specific machine version.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.2.0.args b/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.2.0.args
new file mode 100644 (file)
index 0000000..3cc67fb
--- /dev/null
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.2.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-pc \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-pc/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-pc/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pc/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=pc,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-pc/master-key.aes"}' \
+-machine pc-i440fx-5.0,usb=off,dump-guest-core=off,acpi=off \
+-accel kvm \
+-cpu qemu64 \
+-m size=1048576k \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-mem-prealloc \
+-numa node,nodeid=0,cpus=0-1,mem=1024 \
+-uuid bb508b28-d57b-44bd-9e9c-a134cef24b60 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on

diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.2.0.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.2.0.xml
new file mode 100644 (file)
index 0000000..2f5bd3e
--- /dev/null
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.2.0.xml
@@ -0,0 +1,37 @@
+<domain type='kvm'>
+  <name>pc</name>
+  <uuid>bb508b28-d57b-44bd-9e9c-a134cef24b60</uuid>
+  <memory unit='KiB'>1179648</memory>
+  <currentMemory unit='KiB'>1179648</currentMemory>
+  <memoryBacking>
+    <allocation mode='immediate'/>
+  </memoryBacking>
+  <vcpu placement='static'>2</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-i440fx-5.0'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+    <numa>
+      <cell id='0' cpus='0-1' memory='1048576' unit='KiB' discard='yes'/>
+    </numa>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <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'/>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>

diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.xml
new file mode 100644 (file)
index 0000000..2f5bd3e
--- /dev/null
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.xml
@@ -0,0 +1,37 @@
+<domain type='kvm'>
+  <name>pc</name>
+  <uuid>bb508b28-d57b-44bd-9e9c-a134cef24b60</uuid>
+  <memory unit='KiB'>1179648</memory>
+  <currentMemory unit='KiB'>1179648</currentMemory>
+  <memoryBacking>
+    <allocation mode='immediate'/>
+  </memoryBacking>
+  <vcpu placement='static'>2</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-i440fx-5.0'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+    <numa>
+      <cell id='0' cpus='0-1' memory='1048576' unit='KiB' discard='yes'/>
+    </numa>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <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'/>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>

diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args
index 3cc67fb138f6a926d5d205f5e617ca45be16940a..6c9425268ca2c98148d182907c5cd9e6f7293b07 100644 (file)
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args
@@ -10,14 +10,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pc/.config \
 -name guest=pc,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-pc/master-key.aes"}' \
--machine pc-i440fx-5.0,usb=off,dump-guest-core=off,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,acpi=off \
 -accel kvm \
 -cpu qemu64 \
 -m size=1048576k \
 -overcommit mem-lock=off \
 -smp 2,sockets=2,cores=1,threads=1 \
--mem-prealloc \
--numa node,nodeid=0,cpus=0-1,mem=1024 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
 -uuid bb508b28-d57b-44bd-9e9c-a134cef24b60 \
 -display none \
 -no-user-config \

diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology4.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology4.xml
index 2f5bd3e83900acb67c0c27e741d8be55bdcb550f..e5a923546af10405a4c4953252804aef765909d2 100644 (file)
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology4.xml
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4.xml
@@ -8,7 +8,7 @@
   </memoryBacking>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-5.0'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 0daa1b3f6dc18b7333f0d1f380c10ce3082b066a..6f1f816cba19cfe173075a29c6f5f912cc0c0d6b 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -3104,6 +3104,10 @@ mymain(void)
     DO_TEST_CAPS_LATEST("fd-memory-numa-topology");
     DO_TEST_CAPS_LATEST("fd-memory-numa-topology2");
     DO_TEST_CAPS_LATEST("fd-memory-numa-topology3");
+    /* qemu-10.2 is the last one supporting pc-i440fx-5.0 machine which uses the
+     * old NUMA topology setup and thus the only way to test the old style of
+     * formatting --mem-prealloc */
+    DO_TEST_CAPS_VER("fd-memory-numa-topology4-old-machine", "10.2.0");
     DO_TEST_CAPS_LATEST("fd-memory-numa-topology4");
 
     DO_TEST_CAPS_LATEST("fd-memory-no-numa-topology");