From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Pierrick Bouvier <pierrick.bouvier@linaro.org>
Subject: [PULL 35/44] hw/net: remove return after g_assert_not_reached()
Date: Wed, 25 Sep 2024 13:10:16 +0200 [thread overview]
Message-ID: <20240925111029.24082-36-thuth@redhat.com> (raw)
In-Reply-To: <20240925111029.24082-1-thuth@redhat.com>
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
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 <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-ID: <20240919044641.386068-28-pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
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;
--
2.46.0
next prev parent reply other threads:[~2024-09-25 11:16 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-25 11:09 [PULL 00/44] Functional test conversion, and assert(0) cleanup Thomas Huth
2024-09-25 11:09 ` [PULL 01/44] tests/functional/qemu_test: Add a function for launching kernels more easily Thomas Huth
2024-09-25 11:09 ` [PULL 02/44] tests/functional: Convert the vexpressa9 Avocado test Thomas Huth
2024-09-30 16:47 ` Peter Maydell
2024-09-30 17:21 ` Thomas Huth
2024-09-25 11:09 ` [PULL 03/44] tests/functional: Convert the xtensa lx60 " Thomas Huth
2024-09-25 11:09 ` [PULL 04/44] tests/functional: Convert the SPARCStation " Thomas Huth
2024-09-25 11:09 ` [PULL 05/44] tests/functional: Convert the e500 ppc64 " Thomas Huth
2024-09-25 11:09 ` [PULL 06/44] tests/functional: Convert the mac ppc Avocado tests Thomas Huth
2024-09-25 11:09 ` [PULL 07/44] tests/functional: Convert the r2d sh4 Avocado test Thomas Huth
2024-09-25 11:09 ` [PULL 08/44] tests/functional: Convert the powernv tests from boot_linux_console.py Thomas Huth
2024-09-25 11:09 ` [PULL 09/44] hw/acpi: replace assert(0) with g_assert_not_reached() Thomas Huth
2024-09-25 11:09 ` [PULL 10/44] hw/arm: " Thomas Huth
2024-09-25 11:09 ` [PULL 11/44] hw/net: " Thomas Huth
2024-09-25 11:09 ` [PULL 12/44] migration: " Thomas Huth
2024-09-25 11:09 ` [PULL 13/44] qobject: " Thomas Huth
2024-09-25 11:09 ` [PULL 14/44] target/ppc: " Thomas Huth
2024-09-25 11:09 ` [PULL 15/44] block: replace assert(false) " Thomas Huth
2024-09-25 11:09 ` [PULL 16/44] hw/hyperv: " Thomas Huth
2024-09-25 11:09 ` [PULL 17/44] hw/net: " Thomas Huth
2024-09-25 11:09 ` [PULL 18/44] hw/nvme: " Thomas Huth
2024-09-25 11:10 ` [PULL 19/44] hw/pci: " Thomas Huth
2024-09-25 11:10 ` [PULL 20/44] hw/ppc: " Thomas Huth
2024-09-25 11:10 ` [PULL 21/44] migration: " Thomas Huth
2024-09-25 11:10 ` [PULL 22/44] target/i386/kvm: " Thomas Huth
2024-09-25 11:10 ` [PULL 23/44] accel/tcg: remove break after g_assert_not_reached() Thomas Huth
2024-09-25 11:10 ` [PULL 24/44] block: " Thomas Huth
2024-09-25 11:10 ` [PULL 25/44] hw/acpi: " Thomas Huth
2024-09-25 11:10 ` [PULL 26/44] hw/net: " Thomas Huth
2024-09-25 11:10 ` [PULL 27/44] hw/scsi: " Thomas Huth
2024-09-25 11:10 ` [PULL 28/44] hw/tpm: " Thomas Huth
2024-09-25 11:10 ` [PULL 29/44] target/arm: " Thomas Huth
2024-09-25 11:10 ` [PULL 30/44] target/riscv: " Thomas Huth
2024-09-25 11:10 ` [PULL 31/44] fpu: " Thomas Huth
2024-09-25 11:10 ` [PULL 32/44] tcg/loongarch64: " Thomas Huth
2024-09-25 11:10 ` [PULL 33/44] include/qemu: remove return " Thomas Huth
2024-09-25 11:10 ` [PULL 34/44] hw/hyperv: " Thomas Huth
2024-09-25 11:10 ` Thomas Huth [this message]
2024-09-25 11:10 ` [PULL 36/44] hw/pci: " Thomas Huth
2024-09-25 11:10 ` [PULL 37/44] hw/ppc: " Thomas Huth
2024-09-25 11:10 ` [PULL 38/44] migration: " Thomas Huth
2024-09-25 11:10 ` [PULL 39/44] qobject: " Thomas Huth
2024-09-25 11:10 ` [PULL 40/44] qom: " Thomas Huth
2024-09-25 11:10 ` [PULL 41/44] tests/qtest: " Thomas Huth
2024-09-25 11:10 ` [PULL 42/44] scripts/checkpatch.pl: emit error when using assert(false) Thomas Huth
2024-09-25 11:10 ` [PULL 43/44] .gitlab-ci.d: Split build and test in cross build job templates Thomas Huth
2024-09-25 11:10 ` [PULL 44/44] .gitlab-ci.d: Make separate collapsible log sections for build and test Thomas Huth
2024-09-25 17:24 ` [PULL 00/44] Functional test conversion, and assert(0) cleanup Pierrick Bouvier
2024-09-28 13:37 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240925111029.24082-36-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).