diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
index 7f18f5e9e8..129fac5838 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
@@ -36,6 +36,7 @@ addr=0x1 \
 -device pcie-root-port,port=0xc,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
 -device pcie-root-port,port=0xd,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
 -device pcie-root-port,port=0xe,chassis=7,id=pci.7,bus=pcie.0,addr=0x1.0x6 \
+-device pcie-root-port,port=0xf,chassis=8,id=pci.8,bus=pcie.0,addr=0x1.0x7 \
 -device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.2,addr=0x0 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
 -drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
@@ -53,9 +54,10 @@ id=channel0,name=org.qemu.guest_agent.0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
 -device usb-kbd,id=input1,bus=usb.0,port=2 \
 -vnc 127.0.0.1:0 \
--device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.6,addr=0x0 \
+-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.7,addr=0x0 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \
+-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.6,addr=0x0 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml
index 54cfea634c..e908d24ac2 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml
+++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml
@@ -42,6 +42,7 @@
     <video>
       <model type='virtio'/>
     </video>
+    <memballoon model='virtio'/>
     <rng model='virtio'>
       <backend model='random'>/dev/urandom</backend>
     </rng>
diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
index cc1189031a..b4947f9b0f 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
@@ -13,9 +13,13 @@ QEMU_AUDIO_DRV=none \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-guest/master-key.aes \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
--m 1024 \
+-drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,\
+readonly=on \
+-drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,\
+unit=1 \
+-m 4096 \
 -overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -display none \
 -no-user-config \
@@ -24,7 +28,6 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
--no-acpi \
 -boot strict=on \
 -device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\
 addr=0x1 \
@@ -33,10 +36,12 @@ addr=0x1 \
 -device pcie-root-port,port=0xb,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x3 \
 -device pcie-root-port,port=0xc,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
 -device pcie-root-port,port=0xd,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x0 \
+-device pcie-root-port,port=0xe,chassis=7,id=pci.7,bus=pcie.0,addr=0x1.0x6 \
+-device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.2,addr=0x0 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
 -drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
 id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.3,addr=0x0,drive=drive-virtio-disk0,\
+-device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=drive-virtio-disk0,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,\
@@ -46,9 +51,9 @@ addr=0x0 \
 -chardev socket,id=charchannel0,fd=1729,server,nowait \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \
--object rng-random,id=objrng0,filename=/dev/random \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \
+-object rng-random,id=objrng0,filename=/dev/urandom \
+-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.6,addr=0x0 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.xml b/tests/qemuxml2argvdata/aarch64-virt-headless.xml
index ec9ce78c91..7e4fe64b43 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-headless.xml
+++ b/tests/qemuxml2argvdata/aarch64-virt-headless.xml
@@ -1,11 +1,24 @@
 <domain type='qemu'>
   <name>guest</name>
   <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <vcpu placement='static'>1</vcpu>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory>4194304</memory>
+  <currentMemory>4194304</currentMemory>
+  <vcpu>4</vcpu>
   <os>
     <type arch='aarch64' machine='virt'>hvm</type>
+    <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
+    <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram>
+    <boot dev='hd'/>
   </os>
+  <features>
+    <acpi/>
+  </features>
+  <clock offset='utc'/>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type='file' device='disk'>
@@ -13,17 +26,19 @@
       <source file='/var/lib/libvirt/images/guest.qcow2'/>
       <target dev='vda' bus='virtio'/>
     </disk>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'/>
     <interface type='user'>
       <mac address='52:54:00:09:a4:37'/>
       <model type='virtio'/>
     </interface>
-    <serial type='pty'/>
+    <console type='pty'/>
     <channel type='unix'>
+      <source mode='bind'/>
       <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
     <memballoon model='virtio'/>
     <rng model='virtio'>
-      <backend model='random'/>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml b/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml
index c4ef08b2bf..2ba16813de 100644
--- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml
+++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml
@@ -10,7 +10,7 @@
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch='ppc64le' machine='pseries'>hvm</type>
+    <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
@@ -37,6 +37,7 @@
     <video>
       <model type='vga'/>
     </video>
+    <memballoon model='virtio'/>
     <rng model='virtio'>
       <backend model='random'>/dev/urandom</backend>
     </rng>
diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
index c84443c97f..821c6976f0 100644
--- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
@@ -13,9 +13,9 @@ QEMU_AUDIO_DRV=none \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-guest/master-key.aes \
 -machine pseries,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
+-m 4096 \
 -overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -display none \
 -no-user-config \
@@ -25,7 +25,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
--device pci-ohci,id=usb,bus=pci.0,addr=0x2 \
+-device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.0,addr=0x2 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
 id=drive-virtio-disk0 \
@@ -40,7 +40,7 @@ addr=0x1 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
--object rng-random,id=objrng0,filename=/dev/random \
+-object rng-random,id=objrng0,filename=/dev/urandom \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x6 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.xml b/tests/qemuxml2argvdata/ppc64-pseries-headless.xml
index b94d47d9d4..ca91240903 100644
--- a/tests/qemuxml2argvdata/ppc64-pseries-headless.xml
+++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.xml
@@ -1,11 +1,19 @@
 <domain type='qemu'>
   <name>guest</name>
   <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <vcpu placement='static'>1</vcpu>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory>4194304</memory>
+  <currentMemory>4194304</currentMemory>
+  <vcpu>4</vcpu>
   <os>
     <type arch='ppc64' machine='pseries'>hvm</type>
+    <boot dev='hd'/>
   </os>
+  <clock offset='utc'/>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <disk type='file' device='disk'>
@@ -13,17 +21,19 @@
       <source file='/var/lib/libvirt/images/guest.qcow2'/>
       <target dev='vda' bus='virtio'/>
     </disk>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'/>
     <interface type='user'>
       <mac address='52:54:00:09:a4:37'/>
       <model type='virtio'/>
     </interface>
-    <serial type='pty'/>
+    <console type='pty'/>
     <channel type='unix'>
+      <source mode='bind'/>
       <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
     <memballoon model='virtio'/>
     <rng model='virtio'>
-      <backend model='random'/>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
index 42b1ffc568..9a595dc4ee 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
@@ -13,9 +13,9 @@ QEMU_AUDIO_DRV=none \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-guest/master-key.aes \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
+-m 4096 \
 -overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -display none \
 -no-user-config \
@@ -32,10 +32,12 @@ addr=0x1 \
 -device pcie-root-port,port=0xb,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x3 \
 -device pcie-root-port,port=0xc,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
 -device pcie-root-port,port=0xd,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x0 \
+-device pcie-root-port,port=0xe,chassis=7,id=pci.7,bus=pcie.0,addr=0x1.0x6 \
+-device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.2,addr=0x0 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
 -drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
 id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.3,addr=0x0,drive=drive-virtio-disk0,\
+-device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=drive-virtio-disk0,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,\
@@ -45,9 +47,9 @@ addr=0x0 \
 -chardev socket,id=charchannel0,fd=1729,server,nowait \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \
--object rng-random,id=objrng0,filename=/dev/random \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \
+-object rng-random,id=objrng0,filename=/dev/urandom \
+-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.6,addr=0x0 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.xml b/tests/qemuxml2argvdata/riscv64-virt-headless.xml
index 936f341da1..ff1e0903b1 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-headless.xml
+++ b/tests/qemuxml2argvdata/riscv64-virt-headless.xml
@@ -1,11 +1,19 @@
 <domain type='qemu'>
   <name>guest</name>
   <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <vcpu placement='static'>1</vcpu>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory>4194304</memory>
+  <currentMemory>4194304</currentMemory>
+  <vcpu>4</vcpu>
   <os>
     <type arch='riscv64' machine='virt'>hvm</type>
+    <boot dev='hd'/>
   </os>
+  <clock offset='utc'/>
   <devices>
     <emulator>/usr/bin/qemu-system-riscv64</emulator>
     <disk type='file' device='disk'>
@@ -13,17 +21,19 @@
       <source file='/var/lib/libvirt/images/guest.qcow2'/>
       <target dev='vda' bus='virtio'/>
     </disk>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'/>
     <interface type='user'>
       <mac address='52:54:00:09:a4:37'/>
       <model type='virtio'/>
     </interface>
-    <serial type='pty'/>
+    <console type='pty'/>
     <channel type='unix'>
+      <source mode='bind'/>
       <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
     <memballoon model='virtio'/>
     <rng model='virtio'>
-      <backend model='random'/>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
index f33a66af68..64c11cd046 100644
--- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-guest/master-key.aes \
--machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
 -m 4096 \
 -overcommit mem-lock=off \
 -smp 4,sockets=4,cores=1,threads=1 \
@@ -32,11 +32,11 @@ id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:1a:29,\
 devno=fe.0.0001 \
--chardev pty,id=charserial0 \
--device sclpconsole,chardev=charserial0,id=serial0 \
 -chardev socket,id=charchannel0,fd=1729,server,nowait \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
+-chardev pty,id=charconsole0 \
+-device sclpconsole,chardev=charconsole0,id=console0 \
 -device virtio-tablet-ccw,id=input0,devno=fe.0.0004 \
 -device virtio-keyboard-ccw,id=input1,devno=fe.0.0005 \
 -vnc 127.0.0.1:0 \
diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.xml b/tests/qemuxml2argvdata/s390x-ccw-graphics.xml
index a9bb3485db..46374c799e 100644
--- a/tests/qemuxml2argvdata/s390x-ccw-graphics.xml
+++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.xml
@@ -10,7 +10,7 @@
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
@@ -25,7 +25,9 @@
       <mac address='52:54:00:09:1a:29'/>
       <model type='virtio'/>
     </interface>
-    <console type='pty'/>
+    <console type='pty'>
+      <target type='sclp'/>
+    </console>
     <channel type='unix'>
       <source mode='bind'/>
       <target type='virtio' name='org.qemu.guest_agent.0'/>
@@ -36,6 +38,7 @@
     <video>
       <model type='virtio'/>
     </video>
+    <memballoon model='virtio'/>
     <rng model='virtio'>
       <backend model='random'>/dev/urandom</backend>
     </rng>
diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
index aff73e929a..9b3723eff0 100644
--- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
@@ -12,10 +12,10 @@ QEMU_AUDIO_DRV=none \
 -S \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-guest/master-key.aes \
--machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
+-m 4096 \
 -overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -display none \
 -no-user-config \
@@ -33,13 +33,13 @@ id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,\
 devno=fe.0.0001 \
--chardev pty,id=charserial0 \
--device sclpconsole,chardev=charserial0,id=serial0 \
 -chardev socket,id=charchannel0,fd=1729,server,nowait \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
+-chardev pty,id=charconsole0 \
+-device sclpconsole,chardev=charconsole0,id=console0 \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0003 \
--object rng-random,id=objrng0,filename=/dev/random \
+-object rng-random,id=objrng0,filename=/dev/urandom \
 -device virtio-rng-ccw,rng=objrng0,id=rng0,devno=fe.0.0004 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.xml b/tests/qemuxml2argvdata/s390x-ccw-headless.xml
index a8342ab3a7..70b61674c4 100644
--- a/tests/qemuxml2argvdata/s390x-ccw-headless.xml
+++ b/tests/qemuxml2argvdata/s390x-ccw-headless.xml
@@ -1,11 +1,19 @@
 <domain type='qemu'>
   <name>guest</name>
   <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <vcpu placement='static'>1</vcpu>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory>4194304</memory>
+  <currentMemory>4194304</currentMemory>
+  <vcpu>4</vcpu>
   <os>
-    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+    <boot dev='hd'/>
   </os>
+  <clock offset='utc'/>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <disk type='file' device='disk'>
@@ -17,13 +25,16 @@
       <mac address='52:54:00:09:a4:37'/>
       <model type='virtio'/>
     </interface>
-    <serial type='pty'/>
+    <console type='pty'>
+      <target type='sclp'/>
+    </console>
     <channel type='unix'>
+      <source mode='bind'/>
       <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
     <memballoon model='virtio'/>
     <rng model='virtio'>
-      <backend model='random'/>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.xml b/tests/qemuxml2argvdata/x86_64-pc-graphics.xml
index 3c7dbc9438..add61e25c3 100644
--- a/tests/qemuxml2argvdata/x86_64-pc-graphics.xml
+++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.xml
@@ -48,6 +48,7 @@
     <video>
       <model type='qxl'/>
     </video>
+    <memballoon model='virtio'/>
     <rng model='virtio'>
       <backend model='random'>/dev/urandom</backend>
     </rng>
diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
index 1af229afa2..cc33248272 100644
--- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
@@ -13,24 +13,27 @@ QEMU_AUDIO_DRV=none \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-guest/master-key.aes \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
+-m 4096 \
 -overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=1729,server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
+-rtc base=utc,driftfix=slew \
+-global kvm-pit.lost_tick_policy=delay \
+-no-hpet \
 -no-shutdown \
--no-acpi \
+-global PIIX4_PM.disable_s3=1 \
+-global PIIX4_PM.disable_s4=1 \
 -boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x4 \
 -drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
 id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.0,\
@@ -40,9 +43,9 @@ addr=0x2 \
 -chardev socket,id=charchannel0,fd=1729,server,nowait \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
--object rng-random,id=objrng0,filename=/dev/random \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x6 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
+-object rng-random,id=objrng0,filename=/dev/urandom \
+-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.xml b/tests/qemuxml2argvdata/x86_64-pc-headless.xml
index 2e8cd8b8ad..a40f09abdf 100644
--- a/tests/qemuxml2argvdata/x86_64-pc-headless.xml
+++ b/tests/qemuxml2argvdata/x86_64-pc-headless.xml
@@ -1,11 +1,31 @@
 <domain type='qemu'>
   <name>guest</name>
   <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <vcpu placement='static'>1</vcpu>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory>4194304</memory>
+  <currentMemory>4194304</currentMemory>
+  <vcpu>4</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
   </os>
+  <features>
+    <acpi/>
+    <apic/>
+  </features>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+  </clock>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
@@ -13,17 +33,19 @@
       <source file='/var/lib/libvirt/images/guest.qcow2'/>
       <target dev='vda' bus='virtio'/>
     </disk>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'/>
     <interface type='user'>
       <mac address='52:54:00:09:a4:37'/>
       <model type='virtio'/>
     </interface>
-    <serial type='pty'/>
+    <console type='pty'/>
     <channel type='unix'>
+      <source mode='bind'/>
       <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
     <memballoon model='virtio'/>
     <rng model='virtio'>
-      <backend model='random'/>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.xml b/tests/qemuxml2argvdata/x86_64-q35-graphics.xml
index d3ad87c963..cf69f08546 100644
--- a/tests/qemuxml2argvdata/x86_64-q35-graphics.xml
+++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.xml
@@ -48,6 +48,7 @@
     <video>
       <model type='qxl'/>
     </video>
+    <memballoon model='virtio'/>
     <rng model='virtio'>
       <backend model='random'>/dev/urandom</backend>
     </rng>
diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
index 68b984f2ca..b3fb8d8340 100644
--- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
@@ -13,18 +13,21 @@ QEMU_AUDIO_DRV=none \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-guest/master-key.aes \
 -machine q35,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
+-m 4096 \
 -overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=1729,server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
+-rtc base=utc,driftfix=slew \
+-global kvm-pit.lost_tick_policy=delay \
+-no-hpet \
 -no-shutdown \
--no-acpi \
+-global ICH9-LPC.disable_s3=1 \
+-global ICH9-LPC.disable_s4=1 \
 -boot strict=on \
 -device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\
 addr=0x1 \
@@ -34,7 +37,7 @@ addr=0x1 \
 -device pcie-root-port,port=0xc,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
 -device pcie-root-port,port=0xd,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
 -device pcie-root-port,port=0xe,chassis=7,id=pci.7,bus=pcie.0,addr=0x1.0x6 \
--device qemu-xhci,id=usb,bus=pci.2,addr=0x0 \
+-device qemu-xhci,p2=15,p3=15,id=usb,bus=pci.2,addr=0x0 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
 -drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
 id=drive-virtio-disk0 \
@@ -49,7 +52,7 @@ addr=0x0 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \
--object rng-random,id=objrng0,filename=/dev/random \
+-object rng-random,id=objrng0,filename=/dev/urandom \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.6,addr=0x0 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.xml b/tests/qemuxml2argvdata/x86_64-q35-headless.xml
index 445cc643d5..a92864bc00 100644
--- a/tests/qemuxml2argvdata/x86_64-q35-headless.xml
+++ b/tests/qemuxml2argvdata/x86_64-q35-headless.xml
@@ -1,11 +1,31 @@
 <domain type='qemu'>
   <name>guest</name>
   <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <vcpu placement='static'>1</vcpu>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory>4194304</memory>
+  <currentMemory>4194304</currentMemory>
+  <vcpu>4</vcpu>
   <os>
     <type arch='x86_64' machine='q35'>hvm</type>
+    <boot dev='hd'/>
   </os>
+  <features>
+    <acpi/>
+    <apic/>
+  </features>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+  </clock>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
@@ -13,17 +33,19 @@
       <source file='/var/lib/libvirt/images/guest.qcow2'/>
       <target dev='vda' bus='virtio'/>
     </disk>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'/>
     <interface type='user'>
       <mac address='52:54:00:09:a4:37'/>
       <model type='virtio'/>
     </interface>
-    <serial type='pty'/>
+    <console type='pty'/>
     <channel type='unix'>
+      <source mode='bind'/>
       <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
     <memballoon model='virtio'/>
     <rng model='virtio'>
-      <backend model='random'/>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>