# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1213001271 -3600
# Node ID 37392df51f0bde7ce847c3879b812d1ee0026541
# Parent 6c5b9b355ce897936d84998b1fce99ad0f77156e
xm on xenapi: Fixes for rfb console.
- set 'vncunused' param default to 1
- add 'vncdisplay' param
- handle the case when sdl=1
Signed-off-by: Yosuke Iwamatsu <y-iwamatsu@xxxxxxxxxxxxx>
---
tools/python/xen/xend/XendConfig.py | 7 ++++---
tools/python/xen/xm/xenapi_create.py | 22 +++++++++++++++-------
2 files changed, 19 insertions(+), 10 deletions(-)
diff -r 6c5b9b355ce8 -r 37392df51f0b tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py Mon Jun 09 09:47:00 2008 +0100
+++ b/tools/python/xen/xend/XendConfig.py Mon Jun 09 09:47:51 2008 +0100
@@ -1407,12 +1407,13 @@ class XendConfig(dict):
dev_uuid = uuid.createString()
dev_info['uuid'] = dev_uuid
dev_info['protocol'] = cfg_xenapi.get('protocol', 'rfb')
- dev_info['other_config'] = cfg_xenapi.get('other_config', {})
+ console_other_config = cfg_xenapi.get('other_config', {})
+ dev_info['other_config'] = console_other_config
if dev_info['protocol'] == 'rfb':
# collapse other config into devinfo for things
# such as vncpasswd, vncunused, etc.
- dev_info.update(cfg_xenapi.get('other_config', {}))
- dev_info['type'] = 'vnc'
+ dev_info.update(console_other_config)
+ dev_info['type'] = console_other_config.get('type', 'vnc')
target['devices'][dev_uuid] = ('vfb', dev_info)
target['console_refs'].append(dev_uuid)
diff -r 6c5b9b355ce8 -r 37392df51f0b tools/python/xen/xm/xenapi_create.py
--- a/tools/python/xen/xm/xenapi_create.py Mon Jun 09 09:47:00 2008 +0100
+++ b/tools/python/xen/xm/xenapi_create.py Mon Jun 09 09:47:51 2008 +0100
@@ -792,11 +792,17 @@ class sxp2xml:
console = document.createElement("console")
console.attributes["protocol"] = "rfb"
console.appendChild(self.mk_other_config(
- "vncunused", str(get_child_by_name(image, "vncunused", "0")),
+ "type", "vnc",
+ document))
+ console.appendChild(self.mk_other_config(
+ "vncunused", str(get_child_by_name(image, "vncunused", "1")),
document))
console.appendChild(self.mk_other_config(
"vnclisten",
get_child_by_name(image, "vnclisten", "127.0.0.1"),
+ document))
+ console.appendChild(self.mk_other_config(
+ "vncdisplay", str(get_child_by_name(image, "vncdisplay", "0")),
document))
console.appendChild(self.mk_other_config(
"vncpasswd", get_child_by_name(image, "vncpasswd", ""),
@@ -804,16 +810,18 @@ class sxp2xml:
consoles.append(console)
if int(get_child_by_name(image, "sdl", "0")) == 1:
console = document.createElement("console")
- console.attributes["protocol"] = "sdl"
+ console.attributes["protocol"] = "rfb"
+ console.appendChild(self.mk_other_config(
+ "type", "sdl",
+ document))
console.appendChild(self.mk_other_config(
"display", get_child_by_name(image, "display", ""),
document))
console.appendChild(self.mk_other_config(
- "xauthority",
- get_child_by_name(image, "vxauthority", "127.0.0.1"),
- document))
- console.appendChild(self.mk_other_config(
- "opengl", get_child_by_name(image, "opengl", "1"),
+ "xauthority", get_child_by_name(image, "xauthority", ""),
+ document))
+ console.appendChild(self.mk_other_config(
+ "opengl", str(get_child_by_name(image, "opengl", "1")),
document))
consoles.append(console)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home