ia64/xen-unstable

changeset 15067:52a8d6387725

[qemu] Use qemu's -vnc option to specify the interface to listen on.
Domain config files still use the original syntax with vnc and vnclisten.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author Christian Limpach <Christian.Limpach@xensource.com>
date Thu May 10 15:02:05 2007 +0100 (2007-05-10)
parents 7da6d9c374be
children 5040a3ff50ee
files tools/python/xen/xend/image.py
line diff
     1.1 --- a/tools/python/xen/xend/image.py	Thu May 10 14:44:45 2007 +0100
     1.2 +++ b/tools/python/xen/xend/image.py	Thu May 10 15:02:05 2007 +0100
     1.3 @@ -387,18 +387,14 @@ class HVMImageHandler(ImageHandler):
     1.4                      if key in vmConfig['platform']:
     1.5                          vnc_config[key] = vmConfig['platform'][key]
     1.6  
     1.7 -            if not vnc_config.get('vncunused', 0) and \
     1.8 -                   vnc_config.get('vncdisplay', 0):
     1.9 -                vncdisplay = vnc_config.get('vncdisplay')
    1.10 -                ret.append('-vnc')
    1.11 -                ret.append(str(vncdisplay))
    1.12 -            else:
    1.13 -                ret.append('-vncunused')
    1.14 -
    1.15              vnclisten = vnc_config.get('vnclisten',
    1.16                                         xenopts().get_vnclisten_address())
    1.17 -            ret.append('-vnclisten')
    1.18 -            ret.append(str(vnclisten))
    1.19 +            vncdisplay = vnc_config.get('vncdisplay', 0)
    1.20 +            ret.append('-vnc')
    1.21 +            ret.append("%s:%d" % (vnclisten, vncdisplay))
    1.22 +            
    1.23 +            if vnc_config.get('vncunused', 0):
    1.24 +                ret.append('-vncunused')
    1.25  
    1.26              # Store vncpassword in xenstore
    1.27              vncpasswd = vnc_config.get('vncpasswd')