[Xen-changelog] [xen-unstable] xend: Do not overwrite xauthority and display with empty values

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1240477756 -3600
# Node ID cd92432a7af4f436b9a0a715ce88d294764aea2e
# Parent  c7d2f046aa29ab4416e6db8dbe70c5388b3acc00
xend: Do not overwrite xauthority and display with empty values

Display and xauthority vars are read from vmConfig['platform'] first,
then they are read again from dev_info.
However if the user does not set those variable in the config file,
dev_info won't contain them, hence we are going to overwrite the
current significant values with null.
This patch fixes the problem setting display and xauthority to the
current values if dev_info does not contain them.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/image.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r c7d2f046aa29 -r cd92432a7af4 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Thu Apr 23 10:08:04 2009 +0100
+++ b/tools/python/xen/xend/image.py    Thu Apr 23 10:09:16 2009 +0100
@@ -291,8 +291,8 @@ class ImageHandler:
                 if int(dev_info.get('sdl', 0)) != 0 :
                     has_sdl = True
                 if has_sdl:
-                    self.display = dev_info.get('display', {})
-                    self.xauthority = dev_info.get('xauthority', {})
+                    self.display = dev_info.get('display', self.display)
+                    self.xauthority = dev_info.get('xauthority', 
self.xauthority)
                     opengl = int(dev_info.get('opengl', opengl))
                 if has_vnc:
                     vnc_config = dev_info.get('other_config', {})

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