[Xen-changelog] [xen-unstable] Fix VNC server after HVM save/restore/migrate, when no vncpasswd specified.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1188313126 -3600
# Node ID 2aee2e4eacc83fc6baa192cdf41ea301d970d90d
# Parent  f4a0804d18f984c81f6b597960dca849cfcd7fb9
Fix VNC server after HVM save/restore/migrate, when no vncpasswd specified.

The basic problem was that the "image" section of the sxp had a "None"
in it, which means that on the restore (either on the local machine or
remote machine), the vnc server in the qemu device model literally
needed the string "None" to properly connect.  This simple patch only
puts a vncpasswd entry in the image if it is *not* None in the python
code, thus avoiding the whole issue.

Signed-off-by: Chris Lalancette <clalance@xxxxxxxxxx>
---
 tools/python/xen/xm/create.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r f4a0804d18f9 -r 2aee2e4eacc8 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Tue Aug 28 15:44:19 2007 +0100
+++ b/tools/python/xen/xm/create.py     Tue Aug 28 15:58:46 2007 +0100
@@ -725,7 +725,8 @@ def configure_hvm(config_image, vals):
     for a in args:
         if a in vals.__dict__ and vals.__dict__[a] is not None:
             config_image.append([a, vals.__dict__[a]])
-    config_image.append(['vncpasswd', vals.vncpasswd])
+    if vals.vncpasswd is not None:
+        config_image.append(['vncpasswd', vals.vncpasswd])
 
 
 def make_config(vals):

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