|
@@ -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");
|
|
|
|