[libvirt] [PATCH] vz: get rid of unused home state variable in private domain obj
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
---
src/vz/vz_sdk.c | 16 ----------------
src/vz/vz_utils.h | 1 -
2 files changed, 17 deletions(-)
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 2275572..3fe17e0 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -447,7 +447,6 @@ prlsdkDomObjFreePrivate(void *p)
PrlHandle_Free(pdom->sdkdom);
PrlHandle_Free(pdom->cache.stats);
virCondDestroy(&pdom->cache.cond);
- VIR_FREE(pdom->home);
VIR_FREE(p);
};
@@ -1484,7 +1483,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;
@@ -1541,17 +1539,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 &&
@@ -1588,8 +1575,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);
@@ -1607,7 +1592,6 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom)
return 0;
error:
PrlHandle_Free(sdkdom);
- VIR_FREE(home);
virDomainDefFree(def);
return -1;
}
diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h
index ba4d3c5..1e2ed30 100644
--- a/src/vz/vz_utils.h
+++ b/src/vz/vz_utils.h
@@ -103,7 +103,6 @@ typedef struct _vzCountersCache vzCountersCache;
struct vzDomObj {
int id;
- char *home;
PRL_HANDLE sdkdom;
vzCountersCache cache;
};
--
1.8.3.1