From: Mikhail Feoktistov Date: Wed, 18 Nov 2015 15:19:07 +0000 (+0300) Subject: vz: allow only en-us keymap for VNC X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1158184f054d9a07aaf6b3bb919e13c85d4d57ac;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git vz: allow only en-us keymap for VNC 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. --- diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 89c9e89c7..526c0f234 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; }