diff options
| author | Peter Maydell | 2018-04-20 16:52:44 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-26 14:57:00 +0200 |
| commit | fc38a1120c2fabb76546ef8980e6d18b5fb7e843 (patch) | |
| tree | 3b58b52e56a00a7ac26ef416b88dd0a3ba8bf417 /hw/arm/stm32f205_soc.c | |
| parent | Change references to serial_hds[] to serial_hd() (diff) | |
| download | qemu-fc38a1120c2fabb76546ef8980e6d18b5fb7e843.tar.gz qemu-fc38a1120c2fabb76546ef8980e6d18b5fb7e843.tar.xz qemu-fc38a1120c2fabb76546ef8980e6d18b5fb7e843.zip | |
Remove checks on MAX_SERIAL_PORTS that are just bounds checks
Remove checks on MAX_SERIAL_PORTS that were just checking whether
they were within bounds for the serial_hds[] array and falling
back to NULL if not. This isn't needed with the serial_hd()
function, which returns NULL for all indexes beyond what the
user set up.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180420145249.32435-9-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm/stm32f205_soc.c')
| -rw-r--r-- | hw/arm/stm32f205_soc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index f59418e7d0..2b2135d382 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -135,8 +135,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp) /* Attach UART (uses USART registers) and USART controllers */ for (i = 0; i < STM_NUM_USARTS; i++) { dev = DEVICE(&(s->usart[i])); - qdev_prop_set_chr(dev, "chardev", - i < MAX_SERIAL_PORTS ? serial_hd(i) : NULL); + qdev_prop_set_chr(dev, "chardev", serial_hd(i)); object_property_set_bool(OBJECT(&s->usart[i]), true, "realized", &err); if (err != NULL) { error_propagate(errp, err); |