ia64/xen-unstable

changeset 13567:200a9c6deeb3

[PVFB] Set keyboard layout of PVFB from configuration file.

For example:
keymap = "ja"

Default remains en-us.

Signed-off-by: Takanori Kasai <kasai.takanori@jp.fujitsu.com>
Signed-off-by: Tomohiro Takahashi <takatom@tokyo.ssg.fujitsu.com>
Signed-off-by: Masami Watanabe <masami.watanabe@jp.fujitsu.com>
author kfraser@localhost.localdomain
date Mon Jan 22 16:27:03 2007 +0000 (2007-01-22)
parents b1c03f19a4ef
children dd55107d4a67
files tools/python/xen/xend/server/vfbif.py tools/python/xen/xm/create.py
line diff
     1.1 --- a/tools/python/xen/xend/server/vfbif.py	Mon Jan 22 16:26:00 2007 +0000
     1.2 +++ b/tools/python/xen/xend/server/vfbif.py	Mon Jan 22 16:27:03 2007 +0000
     1.3 @@ -14,7 +14,7 @@ def spawn_detached(path, args, env):
     1.4          os.waitpid(p, 0)
     1.5          
     1.6  CONFIG_ENTRIES = ['type', 'vncdisplay', 'vnclisten', 'vncpasswd', 'vncunused',
     1.7 -                  'display', 'xauthority']
     1.8 +                  'display', 'xauthority', 'keymap' ]
     1.9  
    1.10  class VfbifController(DevController):
    1.11      """Virtual frame buffer controller. Handles all vfb devices for a domain.
    1.12 @@ -68,6 +68,8 @@ class VfbifController(DevController):
    1.13              vnclisten = config.get("vnclisten",
    1.14                                     xen.xend.XendOptions.instance().get_vnclisten_address())
    1.15              args += [ "--listen", vnclisten ]
    1.16 +            if config.has_key("keymap"):
    1.17 +                args += ["-k", "%s" % config["keymap"]]
    1.18              spawn_detached(args[0], args + std_args, os.environ)
    1.19          elif t == "sdl":
    1.20              args = [xen.util.auxbin.pathTo("xen-sdlfb")]
     2.1 --- a/tools/python/xen/xm/create.py	Mon Jan 22 16:26:00 2007 +0000
     2.2 +++ b/tools/python/xen/xm/create.py	Mon Jan 22 16:27:03 2007 +0000
     2.3 @@ -594,6 +594,9 @@ def configure_vfbs(config_devs, vals):
     2.4                            'xauthority', 'type', 'vncpasswd' ]:
     2.5                  err("configuration option %s unknown to vfbs" % k)
     2.6              config.append([k,v])
     2.7 +        for n in iter(dir(vals)):
     2.8 +            if n == "keymap":
     2.9 +               config.append(['keymap',vals.keymap])
    2.10          if not d.has_key("display") and os.environ.has_key("DISPLAY"):
    2.11              config.append(["display", os.environ['DISPLAY']])
    2.12          if not d.has_key("xauthority"):