From nobody Sun Feb 8 11:07:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600884924; cv=none; d=zohomail.com; s=zohoarc; b=ikGdo2Byz9e0cf5YzumMIVU7qVDgYiV2wHRLQiOkx4DwExY6GUmwcOmyJuwzOvcZ87OowOouSXbtpUJZMrTuW1XepZjEHfzlNCLCMXRImMqCqmUTxsypYxNoFkZvb/OTV3HN5Xzemc2JJVN8E0iILLXcZgKtuJLdxhzS3HukiME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600884924; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2m1BmH4tEaO7hJHkFwFm/6X/kQ06GJHccnjymm2ScSY=; b=gNnxpFu97hKel0FizHqyXS/lut8EI8U34zAOZGN0pTqPvNBkzJq5I0T4NoYGKBvei6s+bTrvV9Gux0hZmUQutCbcJw2+Q8s0odz+B3lg23MRuAdwoW2ckgwgQ+svHUygYX5ph3Og95V5+y2UF15Ce9iW3duDGXmBqms3mGU/AYU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1600884924556764.6569270915788; Wed, 23 Sep 2020 11:15:24 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-nfqUoczzMcCCblpNc4UyOQ-1; Wed, 23 Sep 2020 14:15:20 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22793801FD8; Wed, 23 Sep 2020 18:15:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F10615D98D; Wed, 23 Sep 2020 18:15:13 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A85E644A46; Wed, 23 Sep 2020 18:15:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08NIFBvQ017969 for ; Wed, 23 Sep 2020 14:15:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 101BB78827; Wed, 23 Sep 2020 18:15:11 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A2F17882C for ; Wed, 23 Sep 2020 18:15:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600884923; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=2m1BmH4tEaO7hJHkFwFm/6X/kQ06GJHccnjymm2ScSY=; b=QeyledH/9YnewESa7EYgvVxF5aeCjV3Ig640tYN9KPPH+S8ipxStK9AEu05LMLul1Oi5Fc XJ/LpEf0ggjx6bjgfXOUSFj7pdLyo4Y2OoBO/l2Dpu+POjgDI1o8PmWhuuiLA/nqbrJGrZ cnEV92jURVqlpa88yLk9Bm7Xxm/2huQ= X-MC-Unique: nfqUoczzMcCCblpNc4UyOQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 03/14] vbox: StartMachine: overwrite ret less often Date: Wed, 23 Sep 2020 20:14:52 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Use goto to jump over the ret =3D 0 assignment as is usual in rest of the code. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander --- src/vbox/vbox_common.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 9978741a64..99c7fbd117 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -2090,7 +2090,7 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMac= hine *machine, vboxIID *iid int ret =3D -1; =20 if (!data->vboxObj) - return ret; + return -1; =20 VBOX_UTF8_TO_UTF16("FRONTEND/Type", &keyTypeUtf16); gVBoxAPI.UIMachine.GetExtraData(machine, keyTypeUtf16, &valueTypeUtf16= ); @@ -2177,7 +2177,7 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMac= hine *machine, vboxIID *iid if (NS_FAILED(rc)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("OpenRemoteSession/LaunchVMProcess failed, domain= can't be started")); - ret =3D -1; + goto cleanup; } else { PRBool completed =3D 0; resultCodeUnion resultCode; @@ -2186,19 +2186,21 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IM= achine *machine, vboxIID *iid rc =3D gVBoxAPI.UIProgress.GetCompleted(progress, &completed); if (NS_FAILED(rc)) { /* error */ - ret =3D -1; + goto cleanup; } gVBoxAPI.UIProgress.GetResultCode(progress, &resultCode); if (RC_FAILED(resultCode)) { /* error */ - ret =3D -1; + goto cleanup; } else { /* all ok set the domid */ dom->id =3D maxDomID + 1; - ret =3D 0; } } =20 + ret =3D 0; + + cleanup: VBOX_RELEASE(progress); =20 gVBoxAPI.UISession.Close(data->vboxSession); --=20 2.26.2