[PATCH 07/21] qemuxml2argvtest: Drop "aarch64-virt-2.6-virtio-pci-default" case

[Peter Krempa]

The test data is effectively identical to the
'aarch64-virtio-pci-default' case.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../aarch64-virt-2.6-virtio-pci-default.args  | 50 -------------------
 .../aarch64-virt-2.6-virtio-pci-default.xml   | 46 -----------------
 tests/qemuxml2argvtest.c                      |  7 ---
 3 files changed, 103 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
 delete mode 100644 tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.xml

diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
deleted file mode 100644
index 288bc9f07f..0000000000
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ /dev/null
@@ -1,50 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
-/usr/bin/qemu-system-aarch64 \
--name guest=aarch64test,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes \
--machine virt-2.6,usb=off,gic-version=2,dump-guest-core=off \
--accel tcg \
--cpu cortex-a53 \
--m 1024 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
--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 \
--kernel /aarch64.kernel \
--initrd /aarch64.initrd \
--append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
--dtb /aarch64.dtb \
--device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=16,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x2 \
--blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,bus=pci.2,addr=0x3,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
--netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.2,addr=0x1 \
--chardev pty,id=charserial0 \
--serial chardev:charserial0 \
--chardev pty,id=charconsole1 \
--device virtconsole,chardev=charconsole1,id=console1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x4 \
--object rng-random,id=objrng0,filename=/dev/random \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.2,addr=0x5 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.xml b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.xml
deleted file mode 100644
index 43bc0089c9..0000000000
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<domain type="qemu">
-  <name>aarch64test</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
-  <memory>1048576</memory>
-  <currentMemory>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch="aarch64" machine="virt-2.6">hvm</type>
-    <kernel>/aarch64.kernel</kernel>
-    <initrd>/aarch64.initrd</initrd>
-    <dtb>/aarch64.dtb</dtb>
-    <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline>
-  </os>
-  <features>
-    <apic/>
-    <pae/>
-  </features>
-  <cpu match='exact'>
-    <model>cortex-a53</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-aarch64</emulator>
-    <disk type='file' device='disk'>
-      <source file='/aarch64.raw'/>
-      <target dev='vda' bus='virtio'/>
-    </disk>
-    <interface type='user'>
-      <mac address='52:54:00:09:a4:37'/>
-    </interface>
-    <console type='pty'/>
-    <console type='pty'>
-      <target type='virtio' port='0'/>
-    </console>
-    <memballoon model='virtio'/>
-    <!--
-      This actually doesn't work in practice because vexpress only has
-      4 virtio slots available, rng makes 5 -->
-    <rng model='virtio'>
-      <backend model='random'>/dev/random</backend>
-    </rng>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5644825650..044566426d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2362,13 +2362,6 @@ mymain(void)
        specified. */
     DO_TEST_CAPS_ARCH_VER("aarch64-virtio-pci-default", "aarch64", "4.2.0");
     DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64");
-    DO_TEST("aarch64-virt-2.6-virtio-pci-default",
-            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
-            QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
-            QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-            QEMU_CAPS_DEVICE_PL011,
-            QEMU_CAPS_DEVICE_IOH3420);
     /* Example of using virtio-pci with no explicit PCI controller
        but with manual PCI addresses */
     DO_TEST("aarch64-virtio-pci-manual-addresses",
-- 
2.39.2