[libvirt PATCH 06/33] tests: Unify input files for firmware tests

Andrea Bolognani Wed, 15 Feb 2023 02:46:10 -0800

Most of the differences, such as those in the domain name or
amount of memory, are fairly harmless, but they still make it
more cumbersome than necessary to directly compare different
input (and output) files.


More importantly, the use of unversioned machine types in some
of the test cases results in the descriptor-based autoselection
logic being effectively skipped, because the compatible machine
types as listed in them are only the versioned variants.

Signed-off-by: Andrea Bolognani <abolo...@redhat.com>
---
 .../firmware-auto-bios-not-stateless.xml       |  4 ++--
 .../firmware-auto-bios-nvram.xml               |  6 +++---
 ...ware-auto-bios-stateless.x86_64-latest.args | 16 ++++++++--------
 .../firmware-auto-bios-stateless.xml           |  4 ++--
 .../firmware-auto-bios.x86_64-latest.args      | 16 ++++++++--------
 tests/qemuxml2argvdata/firmware-auto-bios.xml  |  4 ++--
 ...rmware-auto-efi-aarch64.aarch64-latest.args | 16 ++++++++--------
 .../firmware-auto-efi-aarch64.xml              |  4 ++--
 ...mware-auto-efi-enrolled-keys-no-secboot.xml |  4 ++--
 ...e-auto-efi-enrolled-keys.x86_64-latest.args | 18 +++++++++---------
 .../firmware-auto-efi-enrolled-keys.xml        |  4 ++--
 .../firmware-auto-efi-loader-insecure.xml      |  4 ++--
 .../firmware-auto-efi-loader-path.xml          |  4 ++--
 ...e-auto-efi-loader-secure.x86_64-latest.args | 18 +++++++++---------
 .../firmware-auto-efi-loader-secure.xml        |  4 ++--
 ...uto-efi-no-enrolled-keys.x86_64-latest.args | 18 +++++++++---------
 .../firmware-auto-efi-no-enrolled-keys.xml     |  4 ++--
 ...ware-auto-efi-no-secboot.x86_64-latest.args | 18 +++++++++---------
 .../firmware-auto-efi-no-secboot.xml           |  4 ++--
 .../firmware-auto-efi-nvram.x86_64-latest.args | 18 +++++++++---------
 .../firmware-auto-efi-nvram.xml                |  6 +++---
 ...irmware-auto-efi-secboot.x86_64-latest.args | 18 +++++++++---------
 .../firmware-auto-efi-secboot.xml              |  4 ++--
 ...mware-auto-efi-stateless.x86_64-latest.args | 16 ++++++++--------
 .../firmware-auto-efi-stateless.xml            |  4 ++--
 .../firmware-auto-efi.x86_64-latest.args       | 18 +++++++++---------
 tests/qemuxml2argvdata/firmware-auto-efi.xml   |  4 ++--
 .../firmware-manual-bios-not-stateless.xml     |  6 +++---
 ...re-manual-bios-stateless.x86_64-latest.args | 16 ++++++++--------
 .../firmware-manual-bios-stateless.xml         |  6 +++---
 .../firmware-manual-bios.x86_64-latest.args    | 16 ++++++++--------
 .../qemuxml2argvdata/firmware-manual-bios.xml  |  6 +++---
 ...manual-efi-acpi-aarch64.aarch64-latest.args |  6 +++---
 .../firmware-manual-efi-acpi-aarch64.xml       |  6 +++---
 ...ware-manual-efi-acpi-q35.x86_64-latest.args |  6 +++---
 .../firmware-manual-efi-acpi-q35.xml           |  6 +++---
 .../firmware-manual-efi-features.xml           |  6 +++---
 .../firmware-manual-efi-no-path.xml            |  6 +++---
 ...nual-efi-noacpi-aarch64.aarch64-latest.args |  6 +++---
 .../firmware-manual-efi-noacpi-aarch64.xml     |  6 +++---
 .../firmware-manual-efi-noacpi-q35.xml         |  6 +++---
 ...re-manual-efi-nvram-file.x86_64-latest.args | 18 +++++++++---------
 .../firmware-manual-efi-nvram-file.xml         |  8 ++++----
 ...-efi-nvram-network-iscsi.x86_64-latest.args | 16 ++++++++--------
 ...firmware-manual-efi-nvram-network-iscsi.xml |  6 +++---
 ...al-efi-nvram-network-nbd.x86_64-latest.args | 16 ++++++++--------
 .../firmware-manual-efi-nvram-network-nbd.xml  |  6 +++---
 .../firmware-manual-efi-nvram-stateless.xml    |  8 ++++----
 ...are-manual-efi-nvram-template-stateless.xml |  6 +++---
 ...anual-efi-nvram-template.x86_64-latest.args | 18 +++++++++---------
 .../firmware-manual-efi-nvram-template.xml     |  6 +++---
 ...e-manual-efi-rw-implicit.x86_64-latest.args | 18 +++++++++---------
 .../firmware-manual-efi-rw-implicit.xml        |  8 ++++----
 .../firmware-manual-efi-rw.x86_64-latest.args  | 18 +++++++++---------
 .../firmware-manual-efi-rw.xml                 |  8 ++++----
 ...rmware-manual-efi-secure.x86_64-latest.args | 18 +++++++++---------
 .../firmware-manual-efi-secure.xml             |  8 ++++----
 ...are-manual-efi-stateless.x86_64-latest.args | 16 ++++++++--------
 .../firmware-manual-efi-stateless.xml          |  6 +++---
 .../firmware-manual-efi.x86_64-latest.args     | 18 +++++++++---------
 tests/qemuxml2argvdata/firmware-manual-efi.xml |  8 ++++----
 .../firmware-manual-noefi-acpi-aarch64.xml     |  4 ++--
 ...re-manual-noefi-acpi-q35.x86_64-latest.args |  4 ++--
 .../firmware-manual-noefi-acpi-q35.xml         |  4 ++--
 ...al-noefi-noacpi-aarch64.aarch64-latest.args |  4 ++--
 .../firmware-manual-noefi-noacpi-aarch64.xml   |  4 ++--
 ...-manual-noefi-noacpi-q35.x86_64-latest.args |  4 ++--
 .../firmware-manual-noefi-noacpi-q35.xml       |  4 ++--
 ...mware-auto-bios-stateless.x86_64-latest.xml |  6 +++---
 .../firmware-auto-bios.x86_64-latest.xml       |  6 +++---
 ...irmware-auto-efi-aarch64.aarch64-latest.xml |  4 ++--
 ...re-auto-efi-enrolled-keys.x86_64-latest.xml |  6 +++---
 ...re-auto-efi-loader-secure.x86_64-latest.xml |  6 +++---
 ...auto-efi-no-enrolled-keys.x86_64-latest.xml |  6 +++---
 ...mware-auto-efi-no-secboot.x86_64-latest.xml |  6 +++---
 .../firmware-auto-efi-nvram.x86_64-latest.xml  |  8 ++++----
 ...firmware-auto-efi-secboot.x86_64-latest.xml |  6 +++---
 .../firmware-auto-efi.x86_64-latest.xml        |  6 +++---
 ...are-manual-bios-stateless.x86_64-latest.xml |  6 +++---
 .../firmware-manual-bios.x86_64-latest.xml     |  6 +++---
 ...are-manual-efi-nvram-file.x86_64-latest.xml |  8 ++++----
 ...l-efi-nvram-network-iscsi.x86_64-latest.xml |  6 +++---
 ...ual-efi-nvram-network-nbd.x86_64-latest.xml |  6 +++---
 .../firmware-manual-efi.x86_64-latest.xml      |  8 ++++----
 84 files changed, 362 insertions(+), 362 deletions(-)

diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml 
b/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
index b2c8fc1122..a1f21e9bb4 100644
--- a/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-nvram.xml 
b/tests/qemuxml2argvdata/firmware-auto-bios-nvram.xml
index 6dad1e1f7f..c87debdb01 100644
--- a/tests/qemuxml2argvdata/firmware-auto-bios-nvram.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-bios-nvram.xml
@@ -1,11 +1,11 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
-    <nvram>/path/to/fedora_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
index 8bef5a34f8..ae94fae47e 100644
--- a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
@@ -1,21 +1,21 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 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 \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"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-guest/master-key.aes"}'
 \
 -machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios-256k.bin \
--m 8 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml 
b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
index 4847951346..540f61a2b8 100644
--- a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args
index 8bef5a34f8..ae94fae47e 100644
--- a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args
@@ -1,21 +1,21 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 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 \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"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-guest/master-key.aes"}'
 \
 -machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios-256k.bin \
--m 8 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/firmware-auto-bios.xml 
b/tests/qemuxml2argvdata/firmware-auto-bios.xml
index 06bb0bea9d..1911b40ae7 100644
--- a/tests/qemuxml2argvdata/firmware-auto-bios.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-bios.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args
index b8959f89f4..05b27e84e8 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args
@@ -1,18 +1,18 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-aarch64test \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-aarch64 \
--name guest=aarch64test,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-aarch64test/master-key.aes"}'
 \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/aarch64test_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
 -machine 
virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel tcg \
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -object 
'{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml
index 1e8dfffb5b..5c6c5192ba 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml
@@ -1,6 +1,6 @@
 <domain type='qemu'>
-  <name>aarch64test</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
diff --git 
a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.xml
index 722793684c..897da8e126 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
index 966697d860..e76fb1c38d 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 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 \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"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-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
 -machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
--m 8 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml
index b6ee05447f..01bba19a32 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml
index 33bd7b0ac1..08ddfe3cfe 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml
index a40f5e730c..5cf67730fd 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
index 966697d860..e76fb1c38d 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 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 \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"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-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
 -machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
--m 8 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml
index 34fa6d090e..e67e3a0844 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
index b02460dbc6..1a6966abe7 100644
--- 
a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
+++ 
b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
@@ -1,24 +1,24 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 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 \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"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-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
 -machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel kvm \
 -cpu qemu64 \
--m 8 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml
index e9717000a3..019faa29b9 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args
index b02460dbc6..1a6966abe7 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args
@@ -1,24 +1,24 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 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 \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"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-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
 -machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel kvm \
 -cpu qemu64 \
--m 8 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml
index 749d364ba5..7ddeb2d230 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
index 0c131b529d..c848ea369a 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 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 \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"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-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/path/to/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
 -machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
--m 8 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml
index 17de8e380a..4ea37550e0 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml
@@ -1,11 +1,11 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
-    <nvram>/path/to/fedora_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
index 966697d860..e76fb1c38d 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 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 \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"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-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
 -machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
--m 8 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.xml
index 8a0b414f55..b2c18cdd54 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
index c89612d7bf..3989b9fa6b 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
@@ -1,22 +1,22 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 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 \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"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-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF.sev.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format
 \
 -accel kvm \
 -cpu qemu64 \
--m 8 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml
index 1be0f4fd96..575d756265 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
index 966697d860..e76fb1c38d 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 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 \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"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-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
 -machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
--m 8 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.xml 
b/tests/qemuxml2argvdata/firmware-auto-efi.xml
index 55b9be1aec..8bf079a1c7 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi.xml
+++ b/tests/qemuxml2argvdata/firmware-auto-efi.xml
@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml 
b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
index 6e5f87354a..8581e941f0 100644
--- a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader stateless='no'>/usr/share/seabios/bios.bin</loader>
   </os>
   <devices>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args
index 20953097ef..4f7e0d8df5 100644
--- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args
@@ -1,16 +1,16 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios.bin \
@@ -18,7 +18,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml 
b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
index fa644af8b9..0d20ad256f 100644
--- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader stateless='yes'>/usr/share/seabios/bios.bin</loader>
   </os>
   <devices>
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args
index 20953097ef..4f7e0d8df5 100644
--- a/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args
@@ -1,16 +1,16 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios.bin \
@@ -18,7 +18,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.xml 
b/tests/qemuxml2argvdata/firmware-manual-bios.xml
index f5c33bc306..0749f94c40 100644
--- a/tests/qemuxml2argvdata/firmware-manual-bios.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-bios.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader>/usr/share/seabios/bios.bin</loader>
   </os>
   <devices>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args
index d6ed7b879c..536b0894b2 100644
--- 
a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args
+++ 
b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args
@@ -12,16 +12,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
--machine 
virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
+-machine 
virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
 -object 
'{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml
index b18c5f55f0..4ccb2ac4a5 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml
@@ -1,12 +1,12 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt'>hvm</type>
+    <type arch='aarch64' machine='virt-4.0'>hvm</type>
     <loader readonly='yes' 
type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args
index 1d95deed9f..f3706f0169 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args
@@ -12,16 +12,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
--machine 
q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
+-machine 
pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml
index ea5289da2e..dd13bd27dd 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml
@@ -1,12 +1,12 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-features.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-features.xml
index 69cc71eb2a..8e5aff7559 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-features.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-features.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml
index 435f01dab4..66ad0804ae 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'/>
   </os>
   <features>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args
index 3ecd28d85e..4a2d43efdf 100644
--- 
a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args
+++ 
b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args
@@ -12,16 +12,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
--machine 
virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
+-machine 
virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
 -object 
'{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml
index 3799a5181c..7689d36fe2 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml
@@ -1,12 +1,12 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt'>hvm</type>
+    <type arch='aarch64' machine='virt-4.0'>hvm</type>
     <loader readonly='yes' 
type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml
index 9b080fe31c..792c3315d4 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml
@@ -1,12 +1,12 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args
index d3ee7c0fee..ec950b8792 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args
@@ -1,27 +1,27 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
--machine 
pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
+-machine 
pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml
index beed93adc1..46c20b2408 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml
@@ -1,13 +1,13 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='file'>
-      <source file='/var/lib/libvirt/nvram/guest_VARS.fd'/>
+      <source file='/path/to/guest_VARS.fd'/>
     </nvram>
   </os>
   <features>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
index 07f2180cd8..c4c50a7721 100644
--- 
a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
+++ 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
@@ -1,28 +1,28 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -object 
'{"qom-type":"secret","id":"libvirt-pflash1-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}'
 \
 -blockdev 
'{"driver":"iscsi","portal":"example.com:6000","target":"iqn.2013-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","password-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
--machine 
pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
+-machine 
pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml
index efc60341ab..af925e7ce7 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='network'>
       <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool'>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
index f2864f6086..431f2f30fd 100644
--- 
a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
+++ 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
@@ -1,27 +1,27 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
 -blockdev 
'{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
--machine 
pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
+-machine 
pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml
index 60a963ca22..133c08e63d 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='network'>
       <source protocol='nbd' name='bar'>
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
index 717712e89b..4de3f30192 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
@@ -1,13 +1,13 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader stateless='yes' readonly='yes' 
type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='file'>
-      <source file='/var/lib/libvirt/nvram/guest_VARS.fd'/>
+      <source file='/path/to/guest_VARS.fd'/>
     </nvram>
   </os>
   <features>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
index a6d7079b78..e4f9d04aed 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader stateless='yes' readonly='yes' 
type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram template="/usr/share/OVMF/OVMF_VARS.fd"/>
   </os>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args
index 1d24a734c6..8cd1b5750a 100644
--- 
a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args
+++ 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args
@@ -1,27 +1,27 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
--machine 
pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
+-machine 
pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml
index 0d7e43a26c..647c6166cf 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram template="/usr/share/OVMF/OVMF_VARS.fd"/>
   </os>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.args
index 7a0d663f81..7a88cfe5fd 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.args
@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
+-blockdev 
'{"driver":"file","filename":"/path/to/guest_BOTH.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--machine 
pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format
 \
+-machine 
pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format
 \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml
index 6279bf2eb4..87fd1317f4 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml
@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
-    <loader type='pflash'>/var/lib/libvirt/qemu/nvram/test-bios.fd</loader>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <loader type='pflash'>/path/to/guest_BOTH.fd</loader>
   </os>
   <features>
     <acpi/>
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args
index 7a0d663f81..7a88cfe5fd 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args
@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
--blockdev 
'{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
+-blockdev 
'{"driver":"file","filename":"/path/to/guest_BOTH.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--machine 
pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format
 \
+-machine 
pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format
 \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-rw.xml
index 1dc9432523..c98480c119 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-rw.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw.xml
@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
-    <loader readonly='no' 
type='pflash'>/var/lib/libvirt/qemu/nvram/test-bios.fd</loader>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
+    <loader readonly='no' type='pflash'>/path/to/guest_BOTH.fd</loader>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args
index d394efedd9..b8c5708a7f 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args
@@ -1,20 +1,20 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
--machine 
q35,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
+-machine 
pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel tcg \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-secure.xml
index 090e37cecd..740b7968a8 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.xml
@@ -1,12 +1,12 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
     <loader readonly='yes' secure='yes' 
type='pflash'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
index e87c2d6638..2fca20dffd 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--machine 
pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format
 \
+-machine 
pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format
 \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml
index 6f2a4963b1..641c0f275f 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash' 
stateless='yes'>/usr/share/OVMF/OVMF_CODE.fd</loader>
   </os>
   <features>
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args
index 9a0a941372..ec950b8792 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args
@@ -1,27 +1,27 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}'
 \
+-object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
 -blockdev 
'{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}'
 \
--blockdev 
'{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
+-blockdev 
'{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}'
 \
 -blockdev 
'{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}'
 \
--machine 
pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
+-machine 
pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format
 \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.xml 
b/tests/qemuxml2argvdata/firmware-manual-efi.xml
index bbc4641da8..5bbb50764a 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-efi.xml
@@ -1,12 +1,12 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml 
b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml
index 12052e2f43..6a9095634e 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt'>hvm</type>
+    <type arch='aarch64' machine='virt-4.0'>hvm</type>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args
index 18991fa32c..1caf8cd150 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args
@@ -10,14 +10,14 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
--machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml 
b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml
index 2b3ae78169..cd619db5a6 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
   </os>
   <features>
     <acpi/>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args
 
b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args
index fab02e14e2..677d610e33 100644
--- 
a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args
+++ 
b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args
@@ -10,14 +10,14 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
--machine 
virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
+-machine 
virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram 
\
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
 -object 
'{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml 
b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml
index 72d7bf2ed5..e96c83550c 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt'>hvm</type>
+    <type arch='aarch64' machine='virt-4.0'>hvm</type>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
diff --git 
a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args 
b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args
index 089871f9fa..783abd6983 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args
@@ -10,14 +10,14 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}'
 \
--machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml 
b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml
index 2150c33b1c..a5cfd48a34 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml
@@ -1,10 +1,10 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
index 7609ded09a..9d42e210c3 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml
index 3c48ff19c6..11f95f04eb 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml
index a926869046..5f4432db36 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml
@@ -1,6 +1,6 @@
 <domain type='qemu'>
-  <name>aarch64test</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml
index e411c0e614..3923d1d4f2 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
index 3ba6ec2b86..c655d81454 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
index 58745a4b1a..326b1d5faf 100644
--- 
a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
+++ 
b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.xml
index 7625ef219a..9e8107cb4d 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml
index f6243bc43a..2090a770c6 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml
@@ -1,12 +1,12 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
-    <nvram>/path/to/fedora_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
     <boot dev='hd'/>
   </os>
   <features>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml
index 1c66ca23a1..22a26554c8 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml
index b9b119fd21..72f2ea1321 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml
index 186df8c386..5787482b36 100644
--- a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml
@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader type='rom' stateless='yes'>/usr/share/seabios/bios.bin</loader>
     <boot dev='hd'/>
   </os>
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml
index 98b7becb2c..56932d7fee 100644
--- a/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml
@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader type='rom'>/usr/share/seabios/bios.bin</loader>
     <boot dev='hd'/>
   </os>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest.xml
index b78cafecc4..482d7987f6 100644
--- a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest.xml
@@ -1,14 +1,14 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='file'>
-      <source file='/var/lib/libvirt/nvram/guest_VARS.fd'/>
+      <source file='/path/to/guest_VARS.fd'/>
     </nvram>
     <boot dev='hd'/>
   </os>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
 
b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
index 16de5e7387..5a2e8715a0 100644
--- 
a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
+++ 
b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='network'>
       <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool'>
diff --git 
a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
 
b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
index 1adbd9e60e..208257bb5b 100644
--- 
a/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
+++ 
b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='network'>
       <source protocol='nbd' name='bar'>
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml 
b/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml
index 189f68cb1c..97a9a6c5e6 100644
--- a/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml
@@ -1,13 +1,13 @@
 <domain type='qemu'>
-  <name>test-bios</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <name>guest</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
     <boot dev='hd'/>
   </os>
   <features>
-- 
2.39.1

[libvirt PATCH 06/33] tests: Unify input files for firmware tests

Reply via email to