External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

vmware: use g_autofree and remove unnecessary label

Browse Source 
Signed-off-by: Jiang Jiacheng <jiangjiacheng@huawei.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiang Jiacheng 2023-01-06 17:18:38 +08:00 committed by Ján Tomko
parent c49a7e359c
commit e26c5d1212
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/vmware/vmware_conf.c
View File

@ -338,9 +338,8 @@ int
vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) vmwareVmxPath(virDomainDef *vmdef, char **vmxPath)
{ {
virDomainDiskDef *disk = NULL; virDomainDiskDef *disk = NULL;
char *directoryName = NULL; g_autofree char *directoryName = NULL;
char *fileName = NULL; g_autofree char *fileName = NULL;
int ret = -1;
size_t i; size_t i;
const char *src; const char *src;
@ -355,7 +354,7 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Domain XML doesn't contain any disks, " _("Domain XML doesn't contain any disks, "
"cannot deduce datastore and path for VMX file")); "cannot deduce datastore and path for VMX file"));
goto cleanup; return -1;
} }
for (i = 0; i < vmdef->ndisks; ++i) { for (i = 0; i < vmdef->ndisks; ++i) {
@ -370,7 +369,7 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Domain XML doesn't contain any file-based harddisks, " _("Domain XML doesn't contain any file-based harddisks, "
"cannot deduce datastore and path for VMX file")); "cannot deduce datastore and path for VMX file"));
goto cleanup; return -1;
} }
src = virDomainDiskGetSource(disk); src = virDomainDiskGetSource(disk);
@ -378,27 +377,22 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("First file-based harddisk has no source, cannot " _("First file-based harddisk has no source, cannot "
"deduce datastore and path for VMX file")); "deduce datastore and path for VMX file"));
goto cleanup; return -1;
} }
if (vmwareParsePath(src, &directoryName, &fileName) < 0) if (vmwareParsePath(src, &directoryName, &fileName) < 0)
goto cleanup; return -1;
if (!virStringHasCaseSuffix(fileName, ".vmdk")) { if (!virStringHasCaseSuffix(fileName, ".vmdk")) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Expecting source '%s' of first file-based harddisk " _("Expecting source '%s' of first file-based harddisk "
"to be a VMDK image"), src); "to be a VMDK image"), src);
goto cleanup; return -1;
} }
vmwareConstructVmxPath(directoryName, vmdef->name, vmxPath); vmwareConstructVmxPath(directoryName, vmdef->name, vmxPath);
ret = 0; return 0;
cleanup:
VIR_FREE(directoryName);
VIR_FREE(fileName);
return ret;
} }
int int
@ -436,8 +430,8 @@ vmwareMakePath(char *srcDir, char *srcName, char *srcExt, char **outpath)
int int
vmwareExtractPid(const char * vmxPath) vmwareExtractPid(const char * vmxPath)
{ {
char *vmxDir = NULL; g_autofree char *vmxDir = NULL;
char *logFilePath = NULL; g_autofree char *logFilePath = NULL;
FILE *logFile = NULL; FILE *logFile = NULL;
char line[1024]; char line[1024];
char *tmp = NULL; char *tmp = NULL;
@ -473,8 +467,6 @@ vmwareExtractPid(const char * vmxPath)
} }
cleanup: cleanup:
VIR_FREE(vmxDir);
VIR_FREE(logFilePath);
VIR_FORCE_FCLOSE(logFile); VIR_FORCE_FCLOSE(logFile);
return pid_value; return pid_value;
} }