From 851a75157534eff9649c84e965c84291f0e2fc0c Mon Sep 17 00:00:00 2001 From: Nikolay Shirokovskiy Date: Wed, 20 Apr 2016 17:05:45 +0300 Subject: [PATCH] vz: always pass graphics address to sdk 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 --- 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 5a48a46d7e..33bd5a56d1 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -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: