Skip to contentSkip to conversation

do not overwrite xauthority and display with empty values

PATCH New Stefano Stabellini 1 participant 1 message Apr 22, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

tools/python/xen/xend/image.py +2 -2
diff -r 286683c42fa0 tools/python/xen/xend/image.py
@@ -291,8 +291,8 @@
                 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', {})