Fix passing keymap parameter to xen-vncfb.

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

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index ac90ff177cb190989246e9cb115fcaac215d9ba8..450e3283d14fe2a1495a1cd25535a73b94e20512 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -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"):