233.1 --- a/tools/examples/xmexample.vmx	Thu Aug 25 11:18:47 2005 -0700
   233.2 +++ b/tools/examples/xmexample.vmx	Thu Aug 25 12:24:48 2005 -0700
   233.3 @@ -73,6 +73,10 @@ sdl=0
   233.4  vnc=1
   233.5  
   233.6  #----------------------------------------------------------------------------
   233.7 +# enable spawning vncviewer(only valid when vnc=1), default = 1
   233.8 +vncviewer=1
   233.9 +
  233.10 +#----------------------------------------------------------------------------
  233.11  # no graphics, use serial port
  233.12  #nographic=0
  233.13  

   342.1 --- a/tools/python/xen/xm/create.py	Thu Aug 25 11:18:47 2005 -0700
   342.2 +++ b/tools/python/xen/xm/create.py	Thu Aug 25 12:24:48 2005 -0700
   342.3 @@ -103,12 +103,13 @@ gopts.opt('console_autoconnect', short='
   342.4            fn=set_true, default=0,
   342.5            use="Connect to the console after the domain is created.")
   342.6  
   342.7 -gopts.var('vnc', val='no|yes',
   342.8 +gopts.var('vncviewer', val='no|yes',
   342.9            fn=set_bool, default=None,
  342.10            use="""Spawn a vncviewer listening for a vnc server in the domain.
  342.11            The address of the vncviewer is passed to the domain on the kernel command
  342.12            line using 'VNC_SERVER=<host>:<port>'. The port used by vnc is 5500 + DISPLAY.
  342.13            A display value with a free port is chosen if possible.
  342.14 +	  Only valid when vnc=1.
  342.15            """)
  342.16  
  342.17  gopts.var('name', val='NAME',
  342.18 @@ -309,6 +310,10 @@ gopts.var('nographic', val='no|yes',
  342.19            fn=set_bool, default=0,
  342.20            use="Should device models use graphics?")
  342.21  
  342.22 +gopts.var('vnc', val='',
  342.23 +          fn=set_value, default=None,
  342.24 +          use="""Should the device model use VNC?""")
  342.25 +
  342.26  gopts.var('sdl', val='',
  342.27            fn=set_value, default=None,
  342.28            use="""Should the device model use SDL?""")
  342.29 @@ -442,7 +447,7 @@ def configure_vmx(opts, config_devs, val
  342.30      """
  342.31      args = [ 'memmap', 'device_model', 'cdrom',
  342.32   	     'boot', 'fda', 'fdb', 'localtime', 'serial', 'macaddr', 'stdvga', 
  342.33 -             'isa', 'nographic', 'vnc', 'sdl', 'display']	  
  342.34 +             'isa', 'nographic', 'vnc', 'vncviewer', 'sdl', 'display']	  
  342.35      for a in args:
  342.36  	if (vals.__dict__[a]):
  342.37      	    config_devs.append([a, vals.__dict__[a]])
  342.38 @@ -606,7 +611,7 @@ def preprocess_vnc(opts, vals):
  342.39      """If vnc was specified, spawn a vncviewer in listen mode
  342.40      and pass its address to the domain on the kernel command line.
  342.41      """
  342.42 -    if not vals.vnc or vals.dryrun: return
  342.43 +    if not (vals.vnc and vals.vncviewer) or vals.dryrun: return
  342.44      vnc_display = choose_vnc_display()
  342.45      if not vnc_display:
  342.46          opts.warn("No free vnc display")