From: "Kasai Takanori" Subject: [PATCH] Add to select keyboard layout Date: Thu, 16 Nov 2006 21:30:32 +0900 Message-ID: <36c201c7097b$02233e40$dab2220a@VF03007L> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_36BF_01C709C6.71F7D370" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. ------=_NextPart_000_36BF_01C709C6.71F7D370 Content-Type: text/plain; format=flowed; charset="iso-2022-jp"; reply-type=original Content-Transfer-Encoding: 7bit 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 ------=_NextPart_000_36BF_01C709C6.71F7D370 Content-Type: application/octet-stream; name="select_keymap.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="select_keymap.patch" # HG changeset patch=0A= # User kasai.takanori@jp.fujitsu.com=0A= # Node ID 6ae5d58cf54d930cfd1d4901754644e113582606=0A= # Parent 6e22ba7217201f3c3d7219d824f7aa80cd431c36=0A= Add to select keyboard layout=0A= =0A= Signed-off-by: Takanori Kasai =0A= =0A= diff -r 6e22ba721720 -r 6ae5d58cf54d tools/python/xen/xend/XendAPI.py=0A= --- a/tools/python/xen/xend/XendAPI.py Wed Nov 15 09:44:12 2006 +0000=0A= +++ b/tools/python/xen/xend/XendAPI.py Thu Nov 16 20:32:44 2006 +0900=0A= @@ -591,6 +591,7 @@ class XendAPI:=0A= 'platform_localtime',=0A= 'platform_clock_offset',=0A= 'platform_enable_audio',=0A= + 'platform_keymap',=0A= 'builder',=0A= 'boot_method',=0A= 'kernel_kernel',=0A= @@ -638,6 +639,7 @@ class XendAPI:=0A= 'platform_localtime',=0A= 'platform_clock_offset',=0A= 'platform_enable_audio',=0A= + 'platform_keymap',=0A= 'builder',=0A= 'boot_method',=0A= 'kernel_kernel',=0A= @@ -781,6 +783,10 @@ class XendAPI:=0A= return xen_api_todo()=0A= =0A= def vm_get_platform_enable_audio(self, session, vm_ref):=0A= + dom =3D XendDomain.instance().get_vm_by_uuid(vm_ref)=0A= + return xen_api_todo()=0A= + =0A= + def vm_get_platform_keymap(self, session, vm_ref):=0A= dom =3D XendDomain.instance().get_vm_by_uuid(vm_ref)=0A= return xen_api_todo()=0A= =0A= @@ -981,6 +987,7 @@ class XendAPI:=0A= 'platform_localtime': xeninfo.get_platform_localtime(),=0A= 'platform_clock_offset': = xeninfo.get_platform_clock_offset(),=0A= 'platform_enable_audio': = xeninfo.get_platform_enable_audio(),=0A= + 'platform_keymap': xeninfo.get_platform_keymap(),=0A= 'builder': xeninfo.get_builder(),=0A= 'boot_method': xeninfo.get_boot_method(),=0A= 'kernel_kernel': xeninfo.get_kernel_image(),=0A= diff -r 6e22ba721720 -r 6ae5d58cf54d tools/python/xen/xend/XendConfig.py=0A= --- a/tools/python/xen/xend/XendConfig.py Wed Nov 15 09:44:12 2006 +0000=0A= +++ b/tools/python/xen/xend/XendConfig.py Thu Nov 16 20:32:44 2006 +0900=0A= @@ -60,6 +60,7 @@ XENAPI_HVM_CFG =3D {=0A= 'platform_serial' : 'serial',=0A= 'platform_localtime': 'localtime',=0A= 'platform_enable_audio': 'soundhw',=0A= + 'platform_keymap' : 'keymap',=0A= } =0A= =0A= XENAPI_UNSUPPORTED_IN_LEGACY_CFG =3D [=0A= @@ -82,6 +83,7 @@ XENAPI_UNSUPPORTED_IN_LEGACY_CFG =3D [=0A= 'platform_localtime',=0A= 'platform_clock_offset',=0A= 'platform_enable_audio',=0A= + 'platform_keymap',=0A= 'builder',=0A= 'grub_cmdline',=0A= 'pci_bus',=0A= diff -r 6e22ba721720 -r 6ae5d58cf54d tools/python/xen/xend/image.py=0A= --- a/tools/python/xen/xend/image.py Wed Nov 15 09:44:12 2006 +0000=0A= +++ b/tools/python/xen/xend/image.py Thu Nov 16 20:32:44 2006 +0900=0A= @@ -309,13 +309,14 @@ class HVMImageHandler(ImageHandler):=0A= def parseDeviceModelArgs(self, imageConfig, deviceConfig):=0A= dmargs =3D [ 'boot', 'fda', 'fdb', 'soundhw',=0A= 'localtime', 'serial', 'stdvga', 'isa', 'vcpus',=0A= - 'acpi', 'usb', 'usbdevice']=0A= + 'acpi', 'usb', 'usbdevice', 'keymap' ]=0A= ret =3D []=0A= for a in dmargs:=0A= v =3D sxp.child_value(imageConfig, a)=0A= =0A= # python doesn't allow '-' in variable names=0A= if a =3D=3D 'stdvga': a =3D 'std-vga'=0A= + if a =3D=3D 'keymap': a =3D 'k'=0A= =0A= # Handle booleans gracefully=0A= if a in ['localtime', 'std-vga', 'isa', 'usb', 'acpi']:=0A= @@ -385,8 +386,6 @@ class HVMImageHandler(ImageHandler):=0A= else:=0A= ret +=3D ['-vnc', '%d' % vncdisplay]=0A= =0A= - ret +=3D ['-k', 'en-us']=0A= -=0A= vnclisten =3D sxp.child_value(config, 'vnclisten')=0A= if not(vnclisten):=0A= vnclisten =3D (xen.xend.XendRoot.instance().=0A= diff -r 6e22ba721720 -r 6ae5d58cf54d tools/python/xen/xm/create.py=0A= --- a/tools/python/xen/xm/create.py Wed Nov 15 09:44:12 2006 +0000=0A= +++ b/tools/python/xen/xm/create.py Thu Nov 16 20:32:44 2006 +0900=0A= @@ -386,6 +386,10 @@ gopts.var('localtime', val=3D'no|yes',=0A= gopts.var('localtime', val=3D'no|yes',=0A= fn=3Dset_bool, default=3D0,=0A= use=3D"Is RTC set to localtime?")=0A= +=0A= +gopts.var('keymap', val=3D'FILE',=0A= + fn=3Dset_value, default=3D'',=0A= + use=3D"Set keyboard layout used")=0A= =0A= gopts.var('usb', val=3D'no|yes',=0A= fn=3Dset_bool, default=3D0,=0A= @@ -660,7 +664,7 @@ def configure_hvm(config_image, vals):=0A= 'localtime', 'serial', 'stdvga', 'isa', 'nographic', = 'soundhw',=0A= 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', = 'vnclisten',=0A= 'sdl', 'display', 'xauthority',=0A= - 'acpi', 'usb', 'usbdevice' ]=0A= + 'acpi', 'usb', 'usbdevice', 'keymap' ]=0A= for a in args:=0A= if (vals.__dict__[a]):=0A= config_image.append([a, vals.__dict__[a]])=0A= ------=_NextPart_000_36BF_01C709C6.71F7D370 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel ------=_NextPart_000_36BF_01C709C6.71F7D370--