diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2023-06-21 09:53:44 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2023-06-22 09:26:13 +0200 |
| commit | 804ae67ee6fc3ff5a6c82edba7ed4cbdd33de091 (patch) | |
| tree | c99b0db618ed3aa6bcdaf15987981f8b58ce0322 /hw/m68k | |
| parent | 2db48d0364f9bbc0d22370fc26debfaa4adca31f (diff) | |
| download | qemu-804ae67ee6fc3ff5a6c82edba7ed4cbdd33de091.zip qemu-804ae67ee6fc3ff5a6c82edba7ed4cbdd33de091.tar.gz qemu-804ae67ee6fc3ff5a6c82edba7ed4cbdd33de091.tar.bz2 | |
q800: move dp8393x device to Q800MachineState
Also change the instantiation of the dp8393x device to use object_initialize_child().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Jason Wang <jasowang@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-16-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw/m68k')
| -rw-r--r-- | hw/m68k/q800.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 988b498..1380661 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -315,14 +315,16 @@ static void q800_machine_init(MachineState *machine) nd_table[0].macaddr.a[1] = 0x00; nd_table[0].macaddr.a[2] = 0x07; - dev = qdev_new("dp8393x"); + object_initialize_child(OBJECT(machine), "dp8393x", &m->dp8393x, + TYPE_DP8393X); + dev = DEVICE(&m->dp8393x); qdev_set_nic_properties(dev, &nd_table[0]); qdev_prop_set_uint8(dev, "it_shift", 2); qdev_prop_set_bit(dev, "big_endian", true); object_property_set_link(OBJECT(dev), "dma_mr", OBJECT(get_system_memory()), &error_abort); sysbus = SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(sysbus, &error_fatal); + sysbus_realize(sysbus, &error_fatal); memory_region_add_subregion(&m->macio, SONIC_BASE - IO_BASE, sysbus_mmio_get_region(sysbus, 0)); sysbus_connect_irq(sysbus, 0, |