diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-08-28 15:58:46 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-08-28 15:58:46 +0100 |
| commit | 145dd4e0fb588f095e45d954abe3ebcc5327ae54 (patch) | |
| tree | 5a96addca8781db20f365250e6f2189e98f1e563 /tools | |
| parent | 62ba102d87382483324ed98556fe735c7fe2dd30 (diff) | |
| download | xen-145dd4e0fb588f095e45d954abe3ebcc5327ae54.tar.gz xen-145dd4e0fb588f095e45d954abe3ebcc5327ae54.tar.bz2 xen-145dd4e0fb588f095e45d954abe3ebcc5327ae54.zip | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/python/xen/xm/create.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index f4d056608b..96b542ac7f 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -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): |