Skip to contentSkip to conversation

Add to select keyboard layout

PATCH Applied Kasai Takanori 2 participants 2 messages Nov 16, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add to select keyboard layout

Hi all,

We were testing on VTx domain.
I found the keyboard used for HVM Domain(VTx and VTi) is not able to selected. Because we can't use japanese keyboard(106) on Xen.
This patch solve this problem.

To select the keymap, configuration file is defined as follows.
keymap='ja'

The input keymap is input as an option of qemu-dm.
qemu-dm -k ja

The configuration of the default keymap was deleted. Because default keymap is en-us in qemu-dm, it is not necessary to specify option.

/tools/ioemu/vnc.c
-------
1328 int vnc_display_init(DisplayState *ds, int display, int find_unused,
struct sockaddr_in *addr)
1329 {
....
1345 if (!keyboard_layout)
1346 keyboard_layout = "en-us";

The part of XenAPI was added referring to other options. If there is any problem, please let me know.

Best regards,
Takanori Kasai

# HG changeset patch
# User [email protected]
# Node ID 6ae5d58cf54d930cfd1d4901754644e113582606 # Parent 6e22ba7217201f3c3d7219d824f7aa80cd431c36 Add to select keyboard layout

tools/python/xen/xend/XendAPI.py +7 -0
diff -r 6e22ba721720 -r 6ae5d58cf54d tools/python/xen/xend/XendAPI.py
@@ -591,6 +591,7 @@ class XendAPI:
                   'platform_localtime',
                   'platform_clock_offset',
                   'platform_enable_audio',
+                  'platform_keymap',
                   'builder',
                   'boot_method',
                   'kernel_kernel',
@@ -638,6 +639,7 @@ class XendAPI:
         'platform_localtime',
         'platform_clock_offset',
         'platform_enable_audio',
+        'platform_keymap',
         'builder',
         'boot_method',
         'kernel_kernel',
@@ -781,6 +783,10 @@ class XendAPI:
         return xen_api_todo()
     
     def vm_get_platform_enable_audio(self, session, vm_ref):
+        dom = XendDomain.instance().get_vm_by_uuid(vm_ref)
+        return xen_api_todo()
+    
+    def vm_get_platform_keymap(self, session, vm_ref):
         dom = XendDomain.instance().get_vm_by_uuid(vm_ref)
         return xen_api_todo()
     
@@ -981,6 +987,7 @@ class XendAPI:
             'platform_localtime': xeninfo.get_platform_localtime(),
             'platform_clock_offset': xeninfo.get_platform_clock_offset(),
             'platform_enable_audio': xeninfo.get_platform_enable_audio(),
+            'platform_keymap': xeninfo.get_platform_keymap(),
             'builder': xeninfo.get_builder(),
             'boot_method': xeninfo.get_boot_method(),
             'kernel_kernel': xeninfo.get_kernel_image(),
tools/python/xen/xend/XendConfig.py +2 -0
diff -r 6e22ba721720 -r 6ae5d58cf54d tools/python/xen/xend/XendConfig.py
@@ -60,6 +60,7 @@ XENAPI_HVM_CFG = {
     'platform_serial' : 'serial',
     'platform_localtime': 'localtime',
     'platform_enable_audio': 'soundhw',
+    'platform_keymap' : 'keymap',
 }    
 
 XENAPI_UNSUPPORTED_IN_LEGACY_CFG = [
@@ -82,6 +83,7 @@ XENAPI_UNSUPPORTED_IN_LEGACY_CFG = [
     'platform_localtime',
     'platform_clock_offset',
     'platform_enable_audio',
+    'platform_keymap',
     'builder',
     'grub_cmdline',
     'pci_bus',
tools/python/xen/xend/image.py +2 -3
diff -r 6e22ba721720 -r 6ae5d58cf54d tools/python/xen/xend/image.py
@@ -309,13 +309,14 @@ class HVMImageHandler(ImageHandler):
     def parseDeviceModelArgs(self, imageConfig, deviceConfig):
         dmargs = [ 'boot', 'fda', 'fdb', 'soundhw',
                    'localtime', 'serial', 'stdvga', 'isa', 'vcpus',
-                   'acpi', 'usb', 'usbdevice']
+                   'acpi', 'usb', 'usbdevice', 'keymap' ]
         ret = []
         for a in dmargs:
             v = sxp.child_value(imageConfig, a)
 
             # python doesn't allow '-' in variable names
             if a == 'stdvga': a = 'std-vga'
+            if a == 'keymap': a = 'k'
 
             # Handle booleans gracefully
             if a in ['localtime', 'std-vga', 'isa', 'usb', 'acpi']:
@@ -385,8 +386,6 @@ class HVMImageHandler(ImageHandler):
             else:
                 ret += ['-vnc', '%d' % vncdisplay]
 
-            ret += ['-k', 'en-us']
-
             vnclisten = sxp.child_value(config, 'vnclisten')
             if not(vnclisten):
                 vnclisten = (xen.xend.XendRoot.instance().
tools/python/xen/xm/create.py +5 -1
diff -r 6e22ba721720 -r 6ae5d58cf54d tools/python/xen/xm/create.py
@@ -386,6 +386,10 @@ gopts.var('localtime', val='no|yes',
 gopts.var('localtime', val='no|yes',
           fn=set_bool, default=0,
           use="Is RTC set to localtime?")
+
+gopts.var('keymap', val='FILE',
+          fn=set_value, default='',
+          use="Set keyboard layout used")
 
 gopts.var('usb', val='no|yes',
           fn=set_bool, default=0,
@@ -660,7 +664,7 @@ def configure_hvm(config_image, vals):
              'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw',
              'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten',
              'sdl', 'display', 'xauthority',
-             'acpi', 'usb', 'usbdevice' ]
+             'acpi', 'usb', 'usbdevice', 'keymap' ]
     for a in args:
         if (vals.__dict__[a]):
             config_image.append([a, vals.__dict__[a]])

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Applied
#1 lore raw
Quoted 11 lines · Kasai Takanori

Hi all,

We were testing on VTx domain.
I found the keyboard used for HVM Domain(VTx and VTi) is not able to selected.
Because we can't use japanese keyboard(106) on Xen.
This patch solve this problem.

To select the keymap, configuration file is defined as follows.
keymap='ja'

Quoted 6 lines

The input keymap is input as an option of qemu-dm.
qemu-dm -k ja

The configuration of the default keymap was deleted. Because default keymap is en-us in qemu-dm, it is not necessary to specify option.

Applied, thanks.

Ewan.