From patchwork Wed Sep 25 11:10:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 830469 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1374:b0:367:895a:4699 with SMTP id q20csp686182wrz; Wed, 25 Sep 2024 04:16:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU8lZ3nFOrZrx1l6Jo0WIcfoyLGqiOyt34wVlYNj1wt4Vq+n5IGQq3sK1I8VU3V1jDw91en+g==@linaro.org X-Google-Smtp-Source: AGHT+IGpY2zwzPFm1DCrSnlgWqUv+eFlHb4y7J9pBj4UZ3z7gD0HpENeAUBWHjNc//B2+0aWKriq X-Received: by 2002:a05:6214:440e:b0:6c5:5418:a055 with SMTP id 6a1803df08f44-6cb1dd6cf98mr40331366d6.30.1727262996261; Wed, 25 Sep 2024 04:16:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727262996; cv=none; d=google.com; s=arc-20240605; b=ZYdeah6ROU05vpim/gE4gvhtzn0tp+C7zhLXndB6doB22YFJZhCY3LqXhD4Zote61Z ZWUWePfcAW0xtsiuVi75oCLUPSrL4v6K2ni++0NHuDv6T8TkJAnfyoWaOGZqaaKQQech 4ZRi0dhLRF9DLVAtDUJ/XZOkrmDhK1BK98lgFaFYndkdbLxON9/Qni27drSn4DIu1/6X r3Ks7UOMXcnlVclNwKZvKe3dIEXcD8PL094Mg3Dw4MXAdORDKz3MK84FfinAs7W5ewXm D89LWtLoTCPdntyMknuhpC8Uoi8MFxGDaQ29oSptRPMpMwVdzMwMqcL76KQOjcszPPI6 Nljg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JiBT728skRmdm88rj1Bi2KyJhTYibecJXAT1gwEUtJE=; fh=W6xzREthpkPEW8tziq0xxHpztmQWB2zzpMc8Zy+HmrY=; b=K76bhLc8pnW9xKn0gKO0hZOqVAa9clWmKEm6UTQQlfT4Uh9H6cmErQgNz/Qcg9SFFI cCiHBwkiKTpskuurB2GcF/MzSf18gP0yfuZZY94QpmgObGobOZuX2klvBbq61XUPTgAY LCj9y4+qT+OyY9U+lAmlPMcLBa19zP1fp2YYagpk12LI9uTR4xTLuF2ckgg6wq36qQ53 618yuXlgj7LgnISc65EOYnx/P7brUuJpnjeryzqggItiWe0rgVRkYes+1P7H9O4iyniv 62Sg5NKyPW3z+9wqIPT6A9IazSQ/3nDIfn6KleubTCUsvLejj+9O/tZghq276b7mhC03 +nrg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SpwYuMJd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6cb0f7a3060si36974346d6.435.2024.09.25.04.16.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Sep 2024 04:16:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SpwYuMJd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stPxq-0003lS-7H; Wed, 25 Sep 2024 07:13:46 -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 1stPwJ-0004ui-Lu for qemu-devel@nongnu.org; Wed, 25 Sep 2024 07:12:12 -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 1stPwH-0003s6-Se for qemu-devel@nongnu.org; Wed, 25 Sep 2024 07:12:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727262729; 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=JiBT728skRmdm88rj1Bi2KyJhTYibecJXAT1gwEUtJE=; b=SpwYuMJdxhOoQJKrmAMF7qqN9YN6GvbNyk1fwJ2YPzjJXlEbEv+ZDYEii2+h9ZbX3mb1AN oJwqR59WfBqMGbYBjMbVDGjfVz+oH+NW7wd2KSsGTlwofSA1G/ZWYngCBZBYWdPs733TRw Jh9/z1r5lkVgZkhqNPjzrLkWNrNGKJA= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-mGe3v-JZNtyMHyZc5yM9OA-1; Wed, 25 Sep 2024 07:12:07 -0400 X-MC-Unique: mGe3v-JZNtyMHyZc5yM9OA-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.15]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 84593197701F; Wed, 25 Sep 2024 11:12:06 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.206]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F25E31956094; Wed, 25 Sep 2024 11:12:04 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Pierrick Bouvier Subject: [PULL 35/44] hw/net: remove return after g_assert_not_reached() Date: Wed, 25 Sep 2024 13:10:16 +0200 Message-ID: <20240925111029.24082-36-thuth@redhat.com> In-Reply-To: <20240925111029.24082-1-thuth@redhat.com> References: <20240925111029.24082-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.108, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier This patch is part of a series that moves towards a consistent use of g_assert_not_reached() rather than an ad hoc mix of different assertion mechanisms. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-ID: <20240919044641.386068-28-pierrick.bouvier@linaro.org> Signed-off-by: Thomas Huth --- hw/net/e1000e_core.c | 2 -- hw/net/igb_core.c | 2 -- hw/net/vmxnet3.c | 1 - 3 files changed, 5 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 248381f976..2e4c50ddba 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -562,7 +562,6 @@ e1000e_rss_calc_hash(E1000ECore *core, break; default: g_assert_not_reached(); - return 0; } return net_rx_pkt_calc_rss_hash(pkt, type, (uint8_t *) &core->mac[RSSRK]); @@ -841,7 +840,6 @@ e1000e_ring_free_descr_num(E1000ECore *core, const E1000ERingInfo *r) } g_assert_not_reached(); - return 0; } static inline bool diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 6be6140771..5dffa12c64 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -398,7 +398,6 @@ igb_rss_calc_hash(IGBCore *core, struct NetRxPkt *pkt, E1000E_RSSInfo *info) break; default: g_assert_not_reached(); - return 0; } return net_rx_pkt_calc_rss_hash(pkt, type, (uint8_t *) &core->mac[RSSRK]); @@ -747,7 +746,6 @@ igb_ring_free_descr_num(IGBCore *core, const E1000ERingInfo *r) } g_assert_not_reached(); - return 0; } static inline bool diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index bb8583c7ab..8aa8c46228 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -456,7 +456,6 @@ vmxnet3_setup_tx_offloads(VMXNET3State *s) default: g_assert_not_reached(); - return false; } return true;