# HG changeset patch
# User kasai.takanori@jp.fujitsu.com
# Date 1170140406 -32400
# Node ID 96a4fa3aab04ffcdb3fdeb0fc61d10b5203ebbd7
# Parent  5bb0840984936749b4e99f53931d72a8579d302c
Fix to set keyboard layout of PVFB from configuration file

Signed-off-by: Takanori Kasai <kasai.takanori@jp.fujitsu.com>

diff -r 5bb084098493 -r 96a4fa3aab04 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py	Mon Jan 29 13:22:21 2007 +0000
+++ b/tools/python/xen/xm/create.py	Tue Jan 30 16:00:06 2007 +0900
@@ -594,9 +594,9 @@ def configure_vfbs(config_devs, vals):
                           'xauthority', 'type', 'vncpasswd' ]:
                 err("configuration option %s unknown to vfbs" % k)
             config.append([k,v])
-        for n in iter(dir(vals)):
-            if n == "keymap":
-               config.append(['keymap',vals.keymap])
+        if not d.has_key("keymap"):
+            if vals.keymap:
+                config.append(['keymap',vals.keymap])
         if not d.has_key("display") and os.environ.has_key("DISPLAY"):
             config.append(["display", os.environ['DISPLAY']])
         if not d.has_key("xauthority"):