[Xen-changelog] [xen-unstable] xend: Fix 'monitor' domain config parameter.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1261645187 0
# Node ID 020e7a7d447453e38c3563c9cb1b3d37ac5a8652
# Parent  07f98beddc185f950e5421945a074f3fa51d4662
xend: Fix 'monitor' domain config parameter.

Introduce new 'monitor_path' parameter, so that 'monitor' can revert
to its old type and meaning.

Fixes domain reboot and save/restore.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    3 ++-
 tools/python/xen/xend/image.py      |   10 ++++------
 tools/python/xen/xm/create.py       |   13 ++++++++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff -r 07f98beddc18 -r 020e7a7d4474 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Wed Dec 23 08:22:13 2009 +0000
+++ b/tools/python/xen/xend/XendConfig.py       Thu Dec 24 08:59:47 2009 +0000
@@ -145,7 +145,8 @@ XENAPI_PLATFORM_CFG_TYPES = {
     'keymap': str,
     'isa' : int,
     'localtime': int,
-    'monitor': str,
+    'monitor': int,
+    'monitor_path': str,
     'nographic': int,
     'nomigrate': int,
     'pae' : int,
diff -r 07f98beddc18 -r 020e7a7d4474 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Wed Dec 23 08:22:13 2009 +0000
+++ b/tools/python/xen/xend/image.py    Thu Dec 24 08:59:47 2009 +0000
@@ -371,13 +371,11 @@ class ImageHandler:
         if vmConfig['platform'].get('parallel'):
             ret = ret + ["-parallel", vmConfig['platform'].get('parallel')]
 
-        if type(vmConfig['platform'].get('monitor', 0)) is int:
-            if int(vmConfig['platform'].get('monitor', 0)) != 0:
+        if int(vmConfig['platform'].get('monitor', 0)) != 0:
+            if vmConfig['platform'].get('monitor_path'):
+                ret = ret + ['-monitor', 
vmConfig['platform'].get('monitor_path')]
+            else:
                 ret = ret + ['-monitor', 'vc']
-            else:
-                ret = ret + ['-monitor', 'null']
-        else:
-            ret = ret + ['-monitor', vmConfig['platform'].get('monitor', 0)]
 
         return ret
 
diff -r 07f98beddc18 -r 020e7a7d4474 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Wed Dec 23 08:22:13 2009 +0000
+++ b/tools/python/xen/xm/create.py     Thu Dec 24 08:59:47 2009 +0000
@@ -511,9 +511,13 @@ gopts.var('serial', val='FILE',
           fn=set_value, default='',
           use="Path to serial or pty or vc")
 
-gopts.var('monitor', val='0|1|FILE',
-          fn=set_value, default=1,
+gopts.var('monitor', val='no|yes',
+          fn=set_bool, default=0,
           use="""Should the device model use monitor?""")
+
+gopts.var('monitor_path', val='FILE',
+          fn=set_value, default='',
+          use="Non-default path to device model monitor")
 
 gopts.var('localtime', val='no|yes',
           fn=set_bool, default=0,
@@ -745,7 +749,10 @@ def configure_image(vals):
         config_image.append(['parallel', vals.parallel])
     if vals.serial:
         config_image.append(['serial', vals.serial])
-    if vals.monitor:
+    if vals.monitor_path:
+        config_image.append(['monitor_path', vals.monitor_path])
+        config_image.append(['monitor', 1])
+    elif vals.monitor:
         config_image.append(['monitor', vals.monitor])
     if vals.extra:
         config_image.append(['args', vals.extra])

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