提交 96ca4845 编写于 作者: N Nikolay Shirokovskiy 提交者: Maxim Nestratov

vz: support vnc password

Signed-off-by: NNikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
上级 4698b4e6
...@@ -1180,6 +1180,7 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) ...@@ -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) ...@@ -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) ...@@ -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, ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册