diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args similarity index 76% rename from tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args rename to tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args index d0703d283a..57a2b893f1 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args @@ -10,11 +10,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"preferred"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -23,12 +25,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.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"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ -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/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args similarity index 71% rename from tests/qemuxml2argvdata/numatune-auto-prefer.args rename to tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args index 5f8db1b479..d67d0dbe15 100644 --- a/tests/qemuxml2argvdata/numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args @@ -10,12 +10,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -name guest=QEMUGuest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=65536k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ --numa node,nodeid=0,cpus=0,mem=64 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":67108864,"host-nodes":[0,1,2,3],"policy":"preferred"}' \ +-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ -no-user-config \ @@ -24,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.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 '{"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/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/numatune-distances.args rename to tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args index f349b5639c..8eb4883ed1 100644 --- a/tests/qemuxml2argvdata/numatune-distances.args +++ b/tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args @@ -10,17 +10,24 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -name guest=QEMUGuest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=on \ -accel tcg \ +-cpu qemu64 \ -m size=12582912k \ -overcommit mem-lock=off \ -smp 12,sockets=12,cores=1,threads=1 \ --numa node,nodeid=0,cpus=0,cpus=11,mem=2048 \ --numa node,nodeid=1,cpus=1,cpus=10,mem=2048 \ --numa node,nodeid=2,cpus=2,cpus=9,mem=2048 \ --numa node,nodeid=3,cpus=3,cpus=8,mem=2048 \ --numa node,nodeid=4,cpus=4,cpus=7,mem=2048 \ --numa node,nodeid=5,cpus=5-6,mem=2048 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2147483648}' \ +-numa node,nodeid=0,cpus=0,cpus=11,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":2147483648}' \ +-numa node,nodeid=1,cpus=1,cpus=10,memdev=ram-node1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":2147483648}' \ +-numa node,nodeid=2,cpus=2,cpus=9,memdev=ram-node2 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node3","size":2147483648}' \ +-numa node,nodeid=3,cpus=3,cpus=8,memdev=ram-node3 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node4","size":2147483648}' \ +-numa node,nodeid=4,cpus=4,cpus=7,memdev=ram-node4 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node5","size":2147483648}' \ +-numa node,nodeid=5,cpus=5-6,memdev=ram-node5 \ -numa dist,src=0,dst=0,val=10 \ -numa dist,src=0,dst=1,val=21 \ -numa dist,src=0,dst=2,val=31 \ @@ -66,7 +73,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --usb \ +-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/qemuxml2argvdata/numatune-memnode-invalid-mode.err b/tests/qemuxml2argvdata/numatune-memnode-invalid-mode.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err rename to tests/qemuxml2argvdata/numatune-memnode-invalid-mode.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args similarity index 84% rename from tests/qemuxml2argvdata/numatune-memnode-no-memory.args rename to tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args index efc9bb9476..a500dda611 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -name guest=QEMUGuest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ -accel tcg \ +-cpu qemu64 \ -m size=65536k \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ @@ -27,9 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.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 '{"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/qemuxml2argvdata/numatune-memnode-nocpu.err b/tests/qemuxml2argvdata/numatune-memnode-nocpu.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-nocpu.err rename to tests/qemuxml2argvdata/numatune-memnode-nocpu.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args deleted file mode 100644 index 163aa530da..0000000000 --- a/tests/qemuxml2argvdata/numatune-memnode.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=24683520k \ --overcommit mem-lock=off \ --smp 32,sockets=32,cores=1,threads=1 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520,"host-nodes":[3],"policy":"preferred"}' \ --numa node,nodeid=0,cpus=0,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":676331520,"host-nodes":[0,1,2,3],"policy":"bind"}' \ --numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621440,"host-nodes":[0,2],"policy":"bind"}' \ --numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \ --uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ --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 '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-memnodes-problematic.err b/tests/qemuxml2argvdata/numatune-memnodes-problematic.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnodes-problematic.err rename to tests/qemuxml2argvdata/numatune-memnodes-problematic.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.err b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.err rename to tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args deleted file mode 100644 index d0703d283a..0000000000 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off \ --accel tcg \ --m size=219136k \ --overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/numatune-memory.xml b/tests/qemuxml2argvdata/numatune-memory.xml deleted file mode 100644 index ed86d5cf56..0000000000 --- a/tests/qemuxml2argvdata/numatune-memory.xml +++ /dev/null @@ -1,31 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 2 - - - - - hvm - - - - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - -
- - - - - diff --git a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.err b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.err rename to tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a6d569e0c6..04c7814dce 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1813,30 +1813,29 @@ mymain(void) DO_TEST_CAPS_LATEST("vcpu-placement-static"); DO_TEST_CAPS_LATEST("cputune-cpuset-big-id"); - DO_TEST_NOCAPS("numatune-memory"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memory-invalid-nodeset"); - DO_TEST_NOCAPS("numatune-memnode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memory-invalid-nodeset"); DO_TEST_CAPS_VER("numatune-memnode", "5.2.0"); DO_TEST_CAPS_LATEST("numatune-memnode"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-invalid-mode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-invalid-mode"); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-restrictive-mode-err-mixed"); DO_TEST_CAPS_LATEST("numatune-system-memory"); - DO_TEST_NOCAPS("numatune-memnode-no-memory"); + DO_TEST_CAPS_LATEST("numatune-memnode-no-memory"); - DO_TEST_NOCAPS("numatune-distances"); + DO_TEST_CAPS_LATEST("numatune-distances"); DO_TEST_CAPS_LATEST("numatune-no-vcpu"); DO_TEST_CAPS_LATEST("numatune-hmat"); DO_TEST_CAPS_LATEST("numatune-hmat-none"); - DO_TEST_NOCAPS("numatune-auto-nodeset-invalid"); - DO_TEST_NOCAPS("numatune-auto-prefer"); - DO_TEST_FAILURE_NOCAPS("numatune-static-nodeset-exceed-hostnode"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-nocpu"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnodes-problematic"); + DO_TEST_CAPS_LATEST("numatune-auto-nodeset-invalid"); + DO_TEST_CAPS_LATEST("numatune-auto-prefer"); + DO_TEST_CAPS_LATEST_FAILURE("numatune-static-nodeset-exceed-hostnode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-nocpu"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnodes-problematic"); DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-strict"); DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-restrictive"); + DO_TEST_NOCAPS("numad"); DO_TEST_NOCAPS("numad-auto-vcpu-static-numatune"); DO_TEST_PARSE_ERROR_NOCAPS("numad-auto-vcpu-static-numatune-no-nodeset");