| Message ID | 20171213204436.5379-3-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | QOM'ify SDBus, housekeeping | expand |
On Wed, Dec 13, 2017 at 12:44 PM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > We can then use dynamic sdbus creation (from realized HCI devices). > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Acked-by: Alistair Francis <alistair.francis@xilinx.com> Alistair > --- > hw/arm/bcm2835_peripherals.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c > index 12e0dd11af..7f30f19c4c 100644 > --- a/hw/arm/bcm2835_peripherals.c > +++ b/hw/arm/bcm2835_peripherals.c > @@ -112,11 +112,6 @@ static void bcm2835_peripherals_init(Object *obj) > object_initialize(&s->gpio, sizeof(s->gpio), TYPE_BCM2835_GPIO); > object_property_add_child(obj, "gpio", OBJECT(&s->gpio), NULL); > qdev_set_parent_bus(DEVICE(&s->gpio), sysbus_get_default()); > - > - object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci", > - OBJECT(&s->sdhci.sdbus), &error_abort); > - object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhost", > - OBJECT(&s->sdhost.sdbus), &error_abort); > } > > static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) > @@ -314,6 +309,10 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) > } > > /* GPIO */ > + object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci", > + OBJECT(&s->sdhci.sdbus), &error_abort); > + object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhost", > + OBJECT(&s->sdhost.sdbus), &error_abort); > object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err); > if (err) { > error_propagate(errp, err); > -- > 2.15.1 > >
diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 12e0dd11af..7f30f19c4c 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -112,11 +112,6 @@ static void bcm2835_peripherals_init(Object *obj) object_initialize(&s->gpio, sizeof(s->gpio), TYPE_BCM2835_GPIO); object_property_add_child(obj, "gpio", OBJECT(&s->gpio), NULL); qdev_set_parent_bus(DEVICE(&s->gpio), sysbus_get_default()); - - object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci", - OBJECT(&s->sdhci.sdbus), &error_abort); - object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhost", - OBJECT(&s->sdhost.sdbus), &error_abort); } static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) @@ -314,6 +309,10 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) } /* GPIO */ + object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci", + OBJECT(&s->sdhci.sdbus), &error_abort); + object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhost", + OBJECT(&s->sdhost.sdbus), &error_abort); object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err); if (err) { error_propagate(errp, err);
We can then use dynamic sdbus creation (from realized HCI devices). Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/arm/bcm2835_peripherals.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)