Commit 948770b0 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Eduardo Habkost
Browse files

hw/arm/bcm2835: Use object_initialize() on PL011State 



To be coherent with the other peripherals contained in the
BCM2835PeripheralState structure, directly allocate the PL011State
(instead of using the pl011 uart as a pointer to a SysBusDevice).

Initialize the PL011State with object_initialize() instead of
object_new().

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190507163416.24647-6-philmd@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 0a21950e

hw/arm/bcm2835_peripherals.c

+7 −7
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ static void bcm2835_peripherals_init(Object *obj) 
    qdev_set_parent_bus(DEVICE(&s->ic), sysbus_get_default());



    /* UART0 */

    s->uart0 = SYS_BUS_DEVICE(object_new(TYPE_PL011));

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

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

    object_initialize(&s->uart0, sizeof(s->uart0), TYPE_PL011);

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

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



    /* AUX / UART1 */

    object_initialize(&s->aux, sizeof(s->aux), TYPE_BCM2835_AUX);
@@ -166,16 +166,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 */

include/hw/arm/bcm2835_peripherals.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ typedef struct BCM2835PeripheralState { 
    MemoryRegion ram_alias[4];

    qemu_irq irq, fiq;



    SysBusDevice *uart0;

    PL011State uart0;

    BCM2835AuxState aux;

    BCM2835FBState fb;

    BCM2835DMAState dma;