From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 24/53] qom: Don't handle impossible object_property_get_link() failure
Date: Tue, 7 Jul 2020 23:24:34 +0200 [thread overview]
Message-ID: <20200707212503.1495927-25-armbru@redhat.com> (raw)
In-Reply-To: <20200707212503.1495927-1-armbru@redhat.com>
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>
---
hw/arm/bcm2835_peripherals.c | 7 +------
hw/arm/bcm2836.c | 7 +------
hw/display/bcm2835_fb.c | 8 +-------
hw/dma/bcm2835_dma.c | 9 +--------
hw/gpio/bcm2835_gpio.c | 15 ++-------------
hw/intc/nios2_iic.c | 8 +-------
hw/misc/bcm2835_mbox.c | 9 +--------
hw/misc/bcm2835_property.c | 17 ++---------------
hw/usb/hcd-dwc2.c | 9 +--------
9 files changed, 11 insertions(+), 78 deletions(-)
diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c
index 2df81168e4..beade39e41 100644
--- a/hw/arm/bcm2835_peripherals.c
+++ b/hw/arm/bcm2835_peripherals.c
@@ -134,12 +134,7 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
uint64_t ram_size, vcram_size;
int n;
- obj = object_property_get_link(OBJECT(dev), "ram", &err);
- if (obj == NULL) {
- error_setg(errp, "%s: required ram link not found: %s",
- __func__, error_get_pretty(err));
- return;
- }
+ obj = object_property_get_link(OBJECT(dev), "ram", &error_abort);
ram = MEMORY_REGION(obj);
ram_size = memory_region_size(ram);
diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index 1a7560ef30..70ca2f0d9a 100644
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -77,12 +77,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
/* common peripherals from bcm2835 */
- obj = object_property_get_link(OBJECT(dev), "ram", &err);
- if (obj == NULL) {
- error_setg(errp, "%s: required ram link not found: %s",
- __func__, error_get_pretty(err));
- return;
- }
+ obj = object_property_get_link(OBJECT(dev), "ram", &error_abort);
object_property_add_const_link(OBJECT(&s->peripherals), "ram", obj);
diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 7c0e5eef2d..986c994522 100644
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -405,7 +405,6 @@ static void bcm2835_fb_reset(DeviceState *dev)
static void bcm2835_fb_realize(DeviceState *dev, Error **errp)
{
BCM2835FBState *s = BCM2835_FB(dev);
- Error *err = NULL;
Object *obj;
if (s->vcram_base == 0) {
@@ -413,12 +412,7 @@ static void bcm2835_fb_realize(DeviceState *dev, Error **errp)
return;
}
- obj = object_property_get_link(OBJECT(dev), "dma-mr", &err);
- if (obj == NULL) {
- error_setg(errp, "%s: required dma-mr link not found: %s",
- __func__, error_get_pretty(err));
- return;
- }
+ obj = object_property_get_link(OBJECT(dev), "dma-mr", &error_abort);
/* Fill in the parts of initial_config that are not set by QOM properties */
s->initial_config.xres_virtual = s->initial_config.xres;
diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c
index 4cd9dab745..eb0002a2b9 100644
--- a/hw/dma/bcm2835_dma.c
+++ b/hw/dma/bcm2835_dma.c
@@ -376,16 +376,9 @@ static void bcm2835_dma_reset(DeviceState *dev)
static void bcm2835_dma_realize(DeviceState *dev, Error **errp)
{
BCM2835DMAState *s = BCM2835_DMA(dev);
- Error *err = NULL;
Object *obj;
- obj = object_property_get_link(OBJECT(dev), "dma-mr", &err);
- if (obj == NULL) {
- error_setg(errp, "%s: required dma-mr link not found: %s",
- __func__, error_get_pretty(err));
- return;
- }
-
+ obj = object_property_get_link(OBJECT(dev), "dma-mr", &error_abort);
s->dma_mr = MEMORY_REGION(obj);
address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_DMA "-memory");
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);
}
diff --git a/hw/intc/nios2_iic.c b/hw/intc/nios2_iic.c
index 3a5d86c2a4..1a5df8c89a 100644
--- a/hw/intc/nios2_iic.c
+++ b/hw/intc/nios2_iic.c
@@ -66,14 +66,8 @@ static void altera_iic_init(Object *obj)
static void altera_iic_realize(DeviceState *dev, Error **errp)
{
struct AlteraIIC *pv = ALTERA_IIC(dev);
- Error *err = NULL;
- pv->cpu = object_property_get_link(OBJECT(dev), "cpu", &err);
- if (!pv->cpu) {
- error_setg(errp, "altera,iic: CPU link not found: %s",
- error_get_pretty(err));
- return;
- }
+ pv->cpu = object_property_get_link(OBJECT(dev), "cpu", &error_abort);
}
static void altera_iic_class_init(ObjectClass *klass, void *data)
diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c
index 2afa06a746..9f73cbd5e4 100644
--- a/hw/misc/bcm2835_mbox.c
+++ b/hw/misc/bcm2835_mbox.c
@@ -308,15 +308,8 @@ static void bcm2835_mbox_realize(DeviceState *dev, Error **errp)
{
BCM2835MboxState *s = BCM2835_MBOX(dev);
Object *obj;
- Error *err = NULL;
-
- obj = object_property_get_link(OBJECT(dev), "mbox-mr", &err);
- if (obj == NULL) {
- error_setg(errp, "%s: required mbox-mr link not found: %s",
- __func__, error_get_pretty(err));
- return;
- }
+ obj = object_property_get_link(OBJECT(dev), "mbox-mr", &error_abort);
s->mbox_mr = MEMORY_REGION(obj);
address_space_init(&s->mbox_as, s->mbox_mr, TYPE_BCM2835_MBOX "-memory");
bcm2835_mbox_reset(dev);
diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index 3e228ca0ae..73941bdae9 100644
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -392,24 +392,11 @@ static void bcm2835_property_realize(DeviceState *dev, Error **errp)
{
BCM2835PropertyState *s = BCM2835_PROPERTY(dev);
Object *obj;
- Error *err = NULL;
-
- obj = object_property_get_link(OBJECT(dev), "fb", &err);
- if (obj == NULL) {
- error_setg(errp, "%s: required fb link not found: %s",
- __func__, error_get_pretty(err));
- return;
- }
+ obj = object_property_get_link(OBJECT(dev), "fb", &error_abort);
s->fbdev = BCM2835_FB(obj);
- obj = object_property_get_link(OBJECT(dev), "dma-mr", &err);
- if (obj == NULL) {
- error_setg(errp, "%s: required dma-mr link not found: %s",
- __func__, error_get_pretty(err));
- return;
- }
-
+ obj = object_property_get_link(OBJECT(dev), "dma-mr", &error_abort);
s->dma_mr = MEMORY_REGION(obj);
address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_PROPERTY "-memory");
diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c
index 72cbd051f3..56f91f6bee 100644
--- a/hw/usb/hcd-dwc2.c
+++ b/hw/usb/hcd-dwc2.c
@@ -1274,15 +1274,8 @@ static void dwc2_realize(DeviceState *dev, Error **errp)
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
DWC2State *s = DWC2_USB(dev);
Object *obj;
- Error *err = NULL;
- obj = object_property_get_link(OBJECT(dev), "dma-mr", &err);
- if (err) {
- error_setg(errp, "dwc2: required dma-mr link not found: %s",
- error_get_pretty(err));
- return;
- }
- assert(obj != NULL);
+ obj = object_property_get_link(OBJECT(dev), "dma-mr", &error_abort);
s->dma_mr = MEMORY_REGION(obj);
address_space_init(&s->dma_as, s->dma_mr, "dwc2");
--
2.26.2
next prev parent reply other threads:[~2020-07-08 21:38 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 21:24 [PULL 00/53] Error reporting patches patches for 2020-07-07 Markus Armbruster
2020-07-07 21:24 ` [PULL 01/53] error: Fix examples in error.h's big comment Markus Armbruster
2020-07-07 21:24 ` [PULL 02/53] error: Improve " Markus Armbruster
2020-07-07 21:24 ` [PULL 03/53] error: Document Error API usage rules Markus Armbruster
2020-07-07 21:24 ` [PULL 04/53] qdev: Use returned bool to check for qdev_realize() etc. failure Markus Armbruster
2020-07-07 21:24 ` [PULL 05/53] macio: Tidy up error handling in macio_newworld_realize() Markus Armbruster
2020-07-07 21:24 ` [PULL 06/53] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize() Markus Armbruster
2020-07-07 21:24 ` [PULL 07/53] qemu-option: Check return value instead of @err where convenient Markus Armbruster
2020-07-07 21:24 ` [PULL 08/53] qemu-option: Make uses of find_desc_by_name() more similar Markus Armbruster
2020-07-07 21:24 ` [PULL 09/53] qemu-option: Factor out helper find_default_by_name() Markus Armbruster
2020-07-07 21:24 ` [PULL 10/53] qemu-option: Simplify around find_default_by_name() Markus Armbruster
2020-07-07 21:24 ` [PULL 11/53] qemu-option: Factor out helper opt_create() Markus Armbruster
2020-07-07 21:24 ` [PULL 12/53] qemu-option: Replace opt_set() by cleaner opt_validate() Markus Armbruster
2020-07-07 21:24 ` [PULL 13/53] qemu-option: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-07 21:24 ` [PULL 14/53] qemu-option: Use returned bool to check for failure Markus Armbruster
2020-07-07 21:24 ` [PULL 15/53] block: Avoid error accumulation in bdrv_img_create() Markus Armbruster
2020-07-07 21:24 ` [PULL 16/53] hmp: Eliminate a variable in hmp_migrate_set_parameter() Markus Armbruster
2020-07-07 21:24 ` [PULL 17/53] qapi: Make visitor functions taking Error ** return bool, not void Markus Armbruster
2020-07-07 21:24 ` [PULL 18/53] qapi: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-07 21:24 ` [PULL 19/53] qapi: Use returned bool to check for failure, manual part Markus Armbruster
2020-07-07 21:24 ` [PULL 20/53] s390x/pci: Fix harmless mistake in zpci's property fid's setter Markus Armbruster
2020-07-07 21:24 ` [PULL 21/53] qom: Use error_reportf_err() instead of g_printerr() in examples Markus Armbruster
2020-07-07 21:24 ` [PULL 22/53] qom: Rename qdev_get_type() to object_get_type() Markus Armbruster
2020-07-07 21:24 ` [PULL 23/53] qom: Crash more nicely on object_property_get_link() failure Markus Armbruster
2020-07-07 21:24 ` Markus Armbruster [this message]
2020-07-07 21:24 ` [PULL 25/53] qom: Use return values to check for error where that's simpler Markus Armbruster
2020-07-07 21:24 ` [PULL 26/53] qom: Put name parameter before value / visitor parameter Markus Armbruster
2020-07-07 21:24 ` [PULL 27/53] qom: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-07 21:24 ` [PULL 28/53] qom: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-07 21:24 ` [PULL 29/53] qom: Use returned bool to check for failure, manual part Markus Armbruster
2020-07-07 21:24 ` [PULL 30/53] qom: Make functions taking Error ** return bool, not 0/-1 Markus Armbruster
2020-07-07 21:24 ` [PULL 31/53] qdev: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-07 21:24 ` [PULL 32/53] qdev: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-07 21:24 ` [PULL 33/53] error: Avoid unnecessary error_propagate() after error_setg() Markus Armbruster
2020-07-07 21:24 ` [PULL 34/53] error: Eliminate error_propagate() with Coccinelle, part 1 Markus Armbruster
2020-07-07 21:24 ` [PULL 35/53] error: Eliminate error_propagate() with Coccinelle, part 2 Markus Armbruster
2020-07-07 21:24 ` [PULL 36/53] error: Eliminate error_propagate() manually Markus Armbruster
2020-07-07 21:24 ` [PULL 37/53] error: Reduce unnecessary error propagation Markus Armbruster
2020-07-07 21:24 ` [PULL 38/53] block/parallels: Simplify parallels_open() after previous commit Markus Armbruster
2020-07-07 21:24 ` [PULL 39/53] qapi: Smooth another visitor error checking pattern Markus Armbruster
2020-07-07 21:24 ` [PULL 40/53] qapi: Smooth visitor error checking in generated code Markus Armbruster
2020-07-07 21:24 ` [PULL 41/53] qapi: Purge error_propagate() from QAPI core Markus Armbruster
2020-07-07 21:24 ` [PULL 42/53] error: Avoid error_propagate() after migrate_add_blocker() Markus Armbruster
2020-07-07 21:24 ` [PULL 43/53] qemu-img: Ignore Error objects where the return value suffices Markus Armbruster
2020-07-07 21:24 ` [PULL 44/53] qdev: " Markus Armbruster
2020-07-07 21:24 ` [PULL 45/53] hmp: " Markus Armbruster
2020-07-07 21:24 ` [PULL 46/53] error: New macro ERRP_GUARD() Markus Armbruster
2020-07-07 21:24 ` [PULL 47/53] scripts: Coccinelle script to use ERRP_GUARD() Markus Armbruster
2021-03-11 19:21 ` Philippe Mathieu-Daudé
2021-03-12 8:36 ` Markus Armbruster
2021-03-12 10:17 ` Philippe Mathieu-Daudé
2020-07-07 21:24 ` [PULL 48/53] sd: Use ERRP_GUARD() Markus Armbruster
2020-07-07 21:24 ` [PULL 49/53] pflash: " Markus Armbruster
2020-07-07 21:25 ` [PULL 50/53] fw_cfg: " Markus Armbruster
2020-07-07 21:25 ` [PULL 51/53] virtio-9p: " Markus Armbruster
2020-07-07 21:25 ` [PULL 52/53] nbd: " Markus Armbruster
2020-07-07 21:25 ` [PULL 53/53] xen: " Markus Armbruster
2020-07-10 12:47 ` [PULL 00/53] Error reporting patches patches for 2020-07-07 Markus Armbruster
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=20200707212503.1495927-25-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=philmd@redhat.com \
--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).