1.1 --- a/tools/examples/xmexample.vmx	Thu Aug 25 11:18:47 2005 -0700
     1.2 +++ b/tools/examples/xmexample.vmx	Thu Aug 25 12:24:48 2005 -0700
     1.3 @@ -73,6 +73,10 @@ sdl=0
     1.4  vnc=1
     1.5  
     1.6  #----------------------------------------------------------------------------
     1.7 +# enable spawning vncviewer(only valid when vnc=1), default = 1
     1.8 +vncviewer=1
     1.9 +
    1.10 +#----------------------------------------------------------------------------
    1.11  # no graphics, use serial port
    1.12  #nographic=0
    1.13  

     2.1 --- a/tools/python/xen/xm/create.py	Thu Aug 25 11:18:47 2005 -0700
     2.2 +++ b/tools/python/xen/xm/create.py	Thu Aug 25 12:24:48 2005 -0700
     2.3 @@ -103,12 +103,13 @@ gopts.opt('console_autoconnect', short='
     2.4            fn=set_true, default=0,
     2.5            use="Connect to the console after the domain is created.")
     2.6  
     2.7 -gopts.var('vnc', val='no|yes',
     2.8 +gopts.var('vncviewer', val='no|yes',
     2.9            fn=set_bool, default=None,
    2.10            use="""Spawn a vncviewer listening for a vnc server in the domain.
    2.11            The address of the vncviewer is passed to the domain on the kernel command
    2.12            line using 'VNC_SERVER=<host>:<port>'. The port used by vnc is 5500 + DISPLAY.
    2.13            A display value with a free port is chosen if possible.
    2.14 +	  Only valid when vnc=1.
    2.15            """)
    2.16  
    2.17  gopts.var('name', val='NAME',
    2.18 @@ -309,6 +310,10 @@ gopts.var('nographic', val='no|yes',
    2.19            fn=set_bool, default=0,
    2.20            use="Should device models use graphics?")
    2.21  
    2.22 +gopts.var('vnc', val='',
    2.23 +          fn=set_value, default=None,
    2.24 +          use="""Should the device model use VNC?""")
    2.25 +
    2.26  gopts.var('sdl', val='',
    2.27            fn=set_value, default=None,
    2.28            use="""Should the device model use SDL?""")
    2.29 @@ -442,7 +447,7 @@ def configure_vmx(opts, config_devs, val
    2.30      """
    2.31      args = [ 'memmap', 'device_model', 'cdrom',
    2.32   	     'boot', 'fda', 'fdb', 'localtime', 'serial', 'macaddr', 'stdvga', 
    2.33 -             'isa', 'nographic', 'vnc', 'sdl', 'display']	  
    2.34 +             'isa', 'nographic', 'vnc', 'vncviewer', 'sdl', 'display']	  
    2.35      for a in args:
    2.36  	if (vals.__dict__[a]):
    2.37      	    config_devs.append([a, vals.__dict__[a]])
    2.38 @@ -606,7 +611,7 @@ def preprocess_vnc(opts, vals):
    2.39      """If vnc was specified, spawn a vncviewer in listen mode
    2.40      and pass its address to the domain on the kernel command line.
    2.41      """
    2.42 -    if not vals.vnc or vals.dryrun: return
    2.43 +    if not (vals.vnc and vals.vncviewer) or vals.dryrun: return
    2.44      vnc_display = choose_vnc_display()
    2.45      if not vnc_display:
    2.46          opts.warn("No free vnc display")