qemuxml2argvtest: Don't symlink output files for 'mach-virt-' cases

Make the output changes of upcoming modernization more visible.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/qemuxml2argvdata/mach-virt-console-native.args
deleted file mode 120000 (symlink)
index c7abf01bd67816e5e88011b5865d12c700f7380b..0000000000000000000000000000000000000000
--- a/tests/qemuxml2argvdata/mach-virt-console-native.args
+++ /dev/null
@@ -1 +0,0 @@
-mach-virt-serial-native.args
\ No newline at end of file

diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/qemuxml2argvdata/mach-virt-console-native.args
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..f9f8f49d97f8cf7b09aa30e2392a54e86a895bc3
--- /dev/null
+++ b/tests/qemuxml2argvdata/mach-virt-console-native.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=guest,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest/master-key.aes \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
+-accel tcg \
+-m 512 \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-chardev pty,id=charserial0 \
+-serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-msg timestamp=on

diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
deleted file mode 120000 (symlink)
index c7abf01bd67816e5e88011b5865d12c700f7380b..0000000000000000000000000000000000000000
--- a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
+++ /dev/null
@@ -1 +0,0 @@
-mach-virt-serial-native.args
\ No newline at end of file

diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..f9f8f49d97f8cf7b09aa30e2392a54e86a895bc3
--- /dev/null
+++ b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=guest,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest/master-key.aes \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
+-accel tcg \
+-m 512 \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-chardev pty,id=charserial0 \
+-serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-msg timestamp=on

diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
deleted file mode 120000 (symlink)
index c7abf01bd67816e5e88011b5865d12c700f7380b..0000000000000000000000000000000000000000
--- a/tests/qemuxml2argvdata/mach-virt-serial-compat.args
+++ /dev/null
@@ -1 +0,0 @@
-mach-virt-serial-native.args
\ No newline at end of file

diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..f9f8f49d97f8cf7b09aa30e2392a54e86a895bc3
--- /dev/null
+++ b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=guest,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest/master-key.aes \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
+-accel tcg \
+-m 512 \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-chardev pty,id=charserial0 \
+-serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-msg timestamp=on