[PATCH 4/6] qemuxml2xmloutdata: Drop unused output files

Remove leftover output files. The list of files was identified by temporarily hacking testConfXMLEnumerate to also enumerate 'tests/qemuxml2xmloutdata' directory. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ...arch64-virt-virtio-MMIO.aarch64.latest.xml | 63 ------------ ...rch64-virtio-pci-default.aarch64-4.2.0.xml | 94 ------------------ .../arm-virt-virtio.aarch64-latest.xml | 95 ------------------- .../disk-network-sheepdog.x86_64-latest.xml | 46 --------- ...dev-vfio-old-driver-name.x86_64-latest.xml | 46 --------- ...iothreads-disk-virtio-ccw.s390x-latest.xml | 41 -------- .../riscv64-virt-pci.riscv64-latest.xml | 29 ------ .../riscv64-virt.riscv64-latest.xml | 38 -------- 8 files changed, 452 deletions(-) delete mode 100644 tests/qemuxml2xmloutdata/aarch64-virt-virtio-MMIO.aarch64.latest.xml delete mode 100644 tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.2.0.xml delete mode 100644 tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-old-driver-name.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/riscv64-virt-pci.riscv64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/riscv64-virt.riscv64-latest.xml diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-virtio-MMIO.aarch64.latest.xml b/tests/qemuxml2xmloutdata/aarch64-virt-virtio-MMIO.aarch64.latest.xml deleted file mode 100644 index c7d74309f9..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-virt-virtio-MMIO.aarch64.latest.xml +++ /dev/null @@ -1,63 +0,0 @@ -<domain type='qemu'> - <name>aarch64test</name> - <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt'>hvm</type> - <kernel>/aarch64.kernel</kernel> - <initrd>/aarch64.initrd</initrd> - <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> - <dtb>/aarch64.dtb</dtb> - <boot dev='hd'/> - </os> - <features> - <apic/> - <pae/> - <gic version='2'/> - </features> - <cpu mode='custom' match='exact' check='none'> - <model fallback='allow'>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'> - <driver name='qemu' type='raw'/> - <source file='/aarch64.raw'/> - <target dev='vda' bus='virtio'/> - <address type='virtio-mmio'/> - </disk> - <controller type='virtio-serial' index='0'> - <address type='virtio-mmio'/> - </controller> - <interface type='user'> - <mac address='52:54:00:09:a4:37'/> - <model type='virtio'/> - <address type='virtio-mmio'/> - </interface> - <serial type='pty'> - <target type='system-serial' port='0'> - <model name='pl011'/> - </target> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <console type='pty'> - <target type='virtio' port='1'/> - </console> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='virtio-mmio'/> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/random</backend> - <address type='virtio-mmio'/> - </rng> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.2.0.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.2.0.xml deleted file mode 100644 index 3c657b4c91..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.2.0.xml +++ /dev/null @@ -1,94 +0,0 @@ -<domain type='qemu'> - <name>aarch64test</name> - <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt-4.2'>hvm</type> - <kernel>/aarch64.kernel</kernel> - <initrd>/aarch64.initrd</initrd> - <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> - <dtb>/aarch64.dtb</dtb> - <boot dev='hd'/> - </os> - <features> - <apic/> - <pae/> - <gic version='2'/> - </features> - <cpu mode='custom' match='exact' check='none'> - <model fallback='allow'>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'> - <driver name='qemu' type='raw'/> - <source file='/aarch64.raw'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> - </disk> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='1' port='0x8'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> - </controller> - <controller type='pci' index='2' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='2' port='0x9'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='3' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='3' port='0xa'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='4' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='4' port='0xb'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/> - </controller> - <controller type='pci' index='5' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='5' port='0xc'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x4'/> - </controller> - <controller type='pci' index='6' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='6' port='0xd'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x5'/> - </controller> - <controller type='virtio-serial' index='0'> - <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> - </controller> - <interface type='user'> - <mac address='52:54:00:09:a4:37'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> - </interface> - <serial type='pty'> - <target type='system-serial' port='0'> - <model name='pl011'/> - </target> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <console type='pty'> - <target type='virtio' port='1'/> - </console> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/random</backend> - <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/> - </rng> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml b/tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml deleted file mode 100644 index 1ae2d28ca2..0000000000 --- a/tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml +++ /dev/null @@ -1,95 +0,0 @@ -<domain type='qemu'> - <name>armtest</name> - <uuid>496d7ea8-9739-544b-4ebd-ef08be936e6a</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='armv7l' machine='virt'>hvm</type> - <kernel>/arm.kernel</kernel> - <initrd>/arm.initrd</initrd> - <cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0</cmdline> - <dtb>/arm.dtb</dtb> - <boot dev='hd'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - <gic version='2'/> - </features> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>cortex-a15</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'> - <driver name='qemu' type='raw'/> - <source file='/arm.raw'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> - </disk> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='1' port='0x8'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> - </controller> - <controller type='pci' index='2' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='2' port='0x9'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='3' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='3' port='0xa'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='4' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='4' port='0xb'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/> - </controller> - <controller type='pci' index='5' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='5' port='0xc'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x4'/> - </controller> - <controller type='pci' index='6' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='6' port='0xd'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x5'/> - </controller> - <controller type='virtio-serial' index='0'> - <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> - </controller> - <interface type='user'> - <mac address='52:54:00:09:a4:37'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> - </interface> - <serial type='pty'> - <target type='system-serial' port='0'> - <model name='pl011'/> - </target> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <console type='pty'> - <target type='virtio' port='1'/> - </console> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/random</backend> - <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/> - </rng> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml deleted file mode 100644 index 094de3a4d5..0000000000 --- a/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml +++ /dev/null @@ -1,46 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>qemu64</model> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMU,Guest,,1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='sheepdog' name='image,with,commas'> - <host name='example.org' port='6000'/> - </source> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </disk> - <controller type='usb' index='0' model='piix3-uhci'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-old-driver-name.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-old-driver-name.x86_64-latest.xml deleted file mode 100644 index 3915b515f2..0000000000 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-old-driver-name.x86_64-latest.xml +++ /dev/null @@ -1,46 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest2</name> - <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>qemu64</model> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0' model='piix3-uhci'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <hostdev mode='subsystem' type='pci' managed='yes'> - <source> - <address domain='0x0000' bus='0x06' slot='0x12' function='0x1'/> - </source> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </hostdev> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-latest.xml b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-latest.xml deleted file mode 100644 index cdcee3bbb4..0000000000 --- a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-latest.xml +++ /dev/null @@ -1,41 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <iothreads>2</iothreads> - <os> - <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>qemu</model> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw' iothread='1'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='virtio'/> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='raw' iothread='2'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdb' bus='virtio'/> - <address type='ccw' cssid='0x0' ssid='0x0' devno='0x0007'/> - </disk> - <controller type='usb' index='0' model='none'/> - <controller type='pci' index='0' model='pci-root'/> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x000a'/> - </memballoon> - <panic model='s390'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/riscv64-virt-pci.riscv64-latest.xml b/tests/qemuxml2xmloutdata/riscv64-virt-pci.riscv64-latest.xml deleted file mode 100644 index 7eda6081db..0000000000 --- a/tests/qemuxml2xmloutdata/riscv64-virt-pci.riscv64-latest.xml +++ /dev/null @@ -1,29 +0,0 @@ -<domain type='qemu'> - <name>riscv64</name> - <uuid>fd65fc03-8838-4c4d-9d8d-395802488790</uuid> - <memory unit='KiB'>2097152</memory> - <currentMemory unit='KiB'>2097152</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='riscv64' machine='virt'>hvm</type> - <kernel>/var/lib/libvirt/images/riscv64.bbl</kernel> - <cmdline>root=/dev/vda</cmdline> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-riscv64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/riscv64.qcow2'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> - </disk> - <controller type='pci' index='0' model='pcie-root'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/riscv64-virt.riscv64-latest.xml b/tests/qemuxml2xmloutdata/riscv64-virt.riscv64-latest.xml deleted file mode 100644 index 8a5c5dd985..0000000000 --- a/tests/qemuxml2xmloutdata/riscv64-virt.riscv64-latest.xml +++ /dev/null @@ -1,38 +0,0 @@ -<domain type='qemu'> - <name>riscv64</name> - <uuid>fd65fc03-8838-4c4d-9d8d-395802488790</uuid> - <memory unit='KiB'>2097152</memory> - <currentMemory unit='KiB'>2097152</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='riscv64' machine='virt'>hvm</type> - <kernel>/var/lib/libvirt/images/bbl</kernel> - <cmdline>console=ttyS0 ro root=/dev/vda</cmdline> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-riscv64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/var/lib/libvirt/images/stage4-disk.img'/> - <target dev='vda' bus='virtio'/> - <address type='virtio-mmio'/> - </disk> - <serial type='pty'> - <target type='system-serial' port='0'> - <model name='16550a'/> - </target> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='virtio-mmio'/> - </memballoon> - </devices> -</domain> -- 2.43.0