5:57 a.m.
The input file is a symlink for the ppc64-usb-controller input
file, so the output files are identical as well. It's just an
unnecessary duplicate.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
...64-usb-controller-legacy.ppc64-latest.args | 33 ----------------
...c64-usb-controller-legacy.ppc64-latest.xml | 38 -------------------
.../ppc64-usb-controller-legacy.xml | 1 -
tests/qemuxmlconftest.c | 1 -
4 files changed, 73 deletions(-)
delete mode 100644 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args
delete mode 100644 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml
delete mode 120000 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml
diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args
b/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args
deleted file mode 100644
index 0b0b2a1986..0000000000
--- a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-ppc64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
--machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \
--accel tcg \
--cpu POWER9 \
--m size=262144k \
--object
'{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":268435456}'
\
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device
'{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}'
\
--audiodev
'{"id":"audio1","driver":"none"}' \
--device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}'
\
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml
b/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml
deleted file mode 100644
index c25b3918e9..0000000000
--- a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219100</memory>
- <currentMemory unit='KiB'>219100</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='ppc64' machine='pseries'>hvm</type>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- <pae/>
- </features>
- <cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>POWER9</model>
- </cpu>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-ppc64</emulator>
- <controller type='usb' index='0' model='pci-ohci'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'>
- <model name='spapr-pci-host-bridge'/>
- <target index='0'/>
- </controller>
- <audio id='1' type='none'/>
- <memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
- </memballoon>
- <panic model='pseries'/>
- </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml
b/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml
deleted file mode 120000
index a63a8064a4..0000000000
--- a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml
+++ /dev/null
@@ -1 +0,0 @@
-ppc64-usb-controller.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index b6fb5e5052..be2386f730 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -2544,7 +2544,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("input-linux");
DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64");
- DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller-legacy",
"ppc64");
DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("ppc64-usb-controller-qemu-xhci",
"ppc64");
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("ppc64-tpmproxy-double",
"ppc64");
--
2.43.0