| Message ID | 20200910072325.439344-2-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw: Replace some impossible checks by assertions | expand |
Le 10/09/2020 à 09:23, Philippe Mathieu-Daudé a écrit : > 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> > --- > 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 4f78774dc8f..158b0a074e5 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/module.h" > @@ -173,8 +171,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); > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index 4f78774dc8f..158b0a074e5 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/module.h" @@ -173,8 +171,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);
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> --- hw/gpio/max7310.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)