Re: [PATCH v2 14/23] q800: move dp8393x device to Q800MachineState

[Laurent Vivier]

Le 31/05/2023 à 14:53, Mark Cave-Ayland a écrit :

Also change the instantiation of the dp8393x device to use 
object_initialize_child().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
CC: Jason Wang <jasow...@redhat.com>
---
  hw/m68k/q800.c         | 6 ++++--
  include/hw/m68k/q800.h | 2 ++
  2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 53d6308a7a..e25f6f1373 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -316,14 +316,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,
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index ba3aa45513..82964cfea1 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -25,6 +25,7 @@

#include "hw/m68k/q800-glue.h"

  #include "hw/misc/mac_via.h"
+#include "hw/net/dp8393x.h"

/*

   * The main Q800 machine
@@ -38,6 +39,7 @@ struct Q800MachineState {
      GLUEState glue;
      MOS6522Q800VIA1State via1;
      MOS6522Q800VIA2State via2;
+    dp8393xState dp8393x;
      MemoryRegion macio;
      MemoryRegion macio_alias;
  };

Reviewed-by: Laurent Vivier <laur...@vivier.eu>