5:26 a.m.
There are a few files containing expected output for test cases
that no longer exist. Remove them.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
.../luks-disks-source-qcow2.args | 49 -------------------
.../qemuxml2xmloutdata/disk-virtio-queues.xml | 1 -
tests/qemuxml2xmloutdata/panic-isa.xml | 41 ----------------
3 files changed, 91 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.args
delete mode 120000 tests/qemuxml2xmloutdata/disk-virtio-queues.xml
delete mode 100644 tests/qemuxml2xmloutdata/panic-isa.xml
diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
deleted file mode 100644
index a0aa131ca5..0000000000
--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
+++ /dev/null
@@ -1,49 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-encryptdisk \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=encryptdisk,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
--m 1024 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--object
secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
file=/storage/guest_disks/encryptdisk,encrypt.format=luks,encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk0
\
--device
virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--object
secret,id=virtio-disk1-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
file=/storage/guest_disks/encryptdisk2,encrypt.format=luks,encrypt.key-secret=virtio-disk1-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk1
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
--object
secret,id=virtio-disk2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--object
secret,id=virtio-disk2-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,file.user=myname,file.password-secret=virtio-disk2-auth-secret0,encrypt.format=luks,encrypt.key-secret=virtio-disk2-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk2
\
--device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
--object
secret,id=virtio-disk3-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
file.driver=iscsi,file.portal=iscsi.example.com:3260,file.target=demo-target,file.lun=3,file.transport=tcp,encrypt.format=luks,encrypt.key-secret=virtio-disk3-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk3
\
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
--object
secret,id=virtio-disk4-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,encrypt.format=luks,encrypt.key-secret=virtio-disk4-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk4'
\
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,id=virtio-disk4 \
--object
secret,id=virtio-disk5-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
file=/storage/guest_disks/encryptdisk5,encrypt.format=luks,encrypt.key-secret=virtio-disk5-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk5
\
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk5,id=virtio-disk5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml
b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml
deleted file mode 120000
index d6773202b7..0000000000
--- a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/disk-virtio-queues.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/panic-isa.xml
b/tests/qemuxml2xmloutdata/panic-isa.xml
deleted file mode 100644
index e71386a886..0000000000
--- a/tests/qemuxml2xmloutdata/panic-isa.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>
- <os>
- <type arch='i686' machine='pc'>hvm</type>
- <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-i386</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <controller type='usb' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <controller type='fdc' index='0'/>
- <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='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
- </memballoon>
- <panic model='isa'>
- <address type='isa' iobase='0x505'/>
- </panic>
- </devices>
-</domain>
--
2.32.0