# HG changeset patch
# User kasai.takanori@xxxxxxxxxxxxxx
# Node ID 9c9dbc5df55717c7d52e54fd175990f96553808e
# Parent c677f4e756084a1499f6367a2b3e2c15f5b9e66d
Add to select keyboard layout
Signed-off-by: Takanori Kasai <Kasai.Takanori@xxxxxxxxxxxxxx>
---
tools/python/xen/xend/XendAPI.py | 7 +++++++
tools/python/xen/xend/XendConfig.py | 2 ++
tools/python/xen/xend/image.py | 5 ++---
tools/python/xen/xm/create.py | 6 +++++-
4 files changed, 16 insertions(+), 4 deletions(-)
diff -r c677f4e75608 -r 9c9dbc5df557 tools/python/xen/xend/XendAPI.py
--- a/tools/python/xen/xend/XendAPI.py Thu Nov 16 11:11:17 2006 +0000
+++ b/tools/python/xen/xend/XendAPI.py Thu Nov 16 13:13:55 2006 +0000
@@ -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(),
diff -r c677f4e75608 -r 9c9dbc5df557 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py Thu Nov 16 11:11:17 2006 +0000
+++ b/tools/python/xen/xend/XendConfig.py Thu Nov 16 13:13:55 2006 +0000
@@ -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',
diff -r c677f4e75608 -r 9c9dbc5df557 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Thu Nov 16 11:11:17 2006 +0000
+++ b/tools/python/xen/xend/image.py Thu Nov 16 13:13:55 2006 +0000
@@ -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().
diff -r c677f4e75608 -r 9c9dbc5df557 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py Thu Nov 16 11:11:17 2006 +0000
+++ b/tools/python/xen/xm/create.py Thu Nov 16 13:13:55 2006 +0000
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home