[PATCH 16/24] qemuxml2(argv|xml)test: Modernize 'fd-memory*' test cases

Use latest real capabilities. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ...emory-no-numa-topology.x86_64-latest.args} | 16 ++++---- .../fd-memory-no-numa-topology.xml | 5 ++- ...d-memory-numa-topology.x86_64-latest.args} | 15 ++++---- .../fd-memory-numa-topology.xml | 5 ++- ...-memory-numa-topology2.x86_64-latest.args} | 17 +++++---- .../fd-memory-numa-topology2.xml | 5 ++- .../fd-memory-numa-topology3.args | 37 ------------------ ...d-memory-numa-topology3.x86_64-latest.args | 38 +++++++++++++++++++ .../fd-memory-numa-topology3.xml | 5 ++- tests/qemuxml2argvtest.c | 8 ++-- ...memory-no-numa-topology.x86_64-latest.xml} | 0 ...fd-memory-numa-topology.x86_64-latest.xml} | 0 ...d-memory-numa-topology2.x86_64-latest.xml} | 0 ...d-memory-numa-topology3.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 8 ++-- 15 files changed, 83 insertions(+), 76 deletions(-) rename tests/qemuxml2argvdata/{fd-memory-no-numa-topology.args => fd-memory-no-numa-topology.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{fd-memory-numa-topology.args => fd-memory-numa-topology.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{fd-memory-numa-topology2.args => fd-memory-numa-topology2.x86_64-latest.args} (51%) delete mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology3.args create mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args rename tests/qemuxml2xmloutdata/{fd-memory-no-numa-topology.xml => fd-memory-no-numa-topology.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology.xml => fd-memory-numa-topology.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology2.xml => fd-memory-numa-topology2.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology3.xml => fd-memory-numa-topology3.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args similarity index 51% rename from tests/qemuxml2argvdata/fd-memory-no-numa-topology.args rename to tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args index eaaf82c3f9..58b3c7b544 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args @@ -9,14 +9,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=instance-00000092,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ +-cpu qemu64 \ -m size=14680064k \ --mem-prealloc \ --mem-path /var/lib/libvirt/qemu/ram/-1-instance-00000092/ram \ +-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/pc.ram","share":true,"x-use-canonical-path-for-ramblock-id":false,"prealloc":true,"size":15032385536}' \ -overcommit mem-lock=off \ --smp 8,sockets=8,cores=1,threads=1 \ +-smp 8,sockets=8,dies=1,cores=1,threads=1 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -no-user-config \ @@ -25,9 +25,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ --usb \ +-device '{"driver":"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=0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml index 2a986e6d83..2090bb8288 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml @@ -13,7 +13,8 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> - <cpu> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> <topology sockets='8' dies='1' cores='1' threads='1'/> </cpu> <clock offset='utc'/> @@ -22,7 +23,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='usb' index='0'> + <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'/> diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args similarity index 55% rename from tests/qemuxml2argvdata/fd-memory-numa-topology.args rename to tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args index b60f1dbf7d..21f9a16540 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args @@ -9,13 +9,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=instance-00000092,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel kvm \ +-cpu qemu64 \ -m size=14680064k \ -overcommit mem-lock=off \ --smp 8,sockets=1,cores=8,threads=1 \ --object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=on,prealloc=on,size=15032385536 \ +-smp 8,sockets=1,dies=1,cores=8,threads=1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"prealloc":true,"size":15032385536}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ @@ -25,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ --usb \ +-device '{"driver":"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=0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml index 22719b9545..2f94690656 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml @@ -13,7 +13,8 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> - <cpu> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> <topology sockets='1' dies='1' cores='8' threads='1'/> <numa> <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/> @@ -25,7 +26,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='usb' index='0'> + <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'/> diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args similarity index 51% rename from tests/qemuxml2argvdata/fd-memory-numa-topology2.args rename to tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args index 7313dabf78..3bf16f9caf 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args @@ -9,15 +9,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=instance-00000092,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel kvm \ +-cpu qemu64 \ -m size=29360128k \ -overcommit mem-lock=off \ --smp 20,sockets=1,cores=20,threads=1 \ --object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=off,prealloc=on,size=15032385536 \ +-smp 20,sockets=1,dies=1,cores=20,threads=1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":false,"prealloc":true,"size":15032385536}' \ -numa node,nodeid=0,cpus=0-7,cpus=16-19,memdev=ram-node0 \ --object memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=on,prealloc=on,size=15032385536 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"prealloc":true,"size":15032385536}' \ -numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ @@ -27,9 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ --no-acpi \ -boot strict=on \ --usb \ +-device '{"driver":"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=0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml index 1572010ad8..3a4e9b478e 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml @@ -13,7 +13,8 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> - <cpu> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> <topology sockets='1' dies='1' cores='20' threads='1'/> <numa> <cell id='0' cpus='0-7,16-19' memory='14680064' unit='KiB'/> @@ -26,7 +27,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='usb' index='0'> + <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'/> diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args deleted file mode 100644 index f5d2aaf91b..0000000000 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=instance-00000092,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ --accel kvm \ --m size=44040192k \ --overcommit mem-lock=off \ --smp 32,sockets=1,cores=32,threads=1 \ --object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=on,prealloc=on,size=15032385536 \ --numa node,nodeid=0,cpus=0-1,cpus=6-31,memdev=ram-node0 \ --object memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=on,prealloc=on,size=15032385536 \ --numa node,nodeid=1,cpus=2-3,memdev=ram-node1 \ --object memory-backend-file,id=ram-node2,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node2,share=off,prealloc=on,size=15032385536 \ --numa node,nodeid=2,cpus=4-5,memdev=ram-node2 \ --uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ --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 \ --usb \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args new file mode 100644 index 0000000000..3153e22d56 --- /dev/null +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=instance-00000092,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ +-accel kvm \ +-cpu qemu64 \ +-m size=44040192k \ +-overcommit mem-lock=off \ +-smp 32,sockets=1,dies=1,cores=32,threads=1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"prealloc":true,"size":15032385536}' \ +-numa node,nodeid=0,cpus=0-1,cpus=6-31,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"prealloc":true,"size":15032385536}' \ +-numa node,nodeid=1,cpus=2-3,memdev=ram-node1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node2","share":false,"prealloc":true,"size":15032385536}' \ +-numa node,nodeid=2,cpus=4-5,memdev=ram-node2 \ +-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ +-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":"0x3"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml index 36a6b5c155..0f7f74283b 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml @@ -13,7 +13,8 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> - <cpu> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> <topology sockets='1' dies='1' cores='32' threads='1'/> <numa> <cell id='0' cpus='0-1,6-31' memory='14680064' unit='KiB'/> @@ -27,7 +28,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='usb' index='0'> + <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'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f1f86645f9..5846380189 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2555,12 +2555,12 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-options-video-packed"); DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-freepage-reporting"); - DO_TEST("fd-memory-numa-topology", QEMU_CAPS_KVM); - DO_TEST("fd-memory-numa-topology2", QEMU_CAPS_KVM); - DO_TEST("fd-memory-numa-topology3", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("fd-memory-numa-topology"); + DO_TEST_CAPS_LATEST("fd-memory-numa-topology2"); + DO_TEST_CAPS_LATEST("fd-memory-numa-topology3"); DO_TEST_CAPS_LATEST("fd-memory-numa-topology4"); - DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("fd-memory-no-numa-topology"); DO_TEST_CAPS_LATEST("memfd-memory-numa"); DO_TEST_CAPS_LATEST("memfd-memory-default-hugepage"); diff --git a/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml rename to tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml rename to tests/qemuxml2xmloutdata/fd-memory-numa-topology.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml rename to tests/qemuxml2xmloutdata/fd-memory-numa-topology2.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml rename to tests/qemuxml2xmloutdata/fd-memory-numa-topology3.x86_64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 20347f33a5..f752e621ee 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1033,12 +1033,12 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-options"); - DO_TEST("fd-memory-numa-topology", QEMU_CAPS_KVM); - DO_TEST("fd-memory-numa-topology2", QEMU_CAPS_KVM); - DO_TEST("fd-memory-numa-topology3", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("fd-memory-numa-topology"); + DO_TEST_CAPS_LATEST("fd-memory-numa-topology2"); + DO_TEST_CAPS_LATEST("fd-memory-numa-topology3"); DO_TEST_CAPS_LATEST("fd-memory-numa-topology4"); - DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_KVM); + DO_TEST_CAPS_LATEST("fd-memory-no-numa-topology"); DO_TEST_CAPS_LATEST("memfd-memory-numa"); DO_TEST_CAPS_LATEST("memfd-memory-default-hugepage"); -- 2.41.0