External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmware: refactor vmwareUpdateVMStatus

Browse Source 
Use g_auto and get rid of the cleanup label, as well as the ret
variable.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2021-12-13 18:14:05 +01:00
parent 975a2b3555
commit f7bdd27d2c
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/vmware/vmware_driver.c
View File

@ -284,27 +284,26 @@ vmwareConnectGetVersion(virConnectPtr conn, unsigned long *version)
static int static int
vmwareUpdateVMStatus(struct vmware_driver *driver, virDomainObj *vm) vmwareUpdateVMStatus(struct vmware_driver *driver, virDomainObj *vm)
{ {
virCommand *cmd; g_autoptr(virCommand) cmd = NULL;
char *outbuf = NULL; g_autofree char *outbuf = NULL;
char *vmxAbsolutePath = NULL; g_autofree char *vmxAbsolutePath = NULL;
char *parsedVmxPath = NULL; char *parsedVmxPath = NULL;
char *str; char *str;
char *saveptr = NULL; char *saveptr = NULL;
bool found = false; bool found = false;
int oldState = virDomainObjGetState(vm, NULL); int oldState = virDomainObjGetState(vm, NULL);
int newState; int newState;
int ret = -1;
cmd = virCommandNewArgList(driver->vmrun, "-T", cmd = virCommandNewArgList(driver->vmrun, "-T",
vmwareDriverTypeToString(driver->type), vmwareDriverTypeToString(driver->type),
"list", NULL); "list", NULL);
virCommandSetOutputBuffer(cmd, &outbuf); virCommandSetOutputBuffer(cmd, &outbuf);
if (virCommandRun(cmd, NULL) < 0) if (virCommandRun(cmd, NULL) < 0)
goto cleanup; return -1;
if (virFileResolveAllLinks(((vmwareDomainPtr) vm->privateData)->vmxPath, if (virFileResolveAllLinks(((vmwareDomainPtr) vm->privateData)->vmxPath,
&vmxAbsolutePath) < 0) &vmxAbsolutePath) < 0)
goto cleanup; return -1;
for (str = outbuf; (parsedVmxPath = strtok_r(str, "\n", &saveptr)) != NULL; for (str = outbuf; (parsedVmxPath = strtok_r(str, "\n", &saveptr)) != NULL;
str = NULL) { str = NULL) {
@ -331,13 +330,7 @@ vmwareUpdateVMStatus(struct vmware_driver *driver, virDomainObj *vm)
virDomainObjSetState(vm, newState, 0); virDomainObjSetState(vm, newState, 0);
ret = 0; return 0;
cleanup:
virCommandFree(cmd);
VIR_FREE(outbuf);
VIR_FREE(vmxAbsolutePath);
return ret;
} }
static int static int