[libvirt] [PATCH 18/18] vz: always pass graphics address to sdk

Nikolay Shirokovskiy nshirokovskiy at virtuozzo.com
Wed Apr 20 14:05:45 UTC 2016


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 at virtuozzo.com>
---
 src/vz/vz_sdk.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 334b2d0..5a45e43 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -2780,12 +2780,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:
-- 
1.8.3.1




More information about the libvir-list mailing list