The last use was removed in 7b604379ba747cd8 when we deleted the old commandline parser. The same functionality is tested by 'serial-pty-chardev'. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/qemuxml2argvdata/serial-pty.args | 24 ----------------- tests/qemuxml2argvdata/serial-pty.xml | 36 -------------------------- 2 files changed, 60 deletions(-) delete mode 100644 tests/qemuxml2argvdata/serial-pty.args delete mode 100644 tests/qemuxml2argvdata/serial-pty.xml diff --git a/tests/qemuxml2argvdata/serial-pty.args b/tests/qemuxml2argvdata/serial-pty.args deleted file mode 100644 index be3ed2e30a..0000000000 --- a/tests/qemuxml2argvdata/serial-pty.args +++ /dev/null @@ -1,24 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=readline \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --serial pty diff --git a/tests/qemuxml2argvdata/serial-pty.xml b/tests/qemuxml2argvdata/serial-pty.xml deleted file mode 100644 index 4b441da13e..0000000000 --- a/tests/qemuxml2argvdata/serial-pty.xml +++ /dev/null @@ -1,36 +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-i686</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'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <serial type='pty'> - <target port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> -- 2.21.0

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

Commit fb973cfbb4de added versioned test outputs for the above mentioned tests but didn't actually enable them. Fix that mistake and fix the output of the tsc-frequency test. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args | 4 ++-- tests/qemuxml2argvtest.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args index a3b6e4e57e..b0e6d05b6c 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args @@ -14,8 +14,8 @@ QEMU_AUDIO_DRV=none \ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -machine pc-i440fx-4.0,accel=kvm,usb=off,dump-guest-core=off \ -cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc_adjust=on,\ -clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,\ -invtsc=on,tsc-frequency=3504000000 \ +clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on,invtsc=on,\ +tsc-frequency=3504000000 \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b7cb356d13..db79301f0e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1767,7 +1767,9 @@ mymain(void) DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM); DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM); DO_TEST("cpu-host-model-cmt", NONE); + DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0"); DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM); + DO_TEST_CAPS_VER("cpu-tsc-frequency", "4.0.0"); DO_TEST_CAPS_VER("cpu-translation", "4.0.0"); DO_TEST_CAPS_LATEST("cpu-translation"); qemuTestSetHostCPU(driver.caps, NULL); -- 2.21.0