From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
qemu-trivial@nongnu.org, "Michael Tokarev" <mjt@tls.msk.ru>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 01/17] hw/gpio/max7310: Remove impossible check
Date: Sat, 19 Sep 2020 20:44:35 +0200 [thread overview]
Message-ID: <20200919184451.2129349-2-laurent@vivier.eu> (raw)
In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu>
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
The max7310_gpio_set() handler is static and only used by
qdev_init_gpio_in, initialized with 8 IRQs. The 'line'
argument can not be out of the [0-8[ range.
Replace the dead code by an assertion.
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200910072325.439344-2-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/gpio/max7310.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
index 2888d071ac6b..de375892ef11 100644
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@ -8,9 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i2c/i2c.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
#include "qemu/log.h"
@@ -175,8 +173,7 @@ static const VMStateDescription vmstate_max7310 = {
static void max7310_gpio_set(void *opaque, int line, int level)
{
MAX7310State *s = (MAX7310State *) opaque;
- if (line >= ARRAY_SIZE(s->handler) || line < 0)
- hw_error("bad GPIO line");
+ assert(line >= 0 && line < ARRAY_SIZE(s->handler));
if (level)
s->level |= s->direction & (1 << line);
--
2.26.2
next prev parent reply other threads:[~2020-09-19 18:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-19 18:44 [PULL 00/17] Trivial branch for 5.2 patches Laurent Vivier
2020-09-19 18:44 ` Laurent Vivier [this message]
2020-09-19 18:44 ` [PULL 02/17] hw/ppc/ppc4xx_pci: Replace magic value by the PCI_NUM_PINS definition Laurent Vivier
2020-09-19 18:44 ` [PULL 03/17] ui/spice-input: Remove superfluous forward declaration Laurent Vivier
2020-09-19 18:44 ` [PULL 04/17] manual: escape backslashes in "parsed-literal" blocks Laurent Vivier
2020-09-19 18:44 ` [PULL 05/17] meson: remove empty else and duplicated gio deps Laurent Vivier
2020-09-19 18:44 ` [PULL 06/17] hw/timer/hpet: Remove unused functions hpet_ram_readb, hpet_ram_readw Laurent Vivier
2020-09-19 18:44 ` [PULL 07/17] hw/timer/hpet: Fix debug format strings Laurent Vivier
2020-09-19 18:44 ` [PULL 08/17] scripts/git.orderfile: Display meson files along with buildsys ones Laurent Vivier
2020-09-19 18:44 ` [PULL 09/17] qemu/: fix some comment spelling errors Laurent Vivier
2020-09-19 18:44 ` [PULL 10/17] migration/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 11/17] docs/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 12/17] scripts/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 13/17] util/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 14/17] linux-user/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 15/17] disas/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 16/17] qapi/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 17/17] contrib/: " Laurent Vivier
2020-09-19 19:10 ` [PULL 00/17] Trivial branch for 5.2 patches no-reply
2020-09-22 15:40 ` 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=20200919184451.2129349-2-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=f4bug@amsat.org \
--cc=mjt@tls.msk.ru \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=richard.henderson@linaro.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).