[libvirt PATCHv2 1/7] tests: remove disks from spice tests

Reduce the churn in following patches. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; Reviewed-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- .../graphics-spice-agent-file-xfer.args | 2 -- .../graphics-spice-agent-file-xfer.xml | 5 ----- .../qemuxml2argvdata/graphics-spice-agentmouse.args | 2 -- .../qemuxml2argvdata/graphics-spice-agentmouse.xml | 5 ----- .../graphics-spice-compression.args | 2 -- .../qemuxml2argvdata/graphics-spice-compression.xml | 5 ----- .../graphics-spice-egl-headless.args | 2 -- .../graphics-spice-egl-headless.xml | 5 ----- .../graphics-spice-invalid-egl-headless.xml | 5 ----- tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 2 -- tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml | 5 ----- tests/qemuxml2argvdata/graphics-spice-sasl.args | 2 -- tests/qemuxml2argvdata/graphics-spice-sasl.xml | 6 ------ tests/qemuxml2argvdata/graphics-spice-timeout.args | 4 ---- tests/qemuxml2argvdata/graphics-spice-timeout.xml | 13 ------------- tests/qemuxml2argvdata/graphics-spice.args | 2 -- tests/qemuxml2argvdata/graphics-spice.xml | 5 ----- .../graphics-spice-compression.xml | 6 ------ .../graphics-spice-egl-headless.xml | 6 ------ tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml | 6 ------ tests/qemuxml2xmloutdata/graphics-spice-timeout.xml | 13 ------------- tests/qemuxml2xmloutdata/graphics-spice.xml | 6 ------ 22 files changed, 109 deletions(-) diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args index a40ecdfb64..5a01f17ec4 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args @@ -25,8 +25,6 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot strict=on \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer=on,seamless-migration=on \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml index 2ef19b1cf9..bf1ce6bca2 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml @@ -14,11 +14,6 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='block' device='disk'> - <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'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args index af80edd5c6..6e9aeb0878 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args @@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \ -boot strict=on \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -chardev spicevmc,id=charchannel0,name=vdagent \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml b/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml index f6a28d6d4c..45c65b50d0 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml @@ -13,11 +13,6 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='block' device='disk'> - <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='virtio-serial' index='1'> diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args index 4f939a7f08..fc5c8f97fb 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/graphics-spice-compression.args @@ -25,8 +25,6 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot strict=on \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,seamless-migration=on \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.xml b/tests/qemuxml2argvdata/graphics-spice-compression.xml index 2d2bae8bc2..bbd4bc3e16 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.xml +++ b/tests/qemuxml2argvdata/graphics-spice-compression.xml @@ -14,11 +14,6 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='block' device='disk'> - <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'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args index 9410251dfc..f0fb493a41 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args @@ -25,8 +25,6 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot strict=on \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,addr=127.0.0.1,seamless-migration=on \ -display egl-headless \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml b/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml index dd771dcf3a..ca30a19405 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml @@ -14,11 +14,6 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='block' device='disk'> - <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'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml b/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml index 39f94c35bb..b3097d9974 100644 --- a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml +++ b/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml @@ -14,11 +14,6 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='block' device='disk'> - <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'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args index b3c5395835..13144632d9 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args @@ -25,8 +25,6 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot strict=on \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,seamless-migration=on \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml index 64c48fcbe1..98c58d68ef 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml @@ -14,11 +14,6 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='block' device='disk'> - <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'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args index b95381ae1e..42cbbbb568 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args @@ -26,8 +26,6 @@ SASL_CONF_PATH=/root/.sasl2 \ -no-acpi \ -boot strict=on \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,sasl=on,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,seamless-migration=on \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.xml b/tests/qemuxml2argvdata/graphics-spice-sasl.xml index 6b15807402..335f6d2c64 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.xml +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.xml @@ -14,12 +14,6 @@ <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'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args index 3bdba66427..b1c5bb5c70 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args @@ -26,10 +26,6 @@ QEMU_AUDIO_DRV=spice \ -boot menu=on,strict=on \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -usb \ --drive file=/var/lib/libvirt/images/f14.img,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=2 \ --drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ --device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ -netdev tap,fd=3,id=hostnet0 \ -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml b/tests/qemuxml2argvdata/graphics-spice-timeout.xml index d96f519bf8..065318651f 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml @@ -39,19 +39,6 @@ <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/f14.img'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw'/> - <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args index dd715c8ef4..f2b638fbbd 100644 --- a/tests/qemuxml2argvdata/graphics-spice.args +++ b/tests/qemuxml2argvdata/graphics-spice.args @@ -25,8 +25,6 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot strict=on \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-channel=inputs,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,disable-agent-file-xfer=on,seamless-migration=on \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/graphics-spice.xml b/tests/qemuxml2argvdata/graphics-spice.xml index 657b6ccbed..4154b993ba 100644 --- a/tests/qemuxml2argvdata/graphics-spice.xml +++ b/tests/qemuxml2argvdata/graphics-spice.xml @@ -14,11 +14,6 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='block' device='disk'> - <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'/> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml index 8772cd3343..385128b76a 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml @@ -14,12 +14,6 @@ <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> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml index eee55cbeeb..edf34439e9 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml @@ -14,12 +14,6 @@ <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> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml index 35038d128f..acd6610566 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml @@ -14,12 +14,6 @@ <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> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml index 63eba26668..bd0249df28 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml @@ -39,19 +39,6 @@ <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/f14.img'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw'/> - <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> diff --git a/tests/qemuxml2xmloutdata/graphics-spice.xml b/tests/qemuxml2xmloutdata/graphics-spice.xml index 81115dc4b5..b4af4f0820 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice.xml @@ -14,12 +14,6 @@ <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> -- 2.31.1