diff options
| author | Markus Armbruster | 2020-07-07 18:05:52 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2020-07-10 15:18:08 +0200 |
| commit | 4d21fcd52404ff4bac1f94d8054dfb745f1b2ad6 (patch) | |
| tree | 922e22ed49a401848d10392a832e474e16fc60bc /hw/gpio | |
| parent | qom: Crash more nicely on object_property_get_link() failure (diff) | |
| download | qemu-4d21fcd52404ff4bac1f94d8054dfb745f1b2ad6.tar.gz qemu-4d21fcd52404ff4bac1f94d8054dfb745f1b2ad6.tar.xz qemu-4d21fcd52404ff4bac1f94d8054dfb745f1b2ad6.zip | |
qom: Don't handle impossible object_property_get_link() failure
Don't handle object_property_get_link() failure that can't happen
unless the programmer screwed up, pass &error_abort.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200707160613.848843-25-armbru@redhat.com>
Diffstat (limited to 'hw/gpio')
| -rw-r--r-- | hw/gpio/bcm2835_gpio.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/hw/gpio/bcm2835_gpio.c b/hw/gpio/bcm2835_gpio.c index 91ce3d10cc..abdddbc67c 100644 --- a/hw/gpio/bcm2835_gpio.c +++ b/hw/gpio/bcm2835_gpio.c @@ -312,22 +312,11 @@ static void bcm2835_gpio_realize(DeviceState *dev, Error **errp) { BCM2835GpioState *s = BCM2835_GPIO(dev); Object *obj; - Error *err = NULL; - obj = object_property_get_link(OBJECT(dev), "sdbus-sdhci", &err); - if (obj == NULL) { - error_setg(errp, "%s: required sdhci link not found: %s", - __func__, error_get_pretty(err)); - return; - } + obj = object_property_get_link(OBJECT(dev), "sdbus-sdhci", &error_abort); s->sdbus_sdhci = SD_BUS(obj); - obj = object_property_get_link(OBJECT(dev), "sdbus-sdhost", &err); - if (obj == NULL) { - error_setg(errp, "%s: required sdhost link not found: %s", - __func__, error_get_pretty(err)); - return; - } + obj = object_property_get_link(OBJECT(dev), "sdbus-sdhost", &error_abort); s->sdbus_sdhost = SD_BUS(obj); } |