From nobody Tue Dec 16 11:43:00 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1744014463; cv=none; d=zohomail.com; s=zohoarc; b=blUtx1C96r8rxT3A5lKpouontS+zqXN5jlbSqygI7IwBzMqUPFvO67dwjlDXXc0BJ7CEtOJwNtZbHYBVK8+GMrz9jVlUrgkCccZD4inR29v98TRZFVnpmGCFeVGFeKxAVSnV1zPMaObM2JU8HOqs3jDkU58ItRizL30HygAiUf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744014463; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5/FPCcQU2LQwNiJcNdThWSQqn4VaN8ZlgUtwJrhJ/hk=; b=kM1VaxGZwzMM+QU7X8IxQ77ZfFsXB353ju2SBTjriBP2DS6dWRapxKwOoGyZHWsnmtVoWMbPO3GOQNBmeW9KnMJatqCF8/wD5hy6rQzAPzCRX3rZ4fik6KU06rFwssOo2NAXWEL1ZXJJqpf/tdvNW5OIlacZ2MJSRootBqDO3mU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1744014463828492.9771606465712; Mon, 7 Apr 2025 01:27:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1hoz-0000rY-5M; Mon, 07 Apr 2025 04:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1hol-0000qb-ND for qemu-devel@nongnu.org; Mon, 07 Apr 2025 04:26:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1hoj-0002N8-Fy for qemu-devel@nongnu.org; Mon, 07 Apr 2025 04:26:55 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-687-iu5oSLxUPoKrK1-h9Fj-Fw-1; Mon, 07 Apr 2025 04:26:47 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3AAEA180025F; Mon, 7 Apr 2025 08:26:46 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.44.22.7]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CAA1419560AD; Mon, 7 Apr 2025 08:26:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 35B9F21E65D0; Mon, 07 Apr 2025 10:26:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744014410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5/FPCcQU2LQwNiJcNdThWSQqn4VaN8ZlgUtwJrhJ/hk=; b=bvVEkhnNPoYW0fLFZ1qBH3NPn0zJWO9jitbXy4yRNAWtan4W4jgrxnedQxpys8Ef0qy4Lq w02vqC+Zlr+R+OX9sPf+RZWh1dnSs2qDZqcoi5Fy++2769grBVnrXfNH1EX1smN8S0QsFK oSgUs8cMIokJzd7cWbBPKK9ia6ayMDo= X-MC-Unique: iu5oSLxUPoKrK1-h9Fj-Fw-1 X-Mimecast-MFC-AGG-ID: iu5oSLxUPoKrK1-h9Fj-Fw_1744014406 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, peter.maydell@linaro.org, Corey Minyard Subject: [PATCH v2 3/3] cleanup: Drop pointless label at end of function Date: Mon, 7 Apr 2025 10:26:43 +0200 Message-ID: <20250407082643.2310002-4-armbru@redhat.com> In-Reply-To: <20250407082643.2310002-1-armbru@redhat.com> References: <20250407082643.2310002-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.659, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1744014466505019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson Acked-by: Corey Minyard --- hw/ipmi/ipmi_bmc_extern.c | 4 +--- hw/ipmi/ipmi_bmc_sim.c | 7 ++----- hw/ipmi/ipmi_bt.c | 7 +++---- hw/ipmi/ipmi_kcs.c | 3 +-- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index 73b249fb60..ab9b66274d 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -213,7 +213,7 @@ static void ipmi_bmc_extern_handle_command(IPMIBmc *b, rsp[2] =3D err; ibe->waiting_rsp =3D false; k->handle_rsp(s, msg_id, rsp, 3); - goto out; + return; } =20 addchar(ibe, msg_id); @@ -228,8 +228,6 @@ static void ipmi_bmc_extern_handle_command(IPMIBmc *b, =20 /* Start the transmit */ continue_send(ibe); - - out: } =20 static void handle_hw_op(IPMIBmcExtern *ibe, unsigned char hw_op) diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index faec6fefb3..f4336946ce 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -463,13 +463,12 @@ void ipmi_bmc_gen_event(IPMIBmc *b, uint8_t *evt, boo= l log) } =20 if (ibs->msg_flags & IPMI_BMC_MSG_FLAG_EVT_BUF_FULL) { - goto out; + return; } =20 memcpy(ibs->evtbuf, evt, 16); ibs->msg_flags |=3D IPMI_BMC_MSG_FLAG_EVT_BUF_FULL; k->set_atn(s, 1, attn_irq_enabled(ibs)); - out: } static void gen_event(IPMIBmcSim *ibs, unsigned int sens_num, uint8_t deas= sert, uint8_t evd1, uint8_t evd2, uint8_t evd3) @@ -979,7 +978,7 @@ static void get_msg(IPMIBmcSim *ibs, =20 if (QTAILQ_EMPTY(&ibs->rcvbufs)) { rsp_buffer_set_error(rsp, 0x80); /* Queue empty */ - goto out; + return; } rsp_buffer_push(rsp, 0); /* Channel 0 */ msg =3D QTAILQ_FIRST(&ibs->rcvbufs); @@ -994,8 +993,6 @@ static void get_msg(IPMIBmcSim *ibs, ibs->msg_flags &=3D ~IPMI_BMC_MSG_FLAG_RCV_MSG_QUEUE; k->set_atn(s, attn_set(ibs), attn_irq_enabled(ibs)); } - -out: } =20 static unsigned char diff --git a/hw/ipmi/ipmi_bt.c b/hw/ipmi/ipmi_bt.c index 3ef1f435e7..f769cfa243 100644 --- a/hw/ipmi/ipmi_bt.c +++ b/hw/ipmi/ipmi_bt.c @@ -98,14 +98,14 @@ static void ipmi_bt_handle_event(IPMIInterface *ii) IPMIBT *ib =3D iic->get_backend_data(ii); =20 if (ib->inlen < 4) { - goto out; + return; } /* Note that overruns are handled by handle_command */ if (ib->inmsg[0] !=3D (ib->inlen - 1)) { /* Length mismatch, just ignore. */ IPMI_BT_SET_BBUSY(ib->control_reg, 1); ib->inlen =3D 0; - goto out; + return; } if ((ib->inmsg[1] =3D=3D (IPMI_NETFN_APP << 2)) && (ib->inmsg[3] =3D=3D IPMI_CMD_GET_BT_INTF_CAP)) { @@ -136,7 +136,7 @@ static void ipmi_bt_handle_event(IPMIInterface *ii) IPMI_BT_SET_B2H_IRQ(ib->mask_reg, 1); ipmi_bt_raise_irq(ib); } - goto out; + return; } ib->waiting_seq =3D ib->inmsg[2]; ib->inmsg[2] =3D ib->inmsg[1]; @@ -145,7 +145,6 @@ static void ipmi_bt_handle_event(IPMIInterface *ii) bk->handle_command(ib->bmc, ib->inmsg + 2, ib->inlen - 2, sizeof(ib->inmsg), ib->waiting_rsp); } - out: } =20 static void ipmi_bt_handle_rsp(IPMIInterface *ii, uint8_t msg_id, diff --git a/hw/ipmi/ipmi_kcs.c b/hw/ipmi/ipmi_kcs.c index f4f1523d6b..5bfc34676f 100644 --- a/hw/ipmi/ipmi_kcs.c +++ b/hw/ipmi/ipmi_kcs.c @@ -168,7 +168,7 @@ static void ipmi_kcs_handle_event(IPMIInterface *ii) ik->outpos =3D 0; bk->handle_command(ik->bmc, ik->inmsg, ik->inlen, sizeof(ik->i= nmsg), ik->waiting_rsp); - goto out_noibf; + return; } else if (ik->cmd_reg =3D=3D IPMI_KCS_WRITE_END_CMD) { ik->cmd_reg =3D -1; ik->write_end =3D 1; @@ -197,7 +197,6 @@ static void ipmi_kcs_handle_event(IPMIInterface *ii) ik->cmd_reg =3D -1; ik->data_in_reg =3D -1; IPMI_KCS_SET_IBF(ik->status_reg, 0); - out_noibf: } =20 static void ipmi_kcs_handle_rsp(IPMIInterface *ii, uint8_t msg_id, --=20 2.48.1