External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 13:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vbox: StartMachine: overwrite ret less often

Browse Source 
Use goto to jump over the ret = 0 assignment
as is usual in rest of the code.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Ján Tomko 2020-09-23 18:35:41 +02:00
parent 88957116c9
commit 3013c4659d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vbox/vbox_common.c
View File

@ -2090,7 +2090,7 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid
int ret = -1; int ret = -1;
if (!data->vboxObj) if (!data->vboxObj)
return ret; return -1;
VBOX_UTF8_TO_UTF16("FRONTEND/Type", &keyTypeUtf16); VBOX_UTF8_TO_UTF16("FRONTEND/Type", &keyTypeUtf16);
gVBoxAPI.UIMachine.GetExtraData(machine, keyTypeUtf16, &valueTypeUtf16); gVBoxAPI.UIMachine.GetExtraData(machine, keyTypeUtf16, &valueTypeUtf16);
@ -2177,7 +2177,7 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid
if (NS_FAILED(rc)) { if (NS_FAILED(rc)) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s", virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("OpenRemoteSession/LaunchVMProcess failed, domain can't be started")); _("OpenRemoteSession/LaunchVMProcess failed, domain can't be started"));
ret = -1; goto cleanup;
} else { } else {
PRBool completed = 0; PRBool completed = 0;
resultCodeUnion resultCode; resultCodeUnion resultCode;
@ -2186,19 +2186,21 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid
rc = gVBoxAPI.UIProgress.GetCompleted(progress, &completed); rc = gVBoxAPI.UIProgress.GetCompleted(progress, &completed);
if (NS_FAILED(rc)) { if (NS_FAILED(rc)) {
/* error */ /* error */
ret = -1; goto cleanup;
} }
gVBoxAPI.UIProgress.GetResultCode(progress, &resultCode); gVBoxAPI.UIProgress.GetResultCode(progress, &resultCode);
if (RC_FAILED(resultCode)) { if (RC_FAILED(resultCode)) {
/* error */ /* error */
ret = -1; goto cleanup;
} else { } else {
/* all ok set the domid */ /* all ok set the domid */
dom->id = maxDomID + 1; dom->id = maxDomID + 1;
ret = 0;
} }
} }
ret = 0;
cleanup:
VBOX_RELEASE(progress); VBOX_RELEASE(progress);
gVBoxAPI.UISession.Close(data->vboxSession); gVBoxAPI.UISession.Close(data->vboxSession);