]> xenbits.xensource.com Git - libvirt.git/commitdiff
vz: always pass graphics address to sdk
authorNikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Wed, 20 Apr 2016 14:05:45 +0000 (17:05 +0300)
committerMaxim Nestratov <mnestratov@virtuozzo.com>
Sat, 25 Jun 2016 19:56:04 +0000 (22:56 +0300)
We need this because apply graphics functions is used on
update too. Also in case of NULL address resolve it to default
instead of error.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
src/vz/vz_sdk.c

index 5a48a46d7e13b48465e95cf2293745baec247dad..33bd5a56d1c4fcdd12fe4c18501419f8116772b3 100644 (file)
@@ -2772,12 +2772,10 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom,
         prlsdkCheckRetGoto(pret, cleanup);
     }
 
-    if ((glisten = virDomainGraphicsGetListen(gr, 0))) {
-        if (!glisten->address)
-            goto cleanup;
-        pret = PrlVmCfg_SetVNCHostName(sdkdom, glisten->address);
-        prlsdkCheckRetGoto(pret, cleanup);
-    }
+    glisten = virDomainGraphicsGetListen(gr, 0);
+    pret = PrlVmCfg_SetVNCHostName(sdkdom, glisten && glisten->address ?
+                                           glisten->address : "");
+    prlsdkCheckRetGoto(pret, cleanup);
 
     ret = 0;
  cleanup: