[libvirt] [PATCH 1/2] test: Don't assume VNC is always available

Osier Yang jyang at redhat.com
Mon Oct 22 09:34:29 UTC 2012


On 2012年10月20日 03:40, Doug Goldstein wrote:
> Several tests assume that VNC is always available and include it in
> their configs and the expected command line. The tests have nothing to
> do with graphics display so they shouldn't rely on VNC.
> ---
>   tests/qemuxml2argvdata/qemuxml2argv-bios.args      |    6 +++---
>   tests/qemuxml2argvdata/qemuxml2argv-bios.xml       |    4 ----
>   .../qemuxml2argv-disk-copy_on_read.args            |    6 +++---
>   .../qemuxml2argv-disk-copy_on_read.xml             |    5 -----
>   .../qemuxml2argv-disk-ioeventfd.args               |    6 +++---
>   .../qemuxml2argv-disk-ioeventfd.xml                |    5 -----
>   tests/qemuxml2argvdata/qemuxml2argv-event_idx.args |    6 +++---
>   tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml  |    8 --------
>   .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args  |    6 +++---
>   tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml |    8 --------
>   10 files changed, 15 insertions(+), 45 deletions(-)
>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args
> index ac98000..89b0f7f 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args
> @@ -1,7 +1,7 @@
> -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
>   /usr/bin/qemu -S -M pc -bios /usr/share/seabios/bios.bin \
> --m 1024 -smp 1 -nodefaults -device sga \
> +-m 1024 -smp 1 -nographic -nodefaults -device sga \
>   -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>   -hda /dev/HostVG/QEMUGuest1 -serial pty \
> --usb -device usb-tablet,id=input0 -vnc 127.0.0.1:0 \
> +-usb -device usb-tablet,id=input0 \
>   -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml
> index d1795f6..52acba4 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml
> @@ -32,10 +32,6 @@
>       </console>
>       <input type='tablet' bus='usb'/>
>       <input type='mouse' bus='ps2'/>
> -<graphics type='vnc' port='5900' autoport='no' listen='127.0.0.1'/>
> -<video>
> -<model type='cirrus' vram='9216' heads='1'/>
> -</video>
>       <memballoon model='virtio'/>
>     </devices>
>   </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
> index 2ca586d..6f692eb 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
> @@ -1,5 +1,5 @@
> -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nodefaults \
> +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> +/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \
>   -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \
>   -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
>   -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,copy-on-read=on \
> @@ -7,5 +7,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
>   -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
>   -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
>   -device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
> --net user,vlan=0,name=hostnet0 -serial pty -usb -vnc 127.0.0.1:-809 -std-vga \
> +-net user,vlan=0,name=hostnet0 -serial pty -usb \
>   -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml
> index 3034647..0834cf2 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml
> @@ -42,10 +42,5 @@
>       <console type='pty'>
>         <target type='serial' port='0'/>
>       </console>
> -<graphics type='vnc' port='5091' autoport='no' listen='127.0.0.1'/>
> -<video>
> -<model type='vga' vram='9216' heads='1'/>
> -<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
> -</video>
>     </devices>
>   </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
> index 2f4e7fd..14cbfb9 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
> @@ -1,5 +1,5 @@
> -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nodefaults \
> +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> +/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \
>   -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \
>   -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
>   -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
> @@ -7,5 +7,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
>   -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
>   -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
>   -device virtio-net-pci,tx=bh,ioeventfd=off,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
> --net user,vlan=0,name=hostnet0 -serial pty -usb -vnc 127.0.0.1:-809 -std-vga \
> +-net user,vlan=0,name=hostnet0 -serial pty -usb \
>   -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml
> index 7e2f40a..edfa731 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml
> @@ -42,10 +42,5 @@
>       <console type='pty'>
>         <target type='serial' port='0'/>
>       </console>
> -<graphics type='vnc' port='5091' autoport='no' listen='127.0.0.1'/>
> -<video>
> -<model type='vga' vram='9216' heads='1'/>
> -<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
> -</video>
>     </devices>
>   </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
> index a506274..0e5c0c3 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
> @@ -1,5 +1,5 @@
> -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nodefaults \
> +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> +/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \
>   -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \
>   -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
>   -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
> @@ -7,5 +7,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
>   -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
>   -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
>   -device virtio-net-pci,event_idx=off,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
> --net user,vlan=0,name=hostnet0 -serial pty -usb -vnc 127.0.0.1:-809 -std-vga \
> +-net user,vlan=0,name=hostnet0 -serial pty -usb \
>   -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml
> index d50af0b..22e388f 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml
> @@ -45,14 +45,6 @@
>       <console type='pty'>
>         <target type='serial' port='0'/>
>       </console>
> -<input type='mouse' bus='ps2'/>
> -<graphics type='vnc' port='5091' autoport='no' listen='127.0.0.1'>
> -<listen type='address' address='127.0.0.1'/>
> -</graphics>
> -<video>
> -<model type='vga' vram='9216' heads='1'/>
> -<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
> -</video>
>       <memballoon model='virtio'/>
>     </devices>
>   </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
> index b229f2a..dbf329d 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
> @@ -1,5 +1,5 @@
> -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nodefaults \
> +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> +/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \
>   -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \
>   -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
>   -drive file=/dev/sdfake,if=none,id=drive-virtio-disk0 \
> @@ -7,5 +7,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
>   -drive file=/dev/sdfake2,if=none,id=drive-virtio-disk1 \
>   -device virtio-blk-pci,scsi=on,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
>   -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
> --net user,vlan=0,name=hostnet0 -serial pty -usb -vnc 127.0.0.1:-809 -std-vga \
> +-net user,vlan=0,name=hostnet0 -serial pty -usb \
>   -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml
> index d33534a..c4f0079 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml
> @@ -44,14 +44,6 @@
>       <console type='pty'>
>         <target type='serial' port='0'/>
>       </console>
> -<input type='mouse' bus='ps2'/>
> -<graphics type='vnc' port='5091' autoport='no' listen='127.0.0.1'>
> -<listen type='address' address='127.0.0.1'/>
> -</graphics>
> -<video>
> -<model type='vga' vram='9216' heads='1'/>
> -<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
> -</video>
>       <memballoon model='virtio'/>
>     </devices>
>   </domain>


ACK.




More information about the libvir-list mailing list