This test shows a bug we have: even though the XML says:
<allocation mode='immediate'/>
there is no -mem-prealloc nor .prealloc=yes anywhere on the cmd
line. This will be fixed in the next commit.
Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
...d-memory-numa-topology4.x86_64-latest.args | 33 +++++++++++++++++
.../fd-memory-numa-topology4.xml | 37 +++++++++++++++++++
tests/qemuxml2argvtest.c | 1 +
...fd-memory-numa-topology4.x86_64-latest.xml | 1 +
tests/qemuxml2xmltest.c | 1 +
5 files changed, 73 insertions(+)
create mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology4.xml
create mode 120000 tests/qemuxml2xmloutdata/fd-memory-numa-topology4.x86_64-latest.xml
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args
new file mode 100644
index 0000000000..203754373d
--- /dev/null
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-pc \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-pc/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-pc/.cache \
+XDG_CONFIG_HOME=/tmp/lib/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":"/tmp/lib/domain--1-pc/master-key.aes"}' \
+-machine pc-i440fx-5.0,accel=kvm,usb=off,dump-guest-core=off \
+-cpu qemu64 \
+-m 1024 \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-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 \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev id=audio1,driver=none \
+-device 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/qemuxml2argvdata/fd-memory-numa-topology4.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology4.xml
new file mode 100644
index 0000000000..2f5bd3e839
--- /dev/null
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology4.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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 74af93b08f..46e176b0ec 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3383,6 +3383,7 @@ mymain(void)
QEMU_CAPS_KVM);
DO_TEST("fd-memory-numa-topology3", QEMU_CAPS_OBJECT_MEMORY_FILE,
QEMU_CAPS_KVM);
+ DO_TEST_CAPS_LATEST("fd-memory-numa-topology4");
DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
QEMU_CAPS_KVM);
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology4.x86_64-latest.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology4.x86_64-latest.xml
new file mode 120000
index 0000000000..68c72e72ed
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fd-memory-numa-topology4.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/fd-memory-numa-topology4.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 6d3526f91f..8fa73dc9ac 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1253,6 +1253,7 @@ mymain(void)
QEMU_CAPS_KVM);
DO_TEST("fd-memory-numa-topology3", QEMU_CAPS_OBJECT_MEMORY_FILE,
QEMU_CAPS_KVM);
+ DO_TEST_CAPS_LATEST("fd-memory-numa-topology4");
DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
QEMU_CAPS_KVM);
--
2.32.0
