[Xen-changelog] [xen-unstable] [qemu] Use qemu's -vnc option to specify the interface to listen on.

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

# HG changeset patch
# User Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
# Date 1178805725 -3600
# Node ID 52a8d63877254d2a145cefb5a1573999fa37df12
# Parent  7da6d9c374bef063a12dd52c9817a6499fe83190
[qemu] Use qemu's -vnc option to specify the interface to listen on.
Domain config files still use the original syntax with vnc and vnclisten.

Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/image.py |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff -r 7da6d9c374be -r 52a8d6387725 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Thu May 10 14:44:45 2007 +0100
+++ b/tools/python/xen/xend/image.py    Thu May 10 15:02:05 2007 +0100
@@ -387,18 +387,14 @@ class HVMImageHandler(ImageHandler):
                     if key in vmConfig['platform']:
                         vnc_config[key] = vmConfig['platform'][key]
 
-            if not vnc_config.get('vncunused', 0) and \
-                   vnc_config.get('vncdisplay', 0):
-                vncdisplay = vnc_config.get('vncdisplay')
-                ret.append('-vnc')
-                ret.append(str(vncdisplay))
-            else:
-                ret.append('-vncunused')
-
             vnclisten = vnc_config.get('vnclisten',
                                        xenopts().get_vnclisten_address())
-            ret.append('-vnclisten')
-            ret.append(str(vnclisten))
+            vncdisplay = vnc_config.get('vncdisplay', 0)
+            ret.append('-vnc')
+            ret.append("%s:%d" % (vnclisten, vncdisplay))
+            
+            if vnc_config.get('vncunused', 0):
+                ret.append('-vncunused')
 
             # Store vncpassword in xenstore
             vncpasswd = vnc_config.get('vncpasswd')

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