Commit 2b01c1b3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging 



Machine Core queue, 2019-05-24

* Display more helpful message when an object type is missing
  (Philippe Mathieu-Daudé)
* Use object_initialize_child for correct reference counting
  (Philippe Mathieu-Daudé)

# gpg: Signature made Fri 24 May 2019 19:31:06 BST
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  hw/intc/nvic: Use object_initialize_child for correct reference counting
  hw/arm/mps2: Use object_initialize_child for correct reference counting
  hw/microblaze/zynqmp: Use object_initialize_child for correct ref. counting
  hw/microblaze/zynqmp: Use object_initialize_child for correct ref. counting
  hw/microblaze/zynqmp: Let the SoC manage the IPI devices
  hw/microblaze/zynqmp: Move the IPI state into the PMUSoC state
  hw/mips: Use object_initialize_child for correct reference counting
  hw/mips: Use object_initialize() on MIPSCPSState
  hw/arm: Use object_initialize_child for correct reference counting
  hw/arm/aspeed: Use object_initialize_child for correct ref. counting
  hw/arm/bcm2835: Use object_initialize_child for correct ref. counting
  hw/arm/bcm2835: Use object_initialize() on PL011State
  hw/arm/bcm2835: Use TYPE_PL011 instead of hardcoded string
  hw/virtio: Use object_initialize_child for correct reference counting
  hw/misc/macio: Use object_initialize_child for correct ref. counting
  hw/ppc/pnv: Use object_initialize_child for correct reference counting
  qom/object: Display more helpful message when an object type is missing

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a7b21f67 23d1f360

hw/arm/aspeed.c

+3 −3
Original line number Diff line number Diff line
@@ -160,9 +160,9 @@ static void aspeed_board_init(MachineState *machine, 
    ram_addr_t max_ram_size;



    bmc = g_new0(AspeedBoardState, 1);

    object_initialize(&bmc->soc, (sizeof(bmc->soc)), cfg->soc_name);

    object_property_add_child(OBJECT(machine), "soc", OBJECT(&bmc->soc),

                              &error_abort);

    object_initialize_child(OBJECT(machine), "soc", &bmc->soc,

                            (sizeof(bmc->soc)), cfg->soc_name, &error_abort,

                            NULL);



    sc = ASPEED_SOC_GET_CLASS(&bmc->soc);

hw/arm/aspeed_soc.c

+20 −30
Original line number Diff line number Diff line
@@ -106,12 +106,11 @@ static void aspeed_soc_init(Object *obj) 
    AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);

    int i;



    object_initialize(&s->cpu, sizeof(s->cpu), sc->info->cpu_type);

    object_property_add_child(obj, "cpu", OBJECT(&s->cpu), NULL);

    object_initialize_child(obj, "cpu", OBJECT(&s->cpu), sizeof(s->cpu),

                            sc->info->cpu_type, &error_abort, NULL);



    object_initialize(&s->scu, sizeof(s->scu), TYPE_ASPEED_SCU);

    object_property_add_child(obj, "scu", OBJECT(&s->scu), NULL);

    qdev_set_parent_bus(DEVICE(&s->scu), sysbus_get_default());

    sysbus_init_child_obj(obj, "scu", OBJECT(&s->scu), sizeof(s->scu),

                          TYPE_ASPEED_SCU);

    qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev",

                         sc->info->silicon_rev);

    object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu),
@@ -121,36 +120,29 @@ static void aspeed_soc_init(Object *obj) 
    object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu),

                              "hw-prot-key", &error_abort);



    object_initialize(&s->vic, sizeof(s->vic), TYPE_ASPEED_VIC);

    object_property_add_child(obj, "vic", OBJECT(&s->vic), NULL);

    qdev_set_parent_bus(DEVICE(&s->vic), sysbus_get_default());

    sysbus_init_child_obj(obj, "vic", OBJECT(&s->vic), sizeof(s->vic),

                          TYPE_ASPEED_VIC);



    object_initialize(&s->timerctrl, sizeof(s->timerctrl), TYPE_ASPEED_TIMER);

    object_property_add_child(obj, "timerctrl", OBJECT(&s->timerctrl), NULL);

    sysbus_init_child_obj(obj, "timerctrl", OBJECT(&s->timerctrl),

                          sizeof(s->timerctrl), TYPE_ASPEED_TIMER);

    object_property_add_const_link(OBJECT(&s->timerctrl), "scu",

                                   OBJECT(&s->scu), &error_abort);

    qdev_set_parent_bus(DEVICE(&s->timerctrl), sysbus_get_default());



    object_initialize(&s->i2c, sizeof(s->i2c), TYPE_ASPEED_I2C);

    object_property_add_child(obj, "i2c", OBJECT(&s->i2c), NULL);

    qdev_set_parent_bus(DEVICE(&s->i2c), sysbus_get_default());

    sysbus_init_child_obj(obj, "i2c", OBJECT(&s->i2c), sizeof(s->i2c),

                          TYPE_ASPEED_I2C);



    object_initialize(&s->fmc, sizeof(s->fmc), sc->info->fmc_typename);

    object_property_add_child(obj, "fmc", OBJECT(&s->fmc), NULL);

    qdev_set_parent_bus(DEVICE(&s->fmc), sysbus_get_default());

    sysbus_init_child_obj(obj, "fmc", OBJECT(&s->fmc), sizeof(s->fmc),

                          sc->info->fmc_typename);

    object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs",

                              &error_abort);



    for (i = 0; i < sc->info->spis_num; i++) {

        object_initialize(&s->spi[i], sizeof(s->spi[i]),

                          sc->info->spi_typename[i]);

        object_property_add_child(obj, "spi[*]", OBJECT(&s->spi[i]), NULL);

        qdev_set_parent_bus(DEVICE(&s->spi[i]), sysbus_get_default());

        sysbus_init_child_obj(obj, "spi[*]", OBJECT(&s->spi[i]),

                              sizeof(s->spi[i]), sc->info->spi_typename[i]);

    }



    object_initialize(&s->sdmc, sizeof(s->sdmc), TYPE_ASPEED_SDMC);

    object_property_add_child(obj, "sdmc", OBJECT(&s->sdmc), NULL);

    qdev_set_parent_bus(DEVICE(&s->sdmc), sysbus_get_default());

    sysbus_init_child_obj(obj, "sdmc", OBJECT(&s->sdmc), sizeof(s->sdmc),

                          TYPE_ASPEED_SDMC);

    qdev_prop_set_uint32(DEVICE(&s->sdmc), "silicon-rev",

                         sc->info->silicon_rev);

    object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
@@ -159,16 +151,14 @@ static void aspeed_soc_init(Object *obj) 
                              "max-ram-size", &error_abort);



    for (i = 0; i < sc->info->wdts_num; i++) {

        object_initialize(&s->wdt[i], sizeof(s->wdt[i]), TYPE_ASPEED_WDT);

        object_property_add_child(obj, "wdt[*]", OBJECT(&s->wdt[i]), NULL);

        qdev_set_parent_bus(DEVICE(&s->wdt[i]), sysbus_get_default());

        sysbus_init_child_obj(obj, "wdt[*]", OBJECT(&s->wdt[i]),

                              sizeof(s->wdt[i]), TYPE_ASPEED_WDT);

        qdev_prop_set_uint32(DEVICE(&s->wdt[i]), "silicon-rev",

                                    sc->info->silicon_rev);

    }



    object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100);

    object_property_add_child(obj, "ftgmac100", OBJECT(&s->ftgmac100), NULL);

    qdev_set_parent_bus(DEVICE(&s->ftgmac100), sysbus_get_default());

    sysbus_init_child_obj(obj, "ftgmac100", OBJECT(&s->ftgmac100),

                          sizeof(s->ftgmac100), TYPE_FTGMAC100);

}



static void aspeed_soc_realize(DeviceState *dev, Error **errp)

hw/arm/bcm2835_peripherals.c

+24 −37
Original line number Diff line number Diff line
@@ -41,44 +41,36 @@ static void bcm2835_peripherals_init(Object *obj) 
                       MBOX_CHAN_COUNT << MBOX_AS_CHAN_SHIFT);



    /* Interrupt Controller */

    object_initialize(&s->ic, sizeof(s->ic), TYPE_BCM2835_IC);

    object_property_add_child(obj, "ic", OBJECT(&s->ic), NULL);

    qdev_set_parent_bus(DEVICE(&s->ic), sysbus_get_default());

    sysbus_init_child_obj(obj, "ic", &s->ic, sizeof(s->ic), TYPE_BCM2835_IC);



    /* UART0 */

    s->uart0 = SYS_BUS_DEVICE(object_new("pl011"));

    object_property_add_child(obj, "uart0", OBJECT(s->uart0), NULL);

    qdev_set_parent_bus(DEVICE(s->uart0), sysbus_get_default());

    sysbus_init_child_obj(obj, "uart0", &s->uart0, sizeof(s->uart0),

                          TYPE_PL011);



    /* AUX / UART1 */

    object_initialize(&s->aux, sizeof(s->aux), TYPE_BCM2835_AUX);

    object_property_add_child(obj, "aux", OBJECT(&s->aux), NULL);

    qdev_set_parent_bus(DEVICE(&s->aux), sysbus_get_default());

    sysbus_init_child_obj(obj, "aux", &s->aux, sizeof(s->aux),

                          TYPE_BCM2835_AUX);



    /* Mailboxes */

    object_initialize(&s->mboxes, sizeof(s->mboxes), TYPE_BCM2835_MBOX);

    object_property_add_child(obj, "mbox", OBJECT(&s->mboxes), NULL);

    qdev_set_parent_bus(DEVICE(&s->mboxes), sysbus_get_default());

    sysbus_init_child_obj(obj, "mbox", &s->mboxes, sizeof(s->mboxes),

                          TYPE_BCM2835_MBOX);



    object_property_add_const_link(OBJECT(&s->mboxes), "mbox-mr",

                                   OBJECT(&s->mbox_mr), &error_abort);



    /* Framebuffer */

    object_initialize(&s->fb, sizeof(s->fb), TYPE_BCM2835_FB);

    object_property_add_child(obj, "fb", OBJECT(&s->fb), NULL);

    sysbus_init_child_obj(obj, "fb", &s->fb, sizeof(s->fb), TYPE_BCM2835_FB);

    object_property_add_alias(obj, "vcram-size", OBJECT(&s->fb), "vcram-size",

                              &error_abort);

    qdev_set_parent_bus(DEVICE(&s->fb), sysbus_get_default());



    object_property_add_const_link(OBJECT(&s->fb), "dma-mr",

                                   OBJECT(&s->gpu_bus_mr), &error_abort);



    /* Property channel */

    object_initialize(&s->property, sizeof(s->property), TYPE_BCM2835_PROPERTY);

    object_property_add_child(obj, "property", OBJECT(&s->property), NULL);

    sysbus_init_child_obj(obj, "property", &s->property, sizeof(s->property),

                          TYPE_BCM2835_PROPERTY);

    object_property_add_alias(obj, "board-rev", OBJECT(&s->property),

                              "board-rev", &error_abort);

    qdev_set_parent_bus(DEVICE(&s->property), sysbus_get_default());



    object_property_add_const_link(OBJECT(&s->property), "fb",

                                   OBJECT(&s->fb), &error_abort);
@@ -86,32 +78,27 @@ static void bcm2835_peripherals_init(Object *obj) 
                                   OBJECT(&s->gpu_bus_mr), &error_abort);



    /* Random Number Generator */

    object_initialize(&s->rng, sizeof(s->rng), TYPE_BCM2835_RNG);

    object_property_add_child(obj, "rng", OBJECT(&s->rng), NULL);

    qdev_set_parent_bus(DEVICE(&s->rng), sysbus_get_default());

    sysbus_init_child_obj(obj, "rng", &s->rng, sizeof(s->rng),

                          TYPE_BCM2835_RNG);



    /* Extended Mass Media Controller */

    object_initialize(&s->sdhci, sizeof(s->sdhci), TYPE_SYSBUS_SDHCI);

    object_property_add_child(obj, "sdhci", OBJECT(&s->sdhci), NULL);

    qdev_set_parent_bus(DEVICE(&s->sdhci), sysbus_get_default());

    sysbus_init_child_obj(obj, "sdhci", &s->sdhci, sizeof(s->sdhci),

                          TYPE_SYSBUS_SDHCI);



    /* SDHOST */

    object_initialize(&s->sdhost, sizeof(s->sdhost), TYPE_BCM2835_SDHOST);

    object_property_add_child(obj, "sdhost", OBJECT(&s->sdhost), NULL);

    qdev_set_parent_bus(DEVICE(&s->sdhost), sysbus_get_default());

    sysbus_init_child_obj(obj, "sdhost", &s->sdhost, sizeof(s->sdhost),

                          TYPE_BCM2835_SDHOST);



    /* DMA Channels */

    object_initialize(&s->dma, sizeof(s->dma), TYPE_BCM2835_DMA);

    object_property_add_child(obj, "dma", OBJECT(&s->dma), NULL);

    qdev_set_parent_bus(DEVICE(&s->dma), sysbus_get_default());

    sysbus_init_child_obj(obj, "dma", &s->dma, sizeof(s->dma),

                          TYPE_BCM2835_DMA);



    object_property_add_const_link(OBJECT(&s->dma), "dma-mr",

                                   OBJECT(&s->gpu_bus_mr), &error_abort);



    /* GPIO */

    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());

    sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio),

                          TYPE_BCM2835_GPIO);



    object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci",

                                   OBJECT(&s->sdhci.sdbus), &error_abort);
@@ -166,16 +153,16 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
    sysbus_pass_irq(SYS_BUS_DEVICE(s), SYS_BUS_DEVICE(&s->ic));



    /* UART0 */

    qdev_prop_set_chr(DEVICE(s->uart0), "chardev", serial_hd(0));

    object_property_set_bool(OBJECT(s->uart0), true, "realized", &err);

    qdev_prop_set_chr(DEVICE(&s->uart0), "chardev", serial_hd(0));

    object_property_set_bool(OBJECT(&s->uart0), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    memory_region_add_subregion(&s->peri_mr, UART0_OFFSET,

                                sysbus_mmio_get_region(s->uart0, 0));

    sysbus_connect_irq(s->uart0, 0,

                sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->uart0), 0));

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart0), 0,

        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,

                               INTERRUPT_UART));

    /* AUX / UART1 */

hw/arm/digic.c

+6 −11
Original line number Diff line number Diff line
@@ -32,27 +32,22 @@ 
static void digic_init(Object *obj)

{

    DigicState *s = DIGIC(obj);

    DeviceState *dev;

    int i;



    object_initialize(&s->cpu, sizeof(s->cpu), "arm946-" TYPE_ARM_CPU);

    object_property_add_child(obj, "cpu", OBJECT(&s->cpu), NULL);

    object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu),

                            "arm946-" TYPE_ARM_CPU, &error_abort, NULL);



    for (i = 0; i < DIGIC4_NB_TIMERS; i++) {

#define DIGIC_TIMER_NAME_MLEN    11

        char name[DIGIC_TIMER_NAME_MLEN];



        object_initialize(&s->timer[i], sizeof(s->timer[i]), TYPE_DIGIC_TIMER);

        dev = DEVICE(&s->timer[i]);

        qdev_set_parent_bus(dev, sysbus_get_default());

        snprintf(name, DIGIC_TIMER_NAME_MLEN, "timer[%d]", i);

        object_property_add_child(obj, name, OBJECT(&s->timer[i]), NULL);

        sysbus_init_child_obj(obj, name, &s->timer[i], sizeof(s->timer[i]),

                              TYPE_DIGIC_TIMER);

    }



    object_initialize(&s->uart, sizeof(s->uart), TYPE_DIGIC_UART);

    dev = DEVICE(&s->uart);

    qdev_set_parent_bus(dev, sysbus_get_default());

    object_property_add_child(obj, "uart", OBJECT(&s->uart), NULL);

    sysbus_init_child_obj(obj, "uart", &s->uart, sizeof(s->uart),

                          TYPE_DIGIC_UART);

}



static void digic_realize(DeviceState *dev, Error **errp)

hw/arm/imx25_pdk.c

+2 −3
Original line number Diff line number Diff line
@@ -72,9 +72,8 @@ static void imx25_pdk_init(MachineState *machine) 
    unsigned int alias_offset;

    int i;



    object_initialize(&s->soc, sizeof(s->soc), TYPE_FSL_IMX25);

    object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc),

                              &error_abort);

    object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),

                            TYPE_FSL_IMX25, &error_abort, NULL);



    object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal);