From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yosuke Iwamatsu <y-iwamatsu@ab.jp.nec.com>
Subject: [PATCH] Xend: Fix Handling of VNC Params
Date: Thu, 08 May 2008 17:58:00 +0900
Message-ID: <4822C098.4060006@ab.jp.nec.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------010501020206030906050402"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------010501020206030906050402
Content-Type: text/plain; charset=ISO-2022-JP
Content-Transfer-Encoding: 7bit

Sometimes vnc parameters 'vncdisplay' and 'vncunused' are stored as string,
so convert to integer in xend before qemu-dm execution.
And also set default=1 for 'vncunused', as directed at the comment of
config file.

Regards,
-----------------------
Yosuke Iwamatsu
        NEC Corporation


--------------010501020206030906050402
Content-Type: all/allfiles;
 name="vnc_params.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="vnc_params.patch"

Xend: Fix handling of vnc params.

Signed-off-by: Yosuke Iwamatsu <y-iwamatsu@ab.jp.nec.com>

diff -r 9a6ad687ec20 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py	Wed May 07 14:16:48 2008 +0100
+++ b/tools/python/xen/xend/image.py	Thu May 08 17:13:53 2008 +0900
@@ -294,11 +294,11 @@ class ImageHandler:
 
             vnclisten = vnc_config.get('vnclisten',
                                        XendOptions.instance().get_vnclisten_address())
-            vncdisplay = vnc_config.get('vncdisplay', 0)
+            vncdisplay = int(vnc_config.get('vncdisplay', 0))
             ret.append('-vnc')
             ret.append("%s:%s%s" % (vnclisten, vncdisplay, vncopts))
 
-            if vnc_config.get('vncunused', 0):
+            if int(vnc_config.get('vncunused', 1)) != 0:
                 ret.append('-vncunused')
 
         elif has_sdl:

--------------010501020206030906050402
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--------------010501020206030906050402--