ia64/xen-unstable

changeset 17023:f8b855ffa470

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>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Feb 11 10:06:51 2008 +0000 (2008-02-11)
parents fbbc0523779e
children 49f87f3c2cb8
files tools/python/xen/xend/image.py
line diff
     1.1 --- a/tools/python/xen/xend/image.py	Mon Feb 11 10:03:48 2008 +0000
     1.2 +++ b/tools/python/xen/xend/image.py	Mon Feb 11 10:06:51 2008 +0000
     1.3 @@ -91,12 +91,12 @@ class ImageHandler:
     1.4                          ("image/cmdline", self.cmdline),
     1.5                          ("image/ramdisk", self.ramdisk))
     1.6  
     1.7 -        self.dmargs = self.parseDeviceModelArgs(vmConfig)
     1.8          self.device_model = vmConfig['platform'].get('device_model')
     1.9  
    1.10          self.display = vmConfig['platform'].get('display')
    1.11          self.xauthority = vmConfig['platform'].get('xauthority')
    1.12          self.vncconsole = vmConfig['platform'].get('vncconsole')
    1.13 +        self.dmargs = self.parseDeviceModelArgs(vmConfig)
    1.14          self.pid = None
    1.15  
    1.16  
    1.17 @@ -204,8 +204,14 @@ class ImageHandler:
    1.18          for dev_uuid in vmConfig['console_refs']:
    1.19              dev_type, dev_info = vmConfig['devices'][dev_uuid]
    1.20              if dev_type == 'vfb':
    1.21 -                vnc_config = dev_info.get('other_config', {})
    1.22 -                has_vnc = True
    1.23 +                vfb_type = dev_info.get('type', {})
    1.24 +                if vfb_type == 'sdl':
    1.25 +                    self.display = dev_info.get('display', {})
    1.26 +                    self.xauthority = dev_info.get('xauthority', {})
    1.27 +                    has_sdl = True
    1.28 +                else:
    1.29 +                    vnc_config = dev_info.get('other_config', {})
    1.30 +                    has_vnc = True
    1.31                  break
    1.32  
    1.33          keymap = vmConfig['platform'].get("keymap")