From patchwork Thu Sep 19 04:46:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 13807353 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6BAAC770E9 for ; Thu, 19 Sep 2024 04:47:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726721261; cv=none; b=htalzZnlRU1OnekfKSh6gEf+WKiuh5J0tM4R1GGbY/LcTCGO58X42sbjXHEkm7DZZzx148WpbqzLPXiHrPwUsu0E0lEKvcoMx0fQLD98AinxxypabDHFDRxGoraZRdEEjrZSndAv/Zx72TpwMLuIWC82DA9YlAxqL3Y1lAueQqc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726721261; c=relaxed/simple; bh=tptLqlcF/Nx0RRmv6IB9N0XbV+UnMzYqcQa/pMA/Qe8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=m4kta8RGS8Hx0qO0zeqH4CMqu9B6cYliR7hJPQ+fF+fPgYc9EXQCtxmgM8Z3OB/7HRmhEh29bs9/LXpFVk0obQIlhN4XNTCZlOqjHozTTM3aZWKop03hPoyxeptT2f7srTQT1RuIhK/3/efPuRhoDS98LVOBHXptekgw1QtBw1U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=b32aZyIM; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="b32aZyIM" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7191df6b5f5so286978b3a.0 for ; Wed, 18 Sep 2024 21:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726721260; x=1727326060; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aVLlQ1azCZTPpBP5TtwQ0P5RnlTFYhwK6Tm+S/9eUGE=; b=b32aZyIMcN4wdkYc7RCAOCGUKdgK+brgqmR74IYcfpsC0rvhHnZ9v0qVtg2TAQ4Gcw cA0R0b4VvUbCnY/IOLYhxr2RPROsm3zdvMNSM6W6f09nN/w8gUg7CMD8gohxDMwX2DJX Cydyb2dqDurawraKEiEhmA5I5CWOaWm3l97bNs08ekK3oHqjbbVkQE728WktYDxbq/Nu MChyGDN02VS2/3Ksw2BWRWq2BOs5X2M+0jvccsNDi66xLiEP2nUJXu9BZ9I56iLgRjIn fiVjvtxecvhaBwlABys62u1hFedSjSupxGjCK9PjAHPoWjQE6IdNhz3MQVE3XR12/1uk TFkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726721260; x=1727326060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aVLlQ1azCZTPpBP5TtwQ0P5RnlTFYhwK6Tm+S/9eUGE=; b=XsZlsmIj/Y2KhBQFxZ/S/z4Q++/Xru3ch1cA0VvhZiUHAp8pnEuImXOjUG+b1vjbj6 kbVe4tOcldq+RPvlZsUNGyNqIDYcgubfBmrDm1pggGnPzCyy+9v2QsAz2OUzgYHuKfmQ FKgIMJI/Ms88kwLD4t+NTrqoAs6d7TQb/6boA7BB2LVMGz0mfB4Y4S9DjKxE3TeHJIEB yhMrEaYTzbJqHvLHM0acFE23jMRDppNDo8HPZkUXF+S1Gh/mQP3hDsvuXAkApB4nj8KE iDL2yaZATX+PRVrnKmhbvqrQoRspmRLofEPElQltjGwxvtYFAld5wrZZTiC3b6AAyNx/ w5DA== X-Forwarded-Encrypted: i=1; AJvYcCUteab1Qk7gC7FMiVCgbT4tDwb5SVM5r4UjYP7FwT8iGF1U93/03SsSg/a8q0blwcHXS60=@vger.kernel.org X-Gm-Message-State: AOJu0Ywh8agycJAUB8C5yhCh8WBw13ghoqP7Q0eoobzOnnfjarG+R5/D ySCDBvcrLhIgT56N9t4p7x9lof3pDB2+1o7xhz+VzpCreKxnAZj4i6sv0tPeV/Y= X-Google-Smtp-Source: AGHT+IGrzvQ2fWBlgZ0/fu1uxdvH2ybmzImXSv0pyHCUPeGuO+jD1r3RwXqEDbd4priHhUIUEE1u1A== X-Received: by 2002:a05:6a20:cd0e:b0:1cf:476f:2d10 with SMTP id adf61e73a8af0-1cf76239c98mr35848879637.49.1726721259880; Wed, 18 Sep 2024 21:47:39 -0700 (PDT) Received: from linaro.. (216-180-64-156.dyn.novuscom.net. [216.180.64.156]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71944bc279csm7478601b3a.188.2024.09.18.21.47.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 21:47:39 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Hyman Huang , Halil Pasic , kvm@vger.kernel.org, Bin Meng , Peter Xu , Liu Zhiwei , David Gibson , Daniel Henrique Barboza , qemu-s390x@nongnu.org, Dmitry Fleytman , Hanna Reitz , Klaus Jensen , Corey Minyard , Laurent Vivier , WANG Xuerui , Thomas Huth , Rob Herring , Eduardo Habkost , Nicholas Piggin , "Michael S. Tsirkin" , Harsh Prateek Bora , "Maciej S. Szmigiero" , Ani Sinha , Stefan Berger , Fam Zheng , Laurent Vivier , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Keith Busch , Jean-Christophe Dubois , qemu-riscv@nongnu.org, Igor Mammedov , Akihiko Odaki , Sriram Yagnaraman , Jason Wang , Eric Farman , "Richard W.M. Jones" , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Nina Schoetterl-Glausch , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Alex_Benn=C3=A9e?= , Fabiano Rosas , Marcel Apfelbaum , qemu-arm@nongnu.org, Christian Borntraeger , qemu-ppc@nongnu.org, Zhao Liu , Daniel Henrique Barboza , qemu-block@nongnu.org, Joel Stanley , Weiwei Li , Kevin Wolf , Helge Deller , Yanan Wang , Michael Rolnik , Jesper Devantier , Marcelo Tosatti , Peter Maydell , Pierrick Bouvier Subject: [PATCH v3 27/34] hw/net: remove return after g_assert_not_reached() Date: Wed, 18 Sep 2024 21:46:34 -0700 Message-Id: <20240919044641.386068-28-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240919044641.386068-1-pierrick.bouvier@linaro.org> References: <20240919044641.386068-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- 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 248381f9766..2e4c50ddbaf 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 6be61407715..5dffa12c64b 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 bb8583c7aba..8aa8c462283 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;