[Xen-changelog] [xen-unstable] HVM: Allow qemu monitor to be configured in domain config file.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1176380486 -3600
# Node ID 8f7f29f718a65e4a7a0f5d57f5cfc019a6f8cd93
# Parent  887fa548f65082a870068df6f748efde161bbb41
HVM: Allow qemu monitor to be configured in domain config file.
From: Yongkang You <yongkang.you@xxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/examples/xmexample.hvm        |    6 ++++++
 tools/examples/xmexample.vti        |    5 +++++
 tools/python/README.XendConfig      |    1 +
 tools/python/README.sxpcfg          |    1 +
 tools/python/xen/xend/XendConfig.py |    2 +-
 tools/python/xen/xend/image.py      |    2 ++
 tools/python/xen/xm/create.py       |    4 ++++
 7 files changed, 20 insertions(+), 1 deletion(-)

diff -r 887fa548f650 -r 8f7f29f718a6 tools/examples/xmexample.hvm
--- a/tools/examples/xmexample.hvm      Thu Apr 12 13:18:08 2007 +0100
+++ b/tools/examples/xmexample.hvm      Thu Apr 12 13:21:26 2007 +0100
@@ -170,6 +170,12 @@ serial='pty'
 
 
 #-----------------------------------------------------------------------------
+#   Qemu Monitor, default is disable
+#   Use ctrl-alt-2 to connect
+#monitor=1
+
+
+#-----------------------------------------------------------------------------
 #   enable sound card support, [sb16|es1370|all|..,..], default none
 #soundhw='sb16'
 
diff -r 887fa548f650 -r 8f7f29f718a6 tools/examples/xmexample.vti
--- a/tools/examples/xmexample.vti      Thu Apr 12 13:18:08 2007 +0100
+++ b/tools/examples/xmexample.vti      Thu Apr 12 13:21:26 2007 +0100
@@ -113,6 +113,11 @@ serial='pty'
 serial='pty'
 
 #-----------------------------------------------------------------------------
+#   Qemu Monitor, default is disable
+#   Use ctrl-alt-2 to connect
+#monitor=1
+
+#-----------------------------------------------------------------------------
 #   enable sound card support, [sb16|es1370|all|..,..], default none
 #soundhw='sb16'
 
diff -r 887fa548f650 -r 8f7f29f718a6 tools/python/README.XendConfig
--- a/tools/python/README.XendConfig    Thu Apr 12 13:18:08 2007 +0100
+++ b/tools/python/README.XendConfig    Thu Apr 12 13:21:26 2007 +0100
@@ -115,6 +115,7 @@ otherConfig
                                 image.nographic
                                 image.vnc
                                 image.sdl
+                                image.monitor
                                 image.vncdisplay
                                 image.vncunused
                                 image.hvm.device_model
diff -r 887fa548f650 -r 8f7f29f718a6 tools/python/README.sxpcfg
--- a/tools/python/README.sxpcfg        Thu Apr 12 13:18:08 2007 +0100
+++ b/tools/python/README.sxpcfg        Thu Apr 12 13:21:26 2007 +0100
@@ -63,6 +63,7 @@ image
   - fdb
   - soundhw
   - localtime
+  - monitor
   - serial
   - stdvga
   - isa
diff -r 887fa548f650 -r 8f7f29f718a6 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Thu Apr 12 13:18:08 2007 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Thu Apr 12 13:21:26 2007 +0100
@@ -117,7 +117,7 @@ LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(
 
 # Platform configuration keys.
 XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display', 
-                        'fda', 'fdb', 'keymap', 'isa', 'localtime',
+                        'fda', 'fdb', 'keymap', 'isa', 'localtime', 'monitor', 
                         'nographic', 'pae', 'rtc_timeoffset', 'serial', 'sdl',
                         'soundhw','stdvga', 'usb', 'usbdevice', 'vnc',
                         'vncconsole', 'vncdisplay', 'vnclisten',
diff -r 887fa548f650 -r 8f7f29f718a6 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Thu Apr 12 13:18:08 2007 +0100
+++ b/tools/python/xen/xend/image.py    Thu Apr 12 13:21:26 2007 +0100
@@ -415,6 +415,8 @@ class HVMImageHandler(ImageHandler):
         else:
             ret.append('-nographic')
 
+        if int(vmConfig['platform'].get('monitor', 0)) != 0:
+            ret.append('-monitor vc')
         return ret
 
     def createDeviceModel(self, restore = False):
diff -r 887fa548f650 -r 8f7f29f718a6 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Thu Apr 12 13:18:08 2007 +0100
+++ b/tools/python/xen/xm/create.py     Thu Apr 12 13:21:26 2007 +0100
@@ -420,6 +420,10 @@ gopts.var('serial', val='FILE',
 gopts.var('serial', val='FILE',
           fn=set_value, default='',
           use="Path to serial or pty or vc")
+
+gopts.var('monitor', val='no|yes',
+          fn=set_bool, default=0,
+          use="""Should the device model use monitor?""")
 
 gopts.var('localtime', val='no|yes',
           fn=set_bool, default=0,

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog