External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-26 14:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vz: move getting container video devices out from vnc code

Browse Source 
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
This commit is contained in:
Nikolay Shirokovskiy 2016-04-20 17:05:41 +03:00 committed by Maxim Nestratov
parent 3a622f6b32
commit e7878d4623
1 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/vz/vz_sdk.c
View File

@ -474,7 +474,33 @@ prlsdkDomObjFreePrivate(void *p)
}; };
static int static int
prlsdkAddDomainVideoInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) prlsdkAddDomainVideoInfoCt(virDomainDefPtr def)
{
virDomainVideoDefPtr video = NULL;
int ret = -1;
if (def->ngraphics == 0)
return 0;
if (VIR_ALLOC(video) < 0)
goto cleanup;
video->type = VIR_DOMAIN_VIDEO_TYPE_PARALLELS;
video->vram = 0;
video->heads = 1;
if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0)
goto cleanup;
ret = 0;
cleanup:
virDomainVideoDefFree(video);
return ret;
}
static int
prlsdkAddDomainVideoInfoVm(PRL_HANDLE sdkdom, virDomainDefPtr def)
{ {
virDomainVideoDefPtr video = NULL; virDomainVideoDefPtr video = NULL;
virDomainVideoAccelDefPtr accel = NULL; virDomainVideoAccelDefPtr accel = NULL;
@ -1119,9 +1145,13 @@ prlsdkAddSerialInfo(PRL_HANDLE sdkdom,
static int static int
prlsdkAddDomainHardware(vzDriverPtr driver, PRL_HANDLE sdkdom, virDomainDefPtr def) prlsdkAddDomainHardware(vzDriverPtr driver, PRL_HANDLE sdkdom, virDomainDefPtr def)
{ {
if (!IS_CT(def)) if (IS_CT(def)) {
if (prlsdkAddDomainVideoInfo(sdkdom, def) < 0) if (prlsdkAddDomainVideoInfoCt(def) < 0)
goto error; goto error;
} else {
if (prlsdkAddDomainVideoInfoVm(sdkdom, def) < 0)
goto error;
}
if (prlsdkAddDomainHardDisksInfo(driver, sdkdom, def) < 0) if (prlsdkAddDomainHardDisksInfo(driver, sdkdom, def) < 0)
goto error; goto error;
@ -1185,25 +1215,6 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def)
if (VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, gr) < 0) if (VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, gr) < 0)
goto error; goto error;
if (IS_CT(def)) {
virDomainVideoDefPtr video;
if (VIR_ALLOC(video) < 0)
goto error;
video->type = virDomainVideoDefaultType(def);
if (video->type < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("cannot determine default video type"));
VIR_FREE(video);
goto error;
}
video->vram = virDomainVideoDefaultRAM(def, video->type);
video->heads = 1;
if (VIR_ALLOC_N(def->videos, 1) < 0) {
virDomainVideoDefFree(video);
goto error;
}
def->videos[def->nvideos++] = video;
}
return 0; return 0;
error: error:
@ -1697,6 +1708,10 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom)
if (prlsdkConvertDomainType(sdkdom, def) < 0) if (prlsdkConvertDomainType(sdkdom, def) < 0)
goto error; goto error;
if (prlsdkAddVNCInfo(sdkdom, def) < 0)
goto error;
/* depends on prlsdkAddVNCInfo */
if (prlsdkAddDomainHardware(driver, sdkdom, def) < 0) if (prlsdkAddDomainHardware(driver, sdkdom, def) < 0)
goto error; goto error;
@ -1704,9 +1719,6 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom)
if (prlsdkConvertBootOrder(sdkdom, def) < 0) if (prlsdkConvertBootOrder(sdkdom, def) < 0)
goto error; goto error;
if (prlsdkAddVNCInfo(sdkdom, def) < 0)
goto error;
pret = PrlVmCfg_GetEnvId(sdkdom, &envId); pret = PrlVmCfg_GetEnvId(sdkdom, &envId);
prlsdkCheckRetGoto(pret, error); prlsdkCheckRetGoto(pret, error);