shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

vz: get rid of unused home state variable in private domain obj

Browse Source 
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
This commit is contained in:
Nikolay Shirokovskiy 2016-05-20 10:26:46 +03:00 committed by Pavel Hrdina
parent 3cc13e005d
commit 475835e38b
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/vz/vz_sdk.c
View File

@ -465,7 +465,6 @@ prlsdkDomObjFreePrivate(void *p)
PrlHandle_Free(pdom->sdkdom);
PrlHandle_Free(pdom->stats);
VIR_FREE(pdom->home);
VIR_FREE(p);
};
@ -1504,7 +1503,6 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom)
virDomainDefPtr def = NULL;
vzDomObjPtr pdom = NULL;
VIRTUAL_MACHINE_STATE domainState;
char *home = NULL;
PRL_RESULT pret;
PRL_UINT32 ram;
@ -1562,17 +1560,6 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom)
pret = PrlVmCfg_GetEnvId(sdkdom, &envId);
prlsdkCheckRetGoto(pret, error);
if (!(home = prlsdkGetStringParamVar(PrlVmCfg_GetHomePath, sdkdom)))
goto error;
/* For VMs home is actually /directory/config.pvs */
if (!IS_CT(def)) {
/* Get rid of /config.pvs in path string */
char *s = strrchr(home, '/');
if (s)
*s = '\0';
}
pret = PrlVmCfg_GetAutoStart(sdkdom, &autostart);
prlsdkCheckRetGoto(pret, error);
if (autostart != PAO_VM_START_ON_LOAD &&
@ -1618,8 +1605,6 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom)
virDomainDefFree(dom->def);
dom->def = def;
pdom->id = envId;
VIR_FREE(pdom->home);
pdom->home = home;
prlsdkConvertDomainState(domainState, envId, dom);
@ -1632,7 +1617,6 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom)
return 0;
error:
PrlHandle_Free(sdkdom);
VIR_FREE(home);
virDomainDefFree(def);
return -1;
}

1
src/vz/vz_utils.h
View File

@ -96,7 +96,6 @@ typedef struct _vzConn *vzConnPtr;
struct vzDomObj {
int id;
char *home;
PRL_HANDLE sdkdom;
PRL_HANDLE stats;
};