[libvirt] [PATCH 3/5] tests: qemuxml2argv: Remove unused data for s390 keywrap

The last use was removed in 7b604379ba747cd8 when we deleted the old commandline parser. The argv generator tests are provided by: machine-aeskeywrap-on-caps machine-aeskeywrap-on-cap machine-aeskeywrap-off-caps machine-aeskeywrap-off-cap machine-deakeywrap-on-caps machine-deakeywrap-on-cap machine-deakeywrap-off-caps machine-deakeywrap-off-cap Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../machine-aeskeywrap-off-argv.args | 20 -------------- .../machine-aeskeywrap-off-argv.xml | 27 ------------------- .../machine-aeskeywrap-on-argv.args | 20 -------------- .../machine-aeskeywrap-on-argv.xml | 27 ------------------- .../machine-deakeywrap-off-argv.args | 20 -------------- .../machine-deakeywrap-off-argv.xml | 27 ------------------- .../machine-deakeywrap-on-argv.args | 20 -------------- .../machine-deakeywrap-on-argv.xml | 27 ------------------- .../machine-keywrap-none-argv.args | 20 -------------- .../machine-keywrap-none-argv.xml | 24 ----------------- 10 files changed, 232 deletions(-) delete mode 100644 tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.args delete mode 100644 tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.xml delete mode 100644 tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.args delete mode 100644 tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.xml delete mode 100644 tests/qemuxml2argvdata/machine-deakeywrap-off-argv.args delete mode 100644 tests/qemuxml2argvdata/machine-deakeywrap-off-argv.xml delete mode 100644 tests/qemuxml2argvdata/machine-deakeywrap-on-argv.args delete mode 100644 tests/qemuxml2argvdata/machine-deakeywrap-on-argv.xml delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-argv.args delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-argv.xml diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.args deleted file mode 100644 index c1609b1724..0000000000 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.args +++ /dev/null @@ -1,20 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\ -id=drive-virtio-disk0 diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.xml b/tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.xml deleted file mode 100644 index 0975d4a251..0000000000 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-argv.xml +++ /dev/null @@ -1,27 +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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='vda' bus='virtio'/> - </disk> - <memballoon model='none'/> - </devices> - <keywrap> - <cipher name='aes' state='off'/> - </keywrap> -</domain> diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.args deleted file mode 100644 index 775b48422f..0000000000 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.args +++ /dev/null @@ -1,20 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\ -id=drive-virtio-disk0 diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.xml b/tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.xml deleted file mode 100644 index 8aa8f8eea7..0000000000 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-argv.xml +++ /dev/null @@ -1,27 +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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='vda' bus='virtio'/> - </disk> - <memballoon model='none'/> - </devices> - <keywrap> - <cipher name='aes' state='on'/> - </keywrap> -</domain> diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-argv.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-argv.args deleted file mode 100644 index e35ab0f759..0000000000 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-argv.args +++ /dev/null @@ -1,20 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\ -id=drive-virtio-disk0 diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-argv.xml b/tests/qemuxml2argvdata/machine-deakeywrap-off-argv.xml deleted file mode 100644 index 90b6d9f670..0000000000 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-argv.xml +++ /dev/null @@ -1,27 +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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='vda' bus='virtio'/> - </disk> - <memballoon model='none'/> - </devices> - <keywrap> - <cipher name='dea' state='off'/> - </keywrap> -</domain> diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-argv.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-argv.args deleted file mode 100644 index 18dd415794..0000000000 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-argv.args +++ /dev/null @@ -1,20 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\ -id=drive-virtio-disk0 diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-argv.xml b/tests/qemuxml2argvdata/machine-deakeywrap-on-argv.xml deleted file mode 100644 index 76a6a51427..0000000000 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-argv.xml +++ /dev/null @@ -1,27 +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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='vda' bus='virtio'/> - </disk> - <memballoon model='none'/> - </devices> - <keywrap> - <cipher name='dea' state='on'/> - </keywrap> -</domain> diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-argv.args b/tests/qemuxml2argvdata/machine-keywrap-none-argv.args deleted file mode 100644 index 283e9b31c3..0000000000 --- a/tests/qemuxml2argvdata/machine-keywrap-none-argv.args +++ /dev/null @@ -1,20 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-ccw-virtio,accel=tcg \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\ -id=drive-virtio-disk0 diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-argv.xml b/tests/qemuxml2argvdata/machine-keywrap-none-argv.xml deleted file mode 100644 index 0a963a1d65..0000000000 --- a/tests/qemuxml2argvdata/machine-keywrap-none-argv.xml +++ /dev/null @@ -1,24 +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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='vda' bus='virtio'/> - </disk> - <memballoon model='none'/> - </devices> -</domain> -- 2.21.0