ia64/xen-unstable

changeset 15785:2aee2e4eacc8

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@redhat.com>
author kfraser@localhost.localdomain
date Tue Aug 28 15:58:46 2007 +0100 (2007-08-28)
parents f4a0804d18f9
children 505021d029eb
files tools/python/xen/xm/create.py
line diff
     1.1 --- a/tools/python/xen/xm/create.py	Tue Aug 28 15:44:19 2007 +0100
     1.2 +++ b/tools/python/xen/xm/create.py	Tue Aug 28 15:58:46 2007 +0100
     1.3 @@ -725,7 +725,8 @@ def configure_hvm(config_image, vals):
     1.4      for a in args:
     1.5          if a in vals.__dict__ and vals.__dict__[a] is not None:
     1.6              config_image.append([a, vals.__dict__[a]])
     1.7 -    config_image.append(['vncpasswd', vals.vncpasswd])
     1.8 +    if vals.vncpasswd is not None:
     1.9 +        config_image.append(['vncpasswd', vals.vncpasswd])
    1.10  
    1.11  
    1.12  def make_config(vals):