External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

vz: support vnc password

Browse Source 
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
This commit is contained in:
Nikolay Shirokovskiy 2016-04-20 17:05:44 +03:00 committed by Maxim Nestratov
parent 4698b4e65c
commit 96ca48451a
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/vz/vz_sdk.c
View File

@ -1180,6 +1180,7 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def)
PRL_VM_REMOTE_DISPLAY_MODE vncMode; PRL_VM_REMOTE_DISPLAY_MODE vncMode;
PRL_UINT32 port; PRL_UINT32 port;
PRL_RESULT pret; PRL_RESULT pret;
char *passwd = NULL;
pret = PrlVmCfg_GetVNCMode(sdkdom, &vncMode); pret = PrlVmCfg_GetVNCMode(sdkdom, &vncMode);
prlsdkCheckRetGoto(pret, error); prlsdkCheckRetGoto(pret, error);
@ -1190,6 +1191,14 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def)
if (VIR_ALLOC(gr) < 0) if (VIR_ALLOC(gr) < 0)
goto error; goto error;
if (!(passwd = prlsdkGetStringParamVar(PrlVmCfg_GetVNCPassword, sdkdom)))
goto error;
if (*passwd != '\0') {
gr->data.vnc.auth.passwd = passwd;
passwd = NULL;
}
pret = PrlVmCfg_GetVNCPort(sdkdom, &port); pret = PrlVmCfg_GetVNCPort(sdkdom, &port);
prlsdkCheckRetGoto(pret, error); prlsdkCheckRetGoto(pret, error);
@ -1215,6 +1224,7 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def)
error: error:
virDomainGraphicsDefFree(gr); virDomainGraphicsDefFree(gr);
VIR_FREE(passwd);
return -1; return -1;
} }
@ -2748,6 +2758,9 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom,
prlsdkCheckRetExit(pret, -1); prlsdkCheckRetExit(pret, -1);
} }
pret = PrlVmCfg_SetVNCPassword(sdkdom, gr->data.vnc.auth.passwd ? : "");
prlsdkCheckRetExit(pret, -1);
if (gr->data.vnc.autoport) { if (gr->data.vnc.autoport) {
pret = PrlVmCfg_SetVNCMode(sdkdom, PRD_AUTO); pret = PrlVmCfg_SetVNCMode(sdkdom, PRD_AUTO);
prlsdkCheckRetGoto(pret, cleanup); prlsdkCheckRetGoto(pret, cleanup);