diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-02-11 10:06:51 +0000 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-02-11 10:06:51 +0000 |
commit | 250e4ae1c7cd9b51ce0fe265d522dcb6379911a6 (patch) | |
tree | 800aeaa50c6128d82d4fee61ea573f5b682785ed /tools | |
parent | 0d037cb707a0a6c8d55c099f709420192359d8d4 (diff) | |
download | xen-250e4ae1c7cd9b51ce0fe265d522dcb6379911a6.tar.gz xen-250e4ae1c7cd9b51ce0fe265d522dcb6379911a6.tar.bz2 xen-250e4ae1c7cd9b51ce0fe265d522dcb6379911a6.zip |
domain builder: make vfb = [ 'type=sdl' ] work
When setting
vfb = [ 'type=sdl' ]
in a domain config file, qemu seems to be still using vnc. Make it use
sdl as expected.
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/python/xen/xend/image.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 02ea81c748..0519e32a26 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -91,12 +91,12 @@ class ImageHandler: ("image/cmdline", self.cmdline), ("image/ramdisk", self.ramdisk)) - self.dmargs = self.parseDeviceModelArgs(vmConfig) self.device_model = vmConfig['platform'].get('device_model') self.display = vmConfig['platform'].get('display') self.xauthority = vmConfig['platform'].get('xauthority') self.vncconsole = vmConfig['platform'].get('vncconsole') + self.dmargs = self.parseDeviceModelArgs(vmConfig) self.pid = None @@ -204,8 +204,14 @@ class ImageHandler: for dev_uuid in vmConfig['console_refs']: dev_type, dev_info = vmConfig['devices'][dev_uuid] if dev_type == 'vfb': - vnc_config = dev_info.get('other_config', {}) - has_vnc = True + vfb_type = dev_info.get('type', {}) + if vfb_type == 'sdl': + self.display = dev_info.get('display', {}) + self.xauthority = dev_info.get('xauthority', {}) + has_sdl = True + else: + vnc_config = dev_info.get('other_config', {}) + has_vnc = True break keymap = vmConfig['platform'].get("keymap") |