[Libvir] virsh vncdisplay fix

[John Levon]

On Thu, Jan 31, 2008 at 07:48:55PM +0000, Daniel P. Berrange wrote:

> I've just looked at the behaviour on Xen 3.2.0 and it doesn't match
> what you describe - there's always a type=vnc added even for legacy
> config syntax. So I think this must be a 3.0.4 specific XenD bug. I
> don't have any 3.0.4 installs available, so if you can send the full
> output of 'xm list --long {GUEST-NAME}' for the VM question I'll add
> the fix & a test case for the 3.0.4 style config.

Attached is the output in 3.0.4 (.xm) and in 3.1.2 (.xm2)

thanks
john
-------------- next part --------------
(domain
    (domid 1)
    (on_crash restart)
    (memory 1024)
    (uuid fde0533d-d043-88c6-dfba-4822fa32f309)
    (bootloader_args )
    (name s10u4)
    (maxmem 1040)
    (on_reboot restart)
    (on_poweroff destroy)
    (localtime 0)
    (vcpus 1)
    (bootloader )
    (shadow_memory 9)
    (cpu_weight 256)
    (cpu_cap 0)
    (features )
    (on_xend_start ignore)
    (on_xend_stop shutdown)
    (start_time 1201892461.79)
    (cpu_time 28.21916966)
    (online_vcpus 1)
    (image
        (hvm
            (kernel /usr/lib/xen/boot/hvmloader)
            (vnc 1)
            (vncunused 1)
            (device_model /usr/lib/xen/bin/qemu-dm)
            (pae 1)
            (boot c)
            (vcpus 1)
        )
    )
    (status 2)
    (memory_dynamic_min 1032)
    (memory_dynamic_max 1040)
    (state ------)
    (store_mfn 262142)
    (device
        (vif
            (mac 00:16:3e:3b:b9:d7)
            (uuid 33b87cce-c187-4bdd-8301-6411a48be129)
        )
    )
    (device
        (vbd
            (uname phy:/dev/zvol/dsk/export/s10u4-root)
            (driver paravirtualised)
            (mode w)
            (dev hda:disk)
            (uuid b1d5196f-aae7-74bb-43dc-b4aae943b9bd)
        )
    )
    (device (console (vnc-port 5900)))
)
-------------- next part --------------
(domain
    (domid 1)
    (on_crash restart)
    (uuid fde0533d-d043-88c6-dfba-4822fa32f309)
    (bootloader_args )
    (vcpus 1)
    (name s10u4)
    (on_poweroff destroy)
    (on_reboot restart)
    (bootloader )
    (maxmem 1024)
    (memory 1024)
    (shadow_memory 9)
    (cpu_weight 256)
    (cpu_cap 0)
    (features )
    (on_xend_start ignore)
    (on_xend_stop shutdown)
    (start_time 1201894394.0)
    (cpu_time 17.253230349)
    (online_vcpus 1)
    (image
        (hvm
            (kernel /usr/lib/xen/boot/hvmloader)
            (boot c)
            (device_model /usr/lib/xen/bin/qemu-dm)
            (keymap en-us)
            (localtime 0)
            (pae 1)
            (vnc 1)
            (vncunused 1)
            (notes (SUSPEND_CANCEL 1))
        )
    )
    (status 2)
    (state -b----)
    (store_mfn 262142)
    (device
        (vif
            (mac 00:16:3e:3b:b9:d7)
            (script vif-vnic)
            (uuid 33b87cce-c187-4bdd-8301-6411a48be129)
            (backend 0)
        )
    )
    (device
        (vbd
            (uname phy:/dev/zvol/dsk/export/s10u4-root)
            (uuid b1d5196f-aae7-74bb-43dc-b4aae943b9bd)
            (mode w)
            (dev hda:disk)
            (backend 0)
            (bootable 1)
        )
    )
    (device
        (vfb
            (vncunused 1)
            (uuid d45dfd90-c0e0-8851-8f14-f16ba9512d2d)
            (location localhost:5900)
        )
    )
    (device
        (console
            (protocol vt100)
            (location 3)
            (uuid 0248d3f7-f3ae-78e8-4829-ad51a6f94efd)
        )
    )
)