[libvirt] [PATCH 0/3] vz: simplify getting strings from vz sdk - Devel - libvirt List Archives

newer
[libvirt] [PATCH] tests: fix...

[libvirt] [PATCH 0/3] vz: simplify getting strings from vz sdk

older
[libvirt] [PATCH 0/4] vz: use disk...

Nikolay Shirokovskiy

6 Apr 2016 6 Apr '16

7:42 a.m.

Nikolay Shirokovskiy (3): vz: simplify getting strings from vzsdk vz: fix memory leak vz: simplify getting fixed size strings from vzsdk src/vz/vz_sdk.c | 203 +++++++++++++++++++++----------------------------------- 1 file changed, 77 insertions(+), 126 deletions(-) -- 1.8.3.1

Reply

Sign in to reply online Use email software

Show replies by date

Nikolay Shirokovskiy

6 Apr 6 Apr

7:42 a.m.

New subject: [libvirt] [PATCH 1/3] vz: simplify getting strings from vzsdk

SDK does not allocate memory when getting strings thus we need to call every function that returns string twice. First to obtain string length, second to obtain string itself. It is tedious. Let's move this logic into macro that generates wrapper. Luckily all functions we need to wrap have 3 parameters: some handle, pointer to string and string length. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com> --- src/vz/vz_sdk.c | 167 +++++++++++++++++++------------------------------------- 1 file changed, 56 insertions(+), 111 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 8691887..0d853d0 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -201,6 +201,44 @@ waitJobHelper(PRL_HANDLE job, unsigned int timeout, waitJobHelper(job, JOB_INFINIT_WAIT_TIMEOUT, __FILE__, \ __FUNCTION__, __LINE__) +#define PRLSDK_GENERATE_STRING_GETTER(FUN) \ +static char* \ +FUN ## _Alloc(PRL_HANDLE handle) \ +{ \ + PRL_RESULT pret; \ + PRL_UINT32 buflen = 0; \ + char *str = NULL; \ + \ + pret = FUN(handle, NULL, &buflen); \ + prlsdkCheckRetGoto(pret, error); \ + \ + if (VIR_ALLOC_N(str, buflen) < 0) \ + goto error; \ + \ + pret = FUN(handle, str, &buflen); \ + prlsdkCheckRetGoto(pret, error); \ + \ + return str; \ + \ + error: \ + VIR_FREE(str); \ + return NULL; \ +} + +PRLSDK_GENERATE_STRING_GETTER(PrlResult_GetParamAsString) + +PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetName) +PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetVNCHostName) +PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetCpuMask) +PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetHomePath) + +PRLSDK_GENERATE_STRING_GETTER(PrlVmDev_GetFriendlyName) +PRLSDK_GENERATE_STRING_GETTER(PrlVmDev_GetImagePath) + +PRLSDK_GENERATE_STRING_GETTER(PrlVmDevHd_GetMountPoint) + +PRLSDK_GENERATE_STRING_GETTER(PrlVmDevNet_GetHostInterfaceName) +PRLSDK_GENERATE_STRING_GETTER(PrlVmDevNet_GetVirtualNetworkId) int prlsdkInit(void) @@ -346,19 +384,8 @@ prlsdkGetDomainIds(PRL_HANDLE sdkdom, PRL_UINT32 len; PRL_RESULT pret; - if (name) { - len = 0; - *name = NULL; - /* get name length */ - pret = PrlVmCfg_GetName(sdkdom, NULL, &len); - prlsdkCheckRetGoto(pret, error); - - if (VIR_ALLOC_N(*name, len) < 0) - goto error; - - pret = PrlVmCfg_GetName(sdkdom, *name, &len); - prlsdkCheckRetGoto(pret, error); - } + if (name && !(*name = PrlVmCfg_GetName_Alloc(sdkdom))) + goto error; if (uuid) { len = sizeof(uuidstr); @@ -465,7 +492,6 @@ prlsdkGetDiskInfo(vzConnPtr privconn, bool isCt) { char *buf = NULL; - PRL_UINT32 buflen = 0; PRL_RESULT pret; PRL_UINT32 emulatedType; PRL_UINT32 ifType; @@ -497,15 +523,9 @@ prlsdkGetDiskInfo(vzConnPtr privconn, disk->device = VIR_DOMAIN_DISK_DEVICE_DISK; } - pret = PrlVmDev_GetFriendlyName(prldisk, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(buf, buflen) < 0) + if (!(buf = PrlVmDev_GetFriendlyName_Alloc(prldisk))) goto cleanup; - pret = PrlVmDev_GetFriendlyName(prldisk, buf, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - if (virDomainDiskSetSource(disk, buf) < 0) goto cleanup; @@ -567,8 +587,6 @@ prlsdkGetFSInfo(PRL_HANDLE prldisk, virDomainFSDefPtr fs) { char *buf = NULL; - PRL_UINT32 buflen = 0; - PRL_RESULT pret; int ret = -1; fs->type = VIR_DOMAIN_FS_TYPE_FILE; @@ -580,27 +598,15 @@ prlsdkGetFSInfo(PRL_HANDLE prldisk, fs->readonly = false; fs->symlinksResolved = false; - pret = PrlVmDev_GetImagePath(prldisk, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(buf, buflen) < 0) + if (!(buf = PrlVmDev_GetImagePath_Alloc(prldisk))) goto cleanup; - pret = PrlVmDev_GetImagePath(prldisk, buf, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - fs->src = buf; buf = NULL; - pret = PrlVmDevHd_GetMountPoint(prldisk, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(buf, buflen) < 0) + if (!(buf = PrlVmDevHd_GetMountPoint_Alloc(prldisk))) goto cleanup; - pret = PrlVmDevHd_GetMountPoint(prldisk, buf, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - fs->dst = buf; buf = NULL; @@ -726,15 +732,9 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) /* use device name, shown by prlctl as target device * for identifying network adapter in virDomainDefineXML */ - pret = PrlVmDevNet_GetHostInterfaceName(netAdapter, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(net->ifname, buflen) < 0) + if (!(net->ifname = PrlVmDevNet_GetHostInterfaceName_Alloc(netAdapter))) goto cleanup; - pret = PrlVmDevNet_GetHostInterfaceName(netAdapter, net->ifname, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - pret = PrlVmDev_GetIndex(netAdapter, &netAdapterIndex); prlsdkCheckRetGoto(pret, cleanup); @@ -765,17 +765,10 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) PARALLELS_DOMAIN_ROUTED_NETWORK_NAME) < 0) goto cleanup; } else { - pret = PrlVmDevNet_GetVirtualNetworkId(netAdapter, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(net->data.network.name, buflen) < 0) + if (!(net->data.network.name = + PrlVmDevNet_GetVirtualNetworkId_Alloc(netAdapter))) goto cleanup; - pret = PrlVmDevNet_GetVirtualNetworkId(netAdapter, - net->data.network.name, - &buflen); - prlsdkCheckRetGoto(pret, cleanup); - /* * We use VIR_DOMAIN_NET_TYPE_NETWORK for all network adapters * except those whose Virtual Network Id differ from Parallels @@ -868,7 +861,6 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainChrDefPtr chr) PRL_UINT32 serialPortIndex; PRL_UINT32 emulatedType; char *friendlyName = NULL; - PRL_UINT32 buflen; chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL; chr->targetTypeAttr = false; @@ -879,15 +871,9 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainChrDefPtr chr) pret = PrlVmDev_GetEmulatedType(serialPort, &emulatedType); prlsdkCheckRetGoto(pret, error); - pret = PrlVmDev_GetFriendlyName(serialPort, NULL, &buflen); - prlsdkCheckRetGoto(pret, error); - - if (VIR_ALLOC_N(friendlyName, buflen) < 0) + if (!(friendlyName = PrlVmDev_GetFriendlyName_Alloc(serialPort))) goto error; - pret = PrlVmDev_GetFriendlyName(serialPort, friendlyName, &buflen); - prlsdkCheckRetGoto(pret, error); - switch (emulatedType) { case PDT_USE_OUTPUT_FILE: chr->source.type = VIR_DOMAIN_CHR_TYPE_FILE; @@ -987,7 +973,6 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) virDomainGraphicsDefPtr gr = NULL; PRL_VM_REMOTE_DISPLAY_MODE vncMode; PRL_UINT32 port; - PRL_UINT32 buflen = 0; PRL_RESULT pret; pret = PrlVmCfg_GetVNCMode(sdkdom, &vncMode); @@ -1016,15 +1001,9 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) gr->nListens = 1; - pret = PrlVmCfg_GetVNCHostName(sdkdom, NULL, &buflen); - prlsdkCheckRetGoto(pret, error); - - if (VIR_ALLOC_N(gr->listens[0].address, buflen) < 0) + if (!(gr->listens[0].address = PrlVmCfg_GetVNCHostName_Alloc(sdkdom))) goto error; - pret = PrlVmCfg_GetVNCHostName(sdkdom, gr->listens[0].address, &buflen); - prlsdkCheckRetGoto(pret, error); - gr->listens[0].type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS; if (VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, gr) < 0) @@ -1139,7 +1118,6 @@ prlsdkConvertCpuInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) { char *buf; - PRL_UINT32 buflen = 0; int hostcpus; PRL_UINT32 cpuCount; PRL_RESULT pret; @@ -1161,14 +1139,9 @@ prlsdkConvertCpuInfo(PRL_HANDLE sdkdom, if (virDomainDefSetVcpus(def, cpuCount) < 0) goto cleanup; - pret = PrlVmCfg_GetCpuMask(sdkdom, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(buf, buflen) < 0) + if (!(buf = PrlVmCfg_GetCpuMask_Alloc(sdkdom))) goto cleanup; - pret = PrlVmCfg_GetCpuMask(sdkdom, buf, &buflen); - if (strlen(buf) == 0) { if (!(def->cpumask = virBitmapNew(hostcpus))) goto cleanup; @@ -1273,7 +1246,6 @@ prlsdkLoadDomain(vzConnPtr privconn, virDomainObjPtr dom) VIRTUAL_MACHINE_STATE domainState; char *home = NULL; - PRL_UINT32 buflen = 0; PRL_RESULT pret; PRL_UINT32 ram; PRL_UINT32 envId; @@ -1326,16 +1298,9 @@ prlsdkLoadDomain(vzConnPtr privconn, virDomainObjPtr dom) pret = PrlVmCfg_GetEnvId(sdkdom, &envId); prlsdkCheckRetGoto(pret, error); - buflen = 0; - pret = PrlVmCfg_GetHomePath(sdkdom, NULL, &buflen); - prlsdkCheckRetGoto(pret, error); - - if (VIR_ALLOC_N(home, buflen) < 0) + if (!(home = PrlVmCfg_GetHomePath_Alloc(sdkdom))) goto error; - pret = PrlVmCfg_GetHomePath(sdkdom, home, &buflen); - prlsdkCheckRetGoto(pret, error); - /* For VMs home is actually /directory/config.pvs */ if (!IS_CT(def)) { /* Get rid of /config.pvs in path string */ @@ -3190,7 +3155,6 @@ prlsdkGetDiskIndex(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk) { int idx = -1; char *buf = NULL; - PRL_UINT32 buflen = 0; PRL_RESULT pret; PRL_UINT32 hddCount; PRL_UINT32 i; @@ -3204,16 +3168,9 @@ prlsdkGetDiskIndex(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk) pret = PrlVmCfg_GetHardDisk(sdkdom, i, &hdd); prlsdkCheckRetGoto(pret, cleanup); - buflen = 0; - pret = PrlVmDev_GetFriendlyName(hdd, 0, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(buf, buflen) < 0) + if (!(buf = PrlVmDev_GetFriendlyName_Alloc(hdd))) goto cleanup; - pret = PrlVmDev_GetFriendlyName(hdd, buf, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - if (STRNEQ(disk->src->path, buf)) { PrlHandle_Free(hdd); @@ -3613,7 +3570,7 @@ prlsdkDomainHasSnapshots(PRL_HANDLE sdkdom, int* found) PRL_HANDLE job; PRL_HANDLE result; char *snapshotxml = NULL; - unsigned int len, paramsCount; + unsigned int paramsCount; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; @@ -3630,16 +3587,10 @@ prlsdkDomainHasSnapshots(PRL_HANDLE sdkdom, int* found) if (!paramsCount) goto cleanup; - pret = PrlResult_GetParamAsString(result, 0, &len); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(snapshotxml, len+1) < 0) + if (!(snapshotxml = PrlResult_GetParamAsString_Alloc(result))) goto cleanup; - pret = PrlResult_GetParamAsString(result, snapshotxml, &len); - prlsdkCheckRetGoto(pret, cleanup); - - if (len <= 1) { + if (*snapshotxml == '\0') { /* The document is empty that means no snapshots */ *found = 0; ret = 0; @@ -3848,12 +3799,12 @@ prlsdkGetBlockStats(virDomainObjPtr dom, virDomainDiskDefPtr disk, virDomainBloc return ret; } + static PRL_HANDLE prlsdkFindNetByPath(virDomainObjPtr dom, const char *path) { PRL_UINT32 count = 0; vzDomObjPtr privdom = dom->privateData; - PRL_UINT32 buflen = 0; PRL_RESULT pret; size_t i; char *name = NULL; @@ -3866,15 +3817,9 @@ prlsdkFindNetByPath(virDomainObjPtr dom, const char *path) pret = PrlVmCfg_GetNetAdapter(privdom->sdkdom, i, &net); prlsdkCheckRetGoto(pret, error); - pret = PrlVmDevNet_GetHostInterfaceName(net, NULL, &buflen); - prlsdkCheckRetGoto(pret, error); - - if (VIR_ALLOC_N(name, buflen) < 0) + if (!(name = PrlVmDevNet_GetHostInterfaceName_Alloc(net))) goto error; - pret = PrlVmDevNet_GetHostInterfaceName(net, name, &buflen); - prlsdkCheckRetGoto(pret, error); - if (STREQ(name, path)) break; -- 1.8.3.1

Reply

Sign in to reply online Use email software

Maxim Nestratov

12 Apr 12 Apr

4:37 a.m.

New subject: [libvirt] [PATCH 1/3] vz: simplify getting strings from vzsdk

06.04.2016 14:42, Nikolay Shirokovskiy пишет:

SDK does not allocate memory when getting strings thus we need to call every function that returns string twice. First to obtain string length, second to obtain string itself. It is tedious. Let's move this logic into macro that generates wrapper. Luckily all functions we need to wrap have 3 parameters: some handle, pointer to string and string length.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com> --- src/vz/vz_sdk.c | 167 +++++++++++++++++++------------------------------------- 1 file changed, 56 insertions(+), 111 deletions(-)

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 8691887..0d853d0 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -201,6 +201,44 @@ waitJobHelper(PRL_HANDLE job, unsigned int timeout, waitJobHelper(job, JOB_INFINIT_WAIT_TIMEOUT, __FILE__, \ __FUNCTION__, __LINE__)

+#define PRLSDK_GENERATE_STRING_GETTER(FUN) \ +static char* \ +FUN ## _Alloc(PRL_HANDLE handle) \ +{ \ + PRL_RESULT pret; \ + PRL_UINT32 buflen = 0; \ + char *str = NULL; \ + \ + pret = FUN(handle, NULL, &buflen); \ + prlsdkCheckRetGoto(pret, error); \ + \ + if (VIR_ALLOC_N(str, buflen) < 0) \ + goto error; \ + \ + pret = FUN(handle, str, &buflen); \ + prlsdkCheckRetGoto(pret, error); \ + \ + return str; \ + \ + error: \ + VIR_FREE(str); \ + return NULL; \ +}

I'd prefer to see a real function, not a macro with a pointer to necessary Prlxxx function as a parameter like: static char * prlsdkGetStringParam(PRL_HANDLE sdkdom, prlsdkGetStringFunc func) ... pret = func(sdkdom, src, &buflen); ...

+ +PRLSDK_GENERATE_STRING_GETTER(PrlResult_GetParamAsString) + +PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetName) +PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetVNCHostName) +PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetCpuMask) +PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetHomePath) + +PRLSDK_GENERATE_STRING_GETTER(PrlVmDev_GetFriendlyName) +PRLSDK_GENERATE_STRING_GETTER(PrlVmDev_GetImagePath) + +PRLSDK_GENERATE_STRING_GETTER(PrlVmDevHd_GetMountPoint) + +PRLSDK_GENERATE_STRING_GETTER(PrlVmDevNet_GetHostInterfaceName) +PRLSDK_GENERATE_STRING_GETTER(PrlVmDevNet_GetVirtualNetworkId)

int prlsdkInit(void) @@ -346,19 +384,8 @@ prlsdkGetDomainIds(PRL_HANDLE sdkdom, PRL_UINT32 len; PRL_RESULT pret;

- if (name) { - len = 0; - *name = NULL; - /* get name length */ - pret = PrlVmCfg_GetName(sdkdom, NULL, &len); - prlsdkCheckRetGoto(pret, error); - - if (VIR_ALLOC_N(*name, len) < 0) - goto error; - - pret = PrlVmCfg_GetName(sdkdom, *name, &len); - prlsdkCheckRetGoto(pret, error); - } + if (name && !(*name = PrlVmCfg_GetName_Alloc(sdkdom))) + goto error;

if (uuid) { len = sizeof(uuidstr); @@ -465,7 +492,6 @@ prlsdkGetDiskInfo(vzConnPtr privconn, bool isCt) { char *buf = NULL; - PRL_UINT32 buflen = 0; PRL_RESULT pret; PRL_UINT32 emulatedType; PRL_UINT32 ifType; @@ -497,15 +523,9 @@ prlsdkGetDiskInfo(vzConnPtr privconn, disk->device = VIR_DOMAIN_DISK_DEVICE_DISK; }

- pret = PrlVmDev_GetFriendlyName(prldisk, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(buf, buflen) < 0) + if (!(buf = PrlVmDev_GetFriendlyName_Alloc(prldisk))) goto cleanup;

- pret = PrlVmDev_GetFriendlyName(prldisk, buf, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - if (virDomainDiskSetSource(disk, buf) < 0) goto cleanup;

@@ -567,8 +587,6 @@ prlsdkGetFSInfo(PRL_HANDLE prldisk, virDomainFSDefPtr fs) { char *buf = NULL; - PRL_UINT32 buflen = 0; - PRL_RESULT pret; int ret = -1;

fs->type = VIR_DOMAIN_FS_TYPE_FILE; @@ -580,27 +598,15 @@ prlsdkGetFSInfo(PRL_HANDLE prldisk, fs->readonly = false; fs->symlinksResolved = false;

- pret = PrlVmDev_GetImagePath(prldisk, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(buf, buflen) < 0) + if (!(buf = PrlVmDev_GetImagePath_Alloc(prldisk))) goto cleanup;

- pret = PrlVmDev_GetImagePath(prldisk, buf, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - fs->src = buf; buf = NULL;

- pret = PrlVmDevHd_GetMountPoint(prldisk, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(buf, buflen) < 0) + if (!(buf = PrlVmDevHd_GetMountPoint_Alloc(prldisk))) goto cleanup;

- pret = PrlVmDevHd_GetMountPoint(prldisk, buf, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - fs->dst = buf; buf = NULL;

@@ -726,15 +732,9 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt)

/* use device name, shown by prlctl as target device * for identifying network adapter in virDomainDefineXML */ - pret = PrlVmDevNet_GetHostInterfaceName(netAdapter, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(net->ifname, buflen) < 0) + if (!(net->ifname = PrlVmDevNet_GetHostInterfaceName_Alloc(netAdapter))) goto cleanup;

- pret = PrlVmDevNet_GetHostInterfaceName(netAdapter, net->ifname, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - pret = PrlVmDev_GetIndex(netAdapter, &netAdapterIndex); prlsdkCheckRetGoto(pret, cleanup);

@@ -765,17 +765,10 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) PARALLELS_DOMAIN_ROUTED_NETWORK_NAME) < 0) goto cleanup; } else { - pret = PrlVmDevNet_GetVirtualNetworkId(netAdapter, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(net->data.network.name, buflen) < 0) + if (!(net->data.network.name = + PrlVmDevNet_GetVirtualNetworkId_Alloc(netAdapter))) goto cleanup;

- pret = PrlVmDevNet_GetVirtualNetworkId(netAdapter, - net->data.network.name, - &buflen); - prlsdkCheckRetGoto(pret, cleanup); - /* * We use VIR_DOMAIN_NET_TYPE_NETWORK for all network adapters * except those whose Virtual Network Id differ from Parallels @@ -868,7 +861,6 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainChrDefPtr chr) PRL_UINT32 serialPortIndex; PRL_UINT32 emulatedType; char *friendlyName = NULL; - PRL_UINT32 buflen;

chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL; chr->targetTypeAttr = false; @@ -879,15 +871,9 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainChrDefPtr chr) pret = PrlVmDev_GetEmulatedType(serialPort, &emulatedType); prlsdkCheckRetGoto(pret, error);

- pret = PrlVmDev_GetFriendlyName(serialPort, NULL, &buflen); - prlsdkCheckRetGoto(pret, error); - - if (VIR_ALLOC_N(friendlyName, buflen) < 0) + if (!(friendlyName = PrlVmDev_GetFriendlyName_Alloc(serialPort))) goto error;

- pret = PrlVmDev_GetFriendlyName(serialPort, friendlyName, &buflen); - prlsdkCheckRetGoto(pret, error); - switch (emulatedType) { case PDT_USE_OUTPUT_FILE: chr->source.type = VIR_DOMAIN_CHR_TYPE_FILE; @@ -987,7 +973,6 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) virDomainGraphicsDefPtr gr = NULL; PRL_VM_REMOTE_DISPLAY_MODE vncMode; PRL_UINT32 port; - PRL_UINT32 buflen = 0; PRL_RESULT pret;

pret = PrlVmCfg_GetVNCMode(sdkdom, &vncMode); @@ -1016,15 +1001,9 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def)

gr->nListens = 1;

- pret = PrlVmCfg_GetVNCHostName(sdkdom, NULL, &buflen); - prlsdkCheckRetGoto(pret, error); - - if (VIR_ALLOC_N(gr->listens[0].address, buflen) < 0) + if (!(gr->listens[0].address = PrlVmCfg_GetVNCHostName_Alloc(sdkdom))) goto error;

- pret = PrlVmCfg_GetVNCHostName(sdkdom, gr->listens[0].address, &buflen); - prlsdkCheckRetGoto(pret, error); - gr->listens[0].type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS;

if (VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, gr) < 0) @@ -1139,7 +1118,6 @@ prlsdkConvertCpuInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) { char *buf; - PRL_UINT32 buflen = 0; int hostcpus; PRL_UINT32 cpuCount; PRL_RESULT pret; @@ -1161,14 +1139,9 @@ prlsdkConvertCpuInfo(PRL_HANDLE sdkdom, if (virDomainDefSetVcpus(def, cpuCount) < 0) goto cleanup;

- pret = PrlVmCfg_GetCpuMask(sdkdom, NULL, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(buf, buflen) < 0) + if (!(buf = PrlVmCfg_GetCpuMask_Alloc(sdkdom))) goto cleanup;

- pret = PrlVmCfg_GetCpuMask(sdkdom, buf, &buflen); - if (strlen(buf) == 0) { if (!(def->cpumask = virBitmapNew(hostcpus))) goto cleanup; @@ -1273,7 +1246,6 @@ prlsdkLoadDomain(vzConnPtr privconn, virDomainObjPtr dom) VIRTUAL_MACHINE_STATE domainState; char *home = NULL;

- PRL_UINT32 buflen = 0; PRL_RESULT pret; PRL_UINT32 ram; PRL_UINT32 envId; @@ -1326,16 +1298,9 @@ prlsdkLoadDomain(vzConnPtr privconn, virDomainObjPtr dom) pret = PrlVmCfg_GetEnvId(sdkdom, &envId); prlsdkCheckRetGoto(pret, error);

- buflen = 0; - pret = PrlVmCfg_GetHomePath(sdkdom, NULL, &buflen); - prlsdkCheckRetGoto(pret, error); - - if (VIR_ALLOC_N(home, buflen) < 0) + if (!(home = PrlVmCfg_GetHomePath_Alloc(sdkdom))) goto error;

- pret = PrlVmCfg_GetHomePath(sdkdom, home, &buflen); - prlsdkCheckRetGoto(pret, error); - /* For VMs home is actually /directory/config.pvs */ if (!IS_CT(def)) { /* Get rid of /config.pvs in path string */ @@ -3190,7 +3155,6 @@ prlsdkGetDiskIndex(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk) { int idx = -1; char *buf = NULL; - PRL_UINT32 buflen = 0; PRL_RESULT pret; PRL_UINT32 hddCount; PRL_UINT32 i; @@ -3204,16 +3168,9 @@ prlsdkGetDiskIndex(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk) pret = PrlVmCfg_GetHardDisk(sdkdom, i, &hdd); prlsdkCheckRetGoto(pret, cleanup);

- buflen = 0; - pret = PrlVmDev_GetFriendlyName(hdd, 0, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(buf, buflen) < 0) + if (!(buf = PrlVmDev_GetFriendlyName_Alloc(hdd))) goto cleanup;

- pret = PrlVmDev_GetFriendlyName(hdd, buf, &buflen); - prlsdkCheckRetGoto(pret, cleanup); - if (STRNEQ(disk->src->path, buf)) {

PrlHandle_Free(hdd); @@ -3613,7 +3570,7 @@ prlsdkDomainHasSnapshots(PRL_HANDLE sdkdom, int* found) PRL_HANDLE job; PRL_HANDLE result; char *snapshotxml = NULL; - unsigned int len, paramsCount; + unsigned int paramsCount; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL;

@@ -3630,16 +3587,10 @@ prlsdkDomainHasSnapshots(PRL_HANDLE sdkdom, int* found) if (!paramsCount) goto cleanup;

- pret = PrlResult_GetParamAsString(result, 0, &len); - prlsdkCheckRetGoto(pret, cleanup); - - if (VIR_ALLOC_N(snapshotxml, len+1) < 0) + if (!(snapshotxml = PrlResult_GetParamAsString_Alloc(result))) goto cleanup;

- pret = PrlResult_GetParamAsString(result, snapshotxml, &len); - prlsdkCheckRetGoto(pret, cleanup); - - if (len <= 1) { + if (*snapshotxml == '\0') { /* The document is empty that means no snapshots */ *found = 0; ret = 0; @@ -3848,12 +3799,12 @@ prlsdkGetBlockStats(virDomainObjPtr dom, virDomainDiskDefPtr disk, virDomainBloc return ret; }

+ static PRL_HANDLE prlsdkFindNetByPath(virDomainObjPtr dom, const char *path) { PRL_UINT32 count = 0; vzDomObjPtr privdom = dom->privateData; - PRL_UINT32 buflen = 0; PRL_RESULT pret; size_t i; char *name = NULL; @@ -3866,15 +3817,9 @@ prlsdkFindNetByPath(virDomainObjPtr dom, const char *path) pret = PrlVmCfg_GetNetAdapter(privdom->sdkdom, i, &net); prlsdkCheckRetGoto(pret, error);

- pret = PrlVmDevNet_GetHostInterfaceName(net, NULL, &buflen); - prlsdkCheckRetGoto(pret, error); - - if (VIR_ALLOC_N(name, buflen) < 0) + if (!(name = PrlVmDevNet_GetHostInterfaceName_Alloc(net))) goto error;

- pret = PrlVmDevNet_GetHostInterfaceName(net, name, &buflen); - prlsdkCheckRetGoto(pret, error); - if (STREQ(name, path)) break;

Reply

Sign in to reply online Use email software

Nikolay Shirokovskiy

6 Apr 6 Apr

7:42 a.m.

New subject: [libvirt] [PATCH 2/3] vz: fix memory leak

we don't need to allocate mastr at all as it is array and already have the the space it needs. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com> --- src/vz/vz_sdk.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 0d853d0..443f753 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -749,8 +749,6 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) } buflen = ARRAY_CARDINALITY(macstr); - if (VIR_ALLOC_N(macstr, buflen)) - goto cleanup; pret = PrlVmDevNet_GetMacAddressCanonical(netAdapter, macstr, &buflen); prlsdkCheckRetGoto(pret, cleanup); -- 1.8.3.1

Reply

Sign in to reply online Use email software

Maxim Nestratov

12 Apr 12 Apr

5:47 a.m.

New subject: [libvirt] [PATCH 2/3] vz: fix memory leak

06.04.2016 14:42, Nikolay Shirokovskiy пишет:

we don't need to allocate mastr at all as it is array and already have the the space it needs.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com> --- src/vz/vz_sdk.c | 2 -- 1 file changed, 2 deletions(-)

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 0d853d0..443f753 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -749,8 +749,6 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) }

buflen = ARRAY_CARDINALITY(macstr); - if (VIR_ALLOC_N(macstr, buflen)) - goto cleanup; pret = PrlVmDevNet_GetMacAddressCanonical(netAdapter, macstr, &buflen); prlsdkCheckRetGoto(pret, cleanup);

Pushed this one correcting commit message a bit. Thanks, Maxim

Reply

Sign in to reply online Use email software

Nikolay Shirokovskiy

6 Apr 6 Apr

7:42 a.m.

New subject: [libvirt] [PATCH 3/3] vz: simplify getting fixed size strings from vzsdk

Getting strings of predictable length from vz SDK is still not convinient. We don't need length feedback from sdk function but still need to allocate and set length variable just to be able to call the function. Let's introduce another macro that generates suitable wrapper in this case. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com> --- src/vz/vz_sdk.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 443f753..1200b0d 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -225,12 +225,24 @@ FUN ## _Alloc(PRL_HANDLE handle) \ return NULL; \ } +#define PRLSDK_GENERATE_STRING_GETTER_FIXED(FUN) \ +static PRL_RESULT \ +FUN ## _Fixed(PRL_HANDLE handle, char *buf, size_t size) \ +{ \ + PRL_UINT32 buflen = size; \ + \ + return FUN(handle, buf, &buflen); \ +} + PRLSDK_GENERATE_STRING_GETTER(PrlResult_GetParamAsString) +PRLSDK_GENERATE_STRING_GETTER_FIXED(PrlEvent_GetIssuerId) + PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetName) PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetVNCHostName) PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetCpuMask) PRLSDK_GENERATE_STRING_GETTER(PrlVmCfg_GetHomePath) +PRLSDK_GENERATE_STRING_GETTER_FIXED(PrlVmCfg_GetUuid) PRLSDK_GENERATE_STRING_GETTER(PrlVmDev_GetFriendlyName) PRLSDK_GENERATE_STRING_GETTER(PrlVmDev_GetImagePath) @@ -239,6 +251,8 @@ PRLSDK_GENERATE_STRING_GETTER(PrlVmDevHd_GetMountPoint) PRLSDK_GENERATE_STRING_GETTER(PrlVmDevNet_GetHostInterfaceName) PRLSDK_GENERATE_STRING_GETTER(PrlVmDevNet_GetVirtualNetworkId) +PRLSDK_GENERATE_STRING_GETTER_FIXED(PrlVmDevNet_GetMacAddressCanonical) +PRLSDK_GENERATE_STRING_GETTER_FIXED(PrlVmDevNet_GetMacAddress) int prlsdkInit(void) @@ -381,15 +395,13 @@ prlsdkGetDomainIds(PRL_HANDLE sdkdom, unsigned char *uuid) { char uuidstr[VIR_UUID_STRING_BUFLEN + 2]; - PRL_UINT32 len; PRL_RESULT pret; if (name && !(*name = PrlVmCfg_GetName_Alloc(sdkdom))) goto error; if (uuid) { - len = sizeof(uuidstr); - pret = PrlVmCfg_GetUuid(sdkdom, uuidstr, &len); + pret = PrlVmCfg_GetUuid_Fixed(sdkdom, uuidstr, sizeof(uuidstr)); prlsdkCheckRetGoto(pret, error); if (prlsdkUUIDParse(uuidstr, uuid) < 0) { @@ -720,7 +732,6 @@ static int prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) { char macstr[VIR_MAC_STRING_BUFLEN]; - PRL_UINT32 buflen; PRL_UINT32 netAdapterIndex; PRL_UINT32 emulatedType; PRL_RESULT pret; @@ -748,8 +759,8 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) return 0; } - buflen = ARRAY_CARDINALITY(macstr); - pret = PrlVmDevNet_GetMacAddressCanonical(netAdapter, macstr, &buflen); + pret = PrlVmDevNet_GetMacAddressCanonical_Fixed(netAdapter, macstr, + sizeof(macstr)); prlsdkCheckRetGoto(pret, cleanup); if (virMacAddrParse(macstr, &net->mac) < 0) @@ -1628,7 +1639,6 @@ prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque) PRL_HANDLE_TYPE handleType; char uuidstr[VIR_UUID_STRING_BUFLEN + 2]; unsigned char uuid[VIR_UUID_BUFLEN]; - PRL_UINT32 bufsize = ARRAY_CARDINALITY(uuidstr); PRL_EVENT_TYPE prlEventType; pret = PrlHandle_GetType(prlEvent, &handleType); @@ -1641,7 +1651,7 @@ prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque) if (privconn == NULL) goto cleanup; - pret = PrlEvent_GetIssuerId(prlEvent, uuidstr, &bufsize); + pret = PrlEvent_GetIssuerId_Fixed(prlEvent, uuidstr, sizeof(uuidstr)); prlsdkCheckRetGoto(pret, cleanup); pret = PrlEvent_GetType(prlEvent, &prlEventType); @@ -2863,7 +2873,6 @@ prlsdkFindNetByMAC(PRL_HANDLE sdkdom, virMacAddrPtr mac) PRL_UINT32 adaptersCount; PRL_UINT32 i; PRL_HANDLE adapter = PRL_INVALID_HANDLE; - PRL_UINT32 len; char adapterMac[PRL_MAC_STRING_BUFNAME]; char expectedMac[PRL_MAC_STRING_BUFNAME]; @@ -2876,12 +2885,11 @@ prlsdkFindNetByMAC(PRL_HANDLE sdkdom, virMacAddrPtr mac) pret = PrlVmCfg_GetNetAdapter(sdkdom, i, &adapter); prlsdkCheckRetGoto(pret, cleanup); - len = sizeof(adapterMac); - memset(adapterMac, 0, sizeof(adapterMac)); - pret = PrlVmDevNet_GetMacAddress(adapter, adapterMac, &len); + pret = PrlVmDevNet_GetMacAddress_Fixed(adapter, adapterMac, + sizeof(adapterMac)); prlsdkCheckRetGoto(pret, cleanup); - if (memcmp(adapterMac, expectedMac, PRL_MAC_STRING_BUFNAME) == 0) + if (STREQ(adapterMac, expectedMac)) return adapter; PrlHandle_Free(adapter); -- 1.8.3.1

Reply

Sign in to reply online Use email software

3437

Age (days ago)

3443

Last active (days ago)

Download

5 comments

2 participants

tags

participants (2)

Maxim Nestratov
Nikolay Shirokovskiy