ia64/xen-unstable

changeset 14826:8f7f29f718a6

HVM: Allow qemu monitor to be configured in domain config file.
From: Yongkang You <yongkang.you@intel.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Thu Apr 12 13:21:26 2007 +0100 (2007-04-12)
parents 887fa548f650
children a839e331f06f
files tools/examples/xmexample.hvm tools/examples/xmexample.vti tools/python/README.XendConfig tools/python/README.sxpcfg tools/python/xen/xend/XendConfig.py tools/python/xen/xend/image.py tools/python/xen/xm/create.py
line diff
     1.1 --- a/tools/examples/xmexample.hvm	Thu Apr 12 13:18:08 2007 +0100
     1.2 +++ b/tools/examples/xmexample.hvm	Thu Apr 12 13:21:26 2007 +0100
     1.3 @@ -170,6 +170,12 @@ serial='pty'
     1.4  
     1.5  
     1.6  #-----------------------------------------------------------------------------
     1.7 +#   Qemu Monitor, default is disable
     1.8 +#   Use ctrl-alt-2 to connect
     1.9 +#monitor=1
    1.10 +
    1.11 +
    1.12 +#-----------------------------------------------------------------------------
    1.13  #   enable sound card support, [sb16|es1370|all|..,..], default none
    1.14  #soundhw='sb16'
    1.15  
     2.1 --- a/tools/examples/xmexample.vti	Thu Apr 12 13:18:08 2007 +0100
     2.2 +++ b/tools/examples/xmexample.vti	Thu Apr 12 13:21:26 2007 +0100
     2.3 @@ -113,6 +113,11 @@ stdvga=0
     2.4  serial='pty'
     2.5  
     2.6  #-----------------------------------------------------------------------------
     2.7 +#   Qemu Monitor, default is disable
     2.8 +#   Use ctrl-alt-2 to connect
     2.9 +#monitor=1
    2.10 +
    2.11 +#-----------------------------------------------------------------------------
    2.12  #   enable sound card support, [sb16|es1370|all|..,..], default none
    2.13  #soundhw='sb16'
    2.14  
     3.1 --- a/tools/python/README.XendConfig	Thu Apr 12 13:18:08 2007 +0100
     3.2 +++ b/tools/python/README.XendConfig	Thu Apr 12 13:21:26 2007 +0100
     3.3 @@ -115,6 +115,7 @@ otherConfig
     3.4                                  image.nographic
     3.5                                  image.vnc
     3.6                                  image.sdl
     3.7 +                                image.monitor
     3.8                                  image.vncdisplay
     3.9                                  image.vncunused
    3.10                                  image.hvm.device_model
     4.1 --- a/tools/python/README.sxpcfg	Thu Apr 12 13:18:08 2007 +0100
     4.2 +++ b/tools/python/README.sxpcfg	Thu Apr 12 13:21:26 2007 +0100
     4.3 @@ -63,6 +63,7 @@ image
     4.4    - fdb
     4.5    - soundhw
     4.6    - localtime
     4.7 +  - monitor
     4.8    - serial
     4.9    - stdvga
    4.10    - isa
     5.1 --- a/tools/python/xen/xend/XendConfig.py	Thu Apr 12 13:18:08 2007 +0100
     5.2 +++ b/tools/python/xen/xend/XendConfig.py	Thu Apr 12 13:21:26 2007 +0100
     5.3 @@ -117,7 +117,7 @@ LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(
     5.4  
     5.5  # Platform configuration keys.
     5.6  XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display', 
     5.7 -                        'fda', 'fdb', 'keymap', 'isa', 'localtime',
     5.8 +                        'fda', 'fdb', 'keymap', 'isa', 'localtime', 'monitor', 
     5.9                          'nographic', 'pae', 'rtc_timeoffset', 'serial', 'sdl',
    5.10                          'soundhw','stdvga', 'usb', 'usbdevice', 'vnc',
    5.11                          'vncconsole', 'vncdisplay', 'vnclisten',
     6.1 --- a/tools/python/xen/xend/image.py	Thu Apr 12 13:18:08 2007 +0100
     6.2 +++ b/tools/python/xen/xend/image.py	Thu Apr 12 13:21:26 2007 +0100
     6.3 @@ -415,6 +415,8 @@ class HVMImageHandler(ImageHandler):
     6.4          else:
     6.5              ret.append('-nographic')
     6.6  
     6.7 +        if int(vmConfig['platform'].get('monitor', 0)) != 0:
     6.8 +            ret.append('-monitor vc')
     6.9          return ret
    6.10  
    6.11      def createDeviceModel(self, restore = False):
     7.1 --- a/tools/python/xen/xm/create.py	Thu Apr 12 13:18:08 2007 +0100
     7.2 +++ b/tools/python/xen/xm/create.py	Thu Apr 12 13:21:26 2007 +0100
     7.3 @@ -421,6 +421,10 @@ gopts.var('serial', val='FILE',
     7.4            fn=set_value, default='',
     7.5            use="Path to serial or pty or vc")
     7.6  
     7.7 +gopts.var('monitor', val='no|yes',
     7.8 +          fn=set_bool, default=0,
     7.9 +          use="""Should the device model use monitor?""")
    7.10 +
    7.11  gopts.var('localtime', val='no|yes',
    7.12            fn=set_bool, default=0,
    7.13            use="Is RTC set to localtime?")