Currently, we have maybe a dozen tests for hugepages related
stuff in qemuxml2argvtest. In all cases DO_TEST() is used, which
means we have to enumerate all capabilities needed (though, it's
usually just QEMU_CAPS_OBJECT_MEMORY_RAM and
QEMU_CAPS_OBJECT_MEMORY_FILE, exceptionally
QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD too).
Nevertheless, these caps made sense back in QEMU 2.X era when
these objects were being introduced. But now, almost 8 years
after the fact we can safely assume every QEMU knows these caps.
Therefore, switch to DO_TEST_CAPS_LATEST().
The qemuxml2xmltest will undergo similar treatment in next
commit.
Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
...> hugepages-default-2M.x86_64-latest.args} | 11 ++--
.../qemuxml2argvdata/hugepages-default-2M.xml | 4 +-
...es-default-system-size.x86_64-latest.args} | 13 ++--
.../hugepages-default-system-size.xml | 4 +-
...s => hugepages-default.x86_64-latest.args} | 15 ++---
tests/qemuxml2argvdata/hugepages-default.xml | 4 +-
.../qemuxml2argvdata/hugepages-memaccess.args | 44 -------------
.../hugepages-memaccess.x86_64-latest.args | 46 ++++++++++++++
.../qemuxml2argvdata/hugepages-memaccess.xml | 4 +-
.../hugepages-memaccess2.args | 44 -------------
.../hugepages-memaccess2.x86_64-latest.args | 46 ++++++++++++++
.../qemuxml2argvdata/hugepages-memaccess2.xml | 4 +-
...epages-nodeset-nonexist.x86_64-latest.err} | 0
.../hugepages-nodeset-nonexist.xml | 4 +-
...s => hugepages-nodeset.x86_64-latest.args} | 15 +++--
tests/qemuxml2argvdata/hugepages-nodeset.xml | 4 +-
...epages-numa-default-2M.x86_64-latest.args} | 14 +++--
.../hugepages-numa-default-2M.xml | 4 +-
...ages-numa-default-dimm.x86_64-latest.args} | 15 ++---
...hugepages-numa-default.x86_64-latest.args} | 11 ++--
...s-numa-nodeset-nonexist.x86_64-latest.err} | 0
.../hugepages-numa-nodeset-nonexist.xml | 4 +-
...ages-numa-nodeset-part.x86_64-latest.args} | 12 ++--
.../hugepages-numa-nodeset-part.xml | 4 +-
.../hugepages-numa-nodeset.x86_64-latest.args | 40 ++++++++++++
.../hugepages-numa-nodeset.xml | 4 +-
tests/qemuxml2argvdata/hugepages-shared.args | 42 -------------
.../hugepages-shared.x86_64-latest.args | 44 +++++++++++++
tests/qemuxml2argvdata/hugepages-shared.xml | 4 +-
.../qemuxml2argvdata/pages-dimm-discard.args | 35 -----------
.../pages-dimm-discard.x86_64-latest.args | 38 ++++++++++++
.../pages-discard-hugepages.args | 34 ----------
...pages-discard-hugepages.x86_64-latest.args | 36 +++++++++++
.../pages-discard-hugepages.xml | 4 +-
tests/qemuxml2argvdata/pages-discard.args | 34 ----------
....args => pages-discard.x86_64-latest.args} | 16 ++---
tests/qemuxml2argvdata/pages-discard.xml | 4 +-
tests/qemuxml2argvtest.c | 62 +++++--------------
.../qemuxml2xmloutdata/hugepages-default.xml | 4 +-
.../qemuxml2xmloutdata/hugepages-nodeset.xml | 4 +-
.../hugepages-numa-default-2M.xml | 4 +-
.../hugepages-numa-nodeset-part.xml | 4 +-
.../hugepages-numa-nodeset.xml | 4 +-
tests/qemuxml2xmloutdata/hugepages-shared.xml | 4 +-
44 files changed, 375 insertions(+), 372 deletions(-)
rename tests/qemuxml2argvdata/{hugepages-default-system-size.args => hugepages-default-2M.x86_64-latest.args} (55%)
rename tests/qemuxml2argvdata/{hugepages-default-2M.args => hugepages-default-system-size.x86_64-latest.args} (61%)
rename tests/qemuxml2argvdata/{hugepages-default.args => hugepages-default.x86_64-latest.args} (51%)
delete mode 100644 tests/qemuxml2argvdata/hugepages-memaccess.args
create mode 100644 tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/hugepages-memaccess2.args
create mode 100644 tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args
rename tests/qemuxml2argvdata/{hugepages-nodeset-nonexist.err => hugepages-nodeset-nonexist.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{hugepages-numa-default-2M.args => hugepages-nodeset.x86_64-latest.args} (55%)
rename tests/qemuxml2argvdata/{hugepages-nodeset.args => hugepages-numa-default-2M.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{hugepages-numa-default-dimm.args => hugepages-numa-default-dimm.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{hugepages-numa-default.args => hugepages-numa-default.x86_64-latest.args} (60%)
rename tests/qemuxml2argvdata/{hugepages-numa-nodeset-nonexist.err => hugepages-numa-nodeset-nonexist.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{hugepages-numa-nodeset-part.args => hugepages-numa-nodeset-part.x86_64-latest.args} (60%)
create mode 100644 tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/hugepages-shared.args
create mode 100644 tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/pages-dimm-discard.args
create mode 100644 tests/qemuxml2argvdata/pages-dimm-discard.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/pages-discard-hugepages.args
create mode 100644 tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/pages-discard.args
rename tests/qemuxml2argvdata/{hugepages-numa-nodeset.args => pages-discard.x86_64-latest.args} (59%)
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args b/tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args
similarity index 55%
rename from tests/qemuxml2argvdata/hugepages-default-system-size.args
rename to tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args
index ba2fcb6d67..50f1228093 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args
@@ -6,13 +6,15 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
+-cpu qemu64 \
-m 1024 \
+-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","x-use-canonical-path-for-ramblock-id":false,"prealloc":true,"size":1073741824}' \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
@@ -25,6 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-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"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.xml b/tests/qemuxml2argvdata/hugepages-default-2M.xml
index fd3666c149..296933c6f2 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args b/tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-latest.args
similarity index 61%
rename from tests/qemuxml2argvdata/hugepages-default-2M.args
rename to tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-latest.args
index 55aa0e8f52..a65bff0546 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-latest.args
@@ -6,15 +6,15 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
+-cpu qemu64 \
-m 1024 \
--mem-prealloc \
--mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
@@ -27,6 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-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"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.xml b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
index ac34623ed9..f9c99da400 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2argvdata/hugepages-default.args b/tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args
similarity index 51%
rename from tests/qemuxml2argvdata/hugepages-default.args
rename to tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args
index 9bfb277454..43e1b33e5b 100644
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args
@@ -6,15 +6,15 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
+-cpu qemu64 \
-m 214 \
--mem-prealloc \
--mem-path /dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1 \
+-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","x-use-canonical-path-for-ramblock-id":false,"prealloc":true,"size":224395264}' \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -27,7 +27,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-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=0x2 \
+-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/hugepages-default.xml b/tests/qemuxml2argvdata/hugepages-default.xml
index 18508b381f..de1006b7d7 100644
--- a/tests/qemuxml2argvdata/hugepages-default.xml
+++ b/tests/qemuxml2argvdata/hugepages-default.xml
@@ -8,7 +8,7 @@
</memoryBacking>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args
deleted file mode 100644
index 2d9431dab1..0000000000
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ /dev/null
@@ -1,44 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=4194304k,slots=16,maxmem=8388608k \
--overcommit mem-lock=off \
--smp 4,sockets=4,cores=1,threads=1 \
--object memory-backend-file,id=ram-node0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,size=1073741824,host-nodes=0-3,policy=bind \
--numa node,nodeid=0,cpus=0,memdev=ram-node0 \
--object memory-backend-file,id=ram-node1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=1073741824,host-nodes=0-3,policy=bind \
--numa node,nodeid=1,cpus=1,memdev=ram-node1 \
--object memory-backend-file,id=ram-node2,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,size=1073741824,host-nodes=0-3,policy=bind \
--numa node,nodeid=2,cpus=2,memdev=ram-node2 \
--object memory-backend-file,id=ram-node3,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,size=1073741824,host-nodes=3,policy=bind \
--numa node,nodeid=3,cpus=3,memdev=ram-node3 \
--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 \
--object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \
--device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
--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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args
new file mode 100644
index 0000000000..55a8d899b7
--- /dev/null
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args
@@ -0,0 +1,46 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/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":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=4194304k,slots=16,maxmem=8388608k \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","share":false,"prealloc":true,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","share":false,"prealloc":true,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","share":false,"prealloc":true,"size":1073741824,"host-nodes":[3],"policy":"bind"}' \
+-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
+-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 \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":536870912,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-device '{"driver":"pc-dimm","node":1,"memdev":"memdimm0","id":"dimm0","slot":0,"addr":4294967296}' \
+-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":"0x3"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.xml b/tests/qemuxml2argvdata/hugepages-memaccess.xml
index e09a8af8af..9d63ac4a3d 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.xml
@@ -17,7 +17,7 @@
<memnode cellid='3' mode='strict' nodeset='3'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -33,7 +33,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args
deleted file mode 100644
index 0264fc7da9..0000000000
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ /dev/null
@@ -1,44 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=4194304k,slots=16,maxmem=8388608k \
--overcommit mem-lock=off \
--smp 4,sockets=4,cores=1,threads=1 \
--object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=off,size=1073741824,host-nodes=0-3,policy=bind \
--numa node,nodeid=0,cpus=0,memdev=ram-node0 \
--object memory-backend-file,id=ram-node1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=1073741824,host-nodes=0-3,policy=bind \
--numa node,nodeid=1,cpus=1,memdev=ram-node1 \
--object memory-backend-file,id=ram-node2,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2,share=off,size=1073741824,host-nodes=0-3,policy=bind \
--numa node,nodeid=2,cpus=2,memdev=ram-node2 \
--object memory-backend-file,id=ram-node3,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=off,size=1073741824,host-nodes=3,policy=bind \
--numa node,nodeid=3,cpus=3,memdev=ram-node3 \
--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 \
--object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \
--device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
--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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args
new file mode 100644
index 0000000000..187c0ab214
--- /dev/null
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args
@@ -0,0 +1,46 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/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":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=4194304k,slots=16,maxmem=8388608k \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":false,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2","share":false,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3","share":false,"size":1073741824,"host-nodes":[3],"policy":"bind"}' \
+-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
+-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 \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":536870912,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-device '{"driver":"pc-dimm","node":1,"memdev":"memdimm0","id":"dimm0","slot":0,"addr":4294967296}' \
+-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":"0x3"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.xml b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
index 714f70b31d..119662b773 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
@@ -17,7 +17,7 @@
<memnode cellid='3' mode='strict' nodeset='3'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -33,7 +33,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.err b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hugepages-nodeset-nonexist.err
rename to tests/qemuxml2argvdata/hugepages-nodeset-nonexist.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
index e082725844..1993a13aed 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
+++ b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args b/tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args
similarity index 55%
rename from tests/qemuxml2argvdata/hugepages-numa-default-2M.args
rename to tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args
index 75c0e8e7ca..50f1228093 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args
@@ -6,19 +6,17 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
+-cpu qemu64 \
-m 1024 \
+-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","x-use-canonical-path-for-ramblock-id":false,"prealloc":true,"size":1073741824}' \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
--mem-prealloc \
--mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
--numa node,nodeid=0,cpus=0,mem=256 \
--numa node,nodeid=1,cpus=1,mem=768 \
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-display none \
-no-user-config \
@@ -29,6 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-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"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.xml b/tests/qemuxml2argvdata/hugepages-nodeset.xml
index 6aae88741c..5549cb82ff 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset.xml
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest.args
similarity index 51%
rename from tests/qemuxml2argvdata/hugepages-nodeset.args
rename to tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest.args
index 55aa0e8f52..55e21da98b 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest.args
@@ -6,17 +6,20 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
+-cpu qemu64 \
-m 1024 \
--mem-prealloc \
--mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","prealloc":true,"size":268435456}' \
+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","prealloc":true,"size":805306368}' \
+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-display none \
-no-user-config \
@@ -27,6 +30,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-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"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
index 87811aaf4b..130af8dd81 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.x86_64-latest.args
similarity index 51%
rename from tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
rename to tests/qemuxml2argvdata/hugepages-numa-default-dimm.x86_64-latest.args
index 0cde2b06d3..015464bded 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.x86_64-latest.args
@@ -9,15 +9,15 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=fedora,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fedora/master-key.aes \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
+-cpu qemu64 \
-m size=1048576k,slots=16,maxmem=1099511627776k \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
--mem-prealloc \
--mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \
--numa node,nodeid=0,cpus=0-1,mem=1024 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-fedora","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
-display none \
-no-user-config \
@@ -28,8 +28,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
--object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,host-nodes=1-3,policy=bind \
--device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-fedora","prealloc":true,"size":1073741824,"host-nodes":[1,2,3],"policy":"bind"}' \
+-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","slot":0}' \
-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.args
similarity index 60%
rename from tests/qemuxml2argvdata/hugepages-numa-default.args
rename to tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.args
index ea1766ab2f..450fcb15fe 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.args
@@ -9,15 +9,15 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=fedora,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fedora/master-key.aes \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
+-cpu qemu64 \
-m 1024 \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
--mem-prealloc \
--mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \
--numa node,nodeid=0,cpus=0-1,mem=1024 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-fedora","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
-display none \
-no-user-config \
@@ -28,6 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
-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"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.err b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.err
rename to tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
index eed8922071..4b26e07ad5 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
@@ -11,7 +11,7 @@
</memoryBacking>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -27,7 +27,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.args
similarity index 60%
rename from tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
rename to tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.args
index 5af3aa370e..d1300996c3 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.args
@@ -6,18 +6,19 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
+-cpu qemu64 \
-m 1024 \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
--object memory-backend-ram,id=ram-node0,size=268435456 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":268435456}' \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
--object memory-backend-file,id=ram-node1,mem-path=/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,prealloc=on,size=805306368 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu","prealloc":true,"size":805306368}' \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-display none \
@@ -29,6 +30,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-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"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
index 6c0eb24c98..5fbf6b5e85 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args
new file mode 100644
index 0000000000..62a5eca51f
--- /dev/null
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args
@@ -0,0 +1,40 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/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":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu qemu64 \
+-m 4096 \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
+-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 \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
index 00d390dc20..31ebc1553a 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
@@ -11,7 +11,7 @@
</memoryBacking>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -27,7 +27,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args
deleted file mode 100644
index 08ce2f49cd..0000000000
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ /dev/null
@@ -1,42 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m 4096 \
--overcommit mem-lock=off \
--smp 4,sockets=4,cores=1,threads=1 \
--object memory-backend-file,id=ram-node0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=1073741824,host-nodes=0-3,policy=bind \
--numa node,nodeid=0,cpus=0,memdev=ram-node0 \
--object memory-backend-file,id=ram-node1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=1073741824,host-nodes=0-3,policy=bind \
--numa node,nodeid=1,cpus=1,memdev=ram-node1 \
--object memory-backend-file,id=ram-node2,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,size=1073741824,host-nodes=0-3,policy=bind \
--numa node,nodeid=2,cpus=2,memdev=ram-node2 \
--object memory-backend-file,id=ram-node3,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=1073741824,host-nodes=3,policy=bind \
--numa node,nodeid=3,cpus=3,memdev=ram-node3 \
--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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args
new file mode 100644
index 0000000000..f4fea870fc
--- /dev/null
+++ b/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args
@@ -0,0 +1,44 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/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":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu qemu64 \
+-m 4096 \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","share":false,"prealloc":true,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \
+-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":1073741824,"host-nodes":[3],"policy":"bind"}' \
+-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
+-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 \
+-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/hugepages-shared.xml b/tests/qemuxml2argvdata/hugepages-shared.xml
index 462ca8a5ae..33abe71d9e 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.xml
+++ b/tests/qemuxml2argvdata/hugepages-shared.xml
@@ -15,7 +15,7 @@
<memnode cellid='3' mode='strict' nodeset='3'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -31,7 +31,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args
deleted file mode 100644
index 7f2cfa4234..0000000000
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fedora/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=1048576k,slots=16,maxmem=1099511627776k \
--overcommit mem-lock=off \
--smp 2,sockets=2,cores=1,threads=1 \
--numa node,nodeid=0,cpus=0-1,mem=1024 \
--uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
--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 \
--object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=on,size=1073741824,host-nodes=1-3,policy=bind \
--device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
--object memory-backend-file,id=memdimm1,mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=on,share=off,size=536870912 \
--device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.x86_64-latest.args b/tests/qemuxml2argvdata/pages-dimm-discard.x86_64-latest.args
new file mode 100644
index 0000000000..6324443e93
--- /dev/null
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-fedora \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=fedora,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k,slots=16,maxmem=1099511627776k \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \
+-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
+-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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-fedora","prealloc":true,"size":1073741824,"host-nodes":[1,2,3],"policy":"bind"}' \
+-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","slot":0}' \
+-object '{"qom-type":"memory-backend-file","id":"memdimm1","mem-path":"/var/lib/libvirt/qemu/ram/-1-fedora/dimm1","discard-data":true,"share":false,"size":536870912}' \
+-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm1","id":"dimm1","slot":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args b/tests/qemuxml2argvdata/pages-discard-hugepages.args
deleted file mode 100644
index 75c0e8e7ca..0000000000
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-/usr/bin/qemu-system-i386 \
--name guest=SomeDummyHugepagesGuest,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m 1024 \
--overcommit mem-lock=off \
--smp 2,sockets=2,cores=1,threads=1 \
--mem-prealloc \
--mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
--numa node,nodeid=0,cpus=0,mem=256 \
--numa node,nodeid=1,cpus=1,mem=768 \
--uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
--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"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args b/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args
new file mode 100644
index 0000000000..880e0de192
--- /dev/null
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args
@@ -0,0 +1,36 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=SomeDummyHugepagesGuest,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu qemu64 \
+-m 1024 \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","prealloc":true,"size":268435456}' \
+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","discard-data":true,"prealloc":true,"size":805306368}' \
+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
+-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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.xml b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
index 953d0c5d20..70c5eca0d0 100644
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.xml
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
@@ -8,7 +8,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -22,7 +22,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argvdata/pages-discard.args
deleted file mode 100644
index b7d2731755..0000000000
--- a/tests/qemuxml2argvdata/pages-discard.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m 4096 \
--overcommit mem-lock=off \
--smp 4,sockets=4,cores=1,threads=1 \
--numa node,nodeid=0,cpus=0,mem=1024 \
--numa node,nodeid=1,cpus=1,mem=1024 \
--numa node,nodeid=2,cpus=2,mem=1024 \
--numa node,nodeid=3,cpus=3,mem=1024 \
--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 \
--audiodev '{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args b/tests/qemuxml2argvdata/pages-discard.x86_64-latest.args
similarity index 59%
rename from tests/qemuxml2argvdata/hugepages-numa-nodeset.args
rename to tests/qemuxml2argvdata/pages-discard.x86_64-latest.args
index 89018d92a2..4f43c6f504 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/pages-discard.x86_64-latest.args
@@ -6,22 +6,23 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
+-cpu qemu64 \
-m 4096 \
-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
--object memory-backend-file,id=ram-node0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=1073741824 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
--object memory-backend-file,id=ram-node1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=1073741824 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":1073741824}' \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
--object memory-backend-file,id=ram-node2,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=1073741824 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":1073741824}' \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
--object memory-backend-file,id=ram-node3,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=1073741824 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node3","size":1073741824}' \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
@@ -33,6 +34,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-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"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-discard.xml b/tests/qemuxml2argvdata/pages-discard.xml
index 58a59a370c..99b842dabf 100644
--- a/tests/qemuxml2argvdata/pages-discard.xml
+++ b/tests/qemuxml2argvdata/pages-discard.xml
@@ -8,7 +8,7 @@
</memoryBacking>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 7ede68d555..227493fe32 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1214,54 +1214,26 @@ mymain(void)
DO_TEST_NOCAPS("pmu-feature");
DO_TEST_NOCAPS("pmu-feature-off");
- DO_TEST("pages-discard",
- QEMU_CAPS_OBJECT_MEMORY_FILE,
- QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
- DO_TEST("pages-discard-hugepages",
- QEMU_CAPS_OBJECT_MEMORY_RAM,
- QEMU_CAPS_OBJECT_MEMORY_FILE,
- QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
- DO_TEST("pages-dimm-discard",
- QEMU_CAPS_DEVICE_PC_DIMM,
- QEMU_CAPS_OBJECT_MEMORY_FILE,
- QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
- DO_TEST("hugepages-default", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-default-system-size", QEMU_CAPS_OBJECT_MEMORY_FILE);
+ DO_TEST_CAPS_LATEST("pages-discard");
+ DO_TEST_CAPS_LATEST("pages-discard-hugepages");
+ DO_TEST_CAPS_LATEST("pages-dimm-discard");
+ DO_TEST_CAPS_LATEST("hugepages-default");
+ DO_TEST_CAPS_LATEST("hugepages-default-2M");
+ DO_TEST_CAPS_LATEST("hugepages-default-system-size");
DO_TEST_CAPS_LATEST_FAILURE("hugepages-default-5M");
DO_TEST_PARSE_ERROR_NOCAPS("hugepages-default-1G-nodeset-2M");
- DO_TEST("hugepages-nodeset", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST_PARSE_ERROR("hugepages-nodeset-nonexist",
- QEMU_CAPS_DEVICE_PC_DIMM,
- QEMU_CAPS_OBJECT_MEMORY_FILE,
- QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
- DO_TEST("hugepages-numa-default",
- QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-numa-default-2M",
- QEMU_CAPS_OBJECT_MEMORY_RAM,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-numa-default-dimm",
- QEMU_CAPS_DEVICE_PC_DIMM,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-numa-nodeset",
- QEMU_CAPS_OBJECT_MEMORY_RAM,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-numa-nodeset-part",
- QEMU_CAPS_OBJECT_MEMORY_RAM,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST_PARSE_ERROR("hugepages-numa-nodeset-nonexist",
- QEMU_CAPS_OBJECT_MEMORY_RAM,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-shared",
- QEMU_CAPS_OBJECT_MEMORY_RAM,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
+ DO_TEST_CAPS_LATEST("hugepages-nodeset");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-nodeset-nonexist");
+ DO_TEST_CAPS_LATEST("hugepages-numa-default");
+ DO_TEST_CAPS_LATEST("hugepages-numa-default-2M");
+ DO_TEST_CAPS_LATEST("hugepages-numa-default-dimm");
+ DO_TEST_CAPS_LATEST("hugepages-numa-nodeset");
+ DO_TEST_CAPS_LATEST("hugepages-numa-nodeset-part");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-numa-nodeset-nonexist");
+ DO_TEST_CAPS_LATEST("hugepages-shared");
DO_TEST_PARSE_ERROR_NOCAPS("hugepages-memaccess-invalid");
- DO_TEST("hugepages-memaccess", QEMU_CAPS_OBJECT_MEMORY_FILE,
- QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM,
- QEMU_CAPS_NUMA);
- DO_TEST("hugepages-memaccess2", QEMU_CAPS_OBJECT_MEMORY_FILE,
- QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM,
- QEMU_CAPS_NUMA);
+ DO_TEST_CAPS_LATEST("hugepages-memaccess");
+ DO_TEST_CAPS_LATEST("hugepages-memaccess2");
DO_TEST_PARSE_ERROR("hugepages-memaccess3",
QEMU_CAPS_OBJECT_MEMORY_RAM,
QEMU_CAPS_OBJECT_MEMORY_FILE);
diff --git a/tests/qemuxml2xmloutdata/hugepages-default.xml b/tests/qemuxml2xmloutdata/hugepages-default.xml
index e14eb577a8..977993fa52 100644
--- a/tests/qemuxml2xmloutdata/hugepages-default.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-default.xml
@@ -8,7 +8,7 @@
</memoryBacking>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
index fd3666c149..296933c6f2 100644
--- a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
index b12b9735c8..bf9f352d98 100644
--- a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
index 3ca5a1fcaf..177faaa19f 100644
--- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
index 2122f76aee..e63407d1e2 100644
--- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
@@ -11,7 +11,7 @@
</memoryBacking>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -27,7 +27,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <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>
diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.xml b/tests/qemuxml2xmloutdata/hugepages-shared.xml
index 4dcabe06f8..4310442936 100644
--- a/tests/qemuxml2xmloutdata/hugepages-shared.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-shared.xml
@@ -15,7 +15,7 @@
<memnode cellid='3' mode='strict' nodeset='3'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -31,7 +31,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
--
2.37.4
