[libvirt] [PATCH 04/10] parallels: report that we support en-us keymap

Dmitry Guryanov dguryanov at parallels.com
Thu Dec 11 19:07:11 UTC 2014


---
 src/parallels/parallels_sdk.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index 83a28b7..fd20e1b 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -877,12 +877,14 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def)
     gr->data.vnc.autoport = (vncMode == PRD_AUTO);
     gr->type = VIR_DOMAIN_GRAPHICS_TYPE_VNC;
     gr->data.vnc.port = port;
-    gr->data.vnc.keymap = NULL;
     gr->data.vnc.socket = NULL;
     gr->data.vnc.auth.passwd = NULL;
     gr->data.vnc.auth.expires = false;
     gr->data.vnc.auth.connected = 0;
 
+    if (VIR_STRDUP(gr->data.vnc.keymap, "en-us") < 0)
+        goto error;
+
     if (VIR_ALLOC(gr->listens) < 0)
         goto error;
 
@@ -1952,7 +1954,7 @@ static int prlsdkCheckGraphicsUnsupportedParams(virDomainDefPtr def)
         return -1;
     }
 
-    if (gr->data.vnc.keymap != 0) {
+    if (gr->data.vnc.keymap != NULL && !STREQ(gr->data.vnc.keymap, "en-us")) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("Parallels Cloud Server doesn't support "
                          "keymap setting for VNC graphics."));
-- 
2.1.0




More information about the libvir-list mailing list