On Wed, 2015-11-18 at 18:19 +0300, Mikhail Feoktistov wrote:
In virtuozzo we support only en-us keymap for VMs and containers.
If keymap is specified than check that it's en-us, otherwise
show error message.
I thought we've done it already.
ACKed and pushed.
---
src/vz/vz_sdk.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 89c9e89..526c0f2 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -2220,10 +2220,11 @@ static int
prlsdkCheckGraphicsUnsupportedParams(virDomainDefPtr def)
return -1;
}
- if (gr->data.vnc.keymap != 0) {
+ if (gr->data.vnc.keymap != 0 &&
+ STRNEQ(gr->data.vnc.keymap, "en-us")) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("vz driver doesn't support "
- "keymap setting for VNC graphics."));
+ _("vz driver supports only "
+ "\"en-us\" keymap for VNC graphics."));
return -1;
}
--
Dmitry Guryanov