Re: [PATCH 03/11] hw/arm/aspeed: Rename aspeed_soc_realize() as AST2400/2500 specific

[Cédric Le Goater]

On 10/24/23 18:24, Philippe Mathieu-Daudé wrote:

Keep aspeed_soc_class_init() generic, set the realize handler
to aspeed_ast2400_soc_realize() in each 2400/2500 class_init.

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>

Reviewed-by: Cédric Le Goater <c...@kaod.org>

Thanks,

C.

---
  hw/arm/aspeed_soc.c | 15 +++++++++++----
  1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index bb377e9e6e..191276a320 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -239,7 +239,7 @@ static void aspeed_ast2400_soc_init(Object *obj)
      object_initialize_child(obj, "video", &s->video, 
TYPE_UNIMPLEMENTED_DEVICE);
  }

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

+static void aspeed_ast2400_soc_realize(DeviceState *dev, Error **errp)
  {
      int i;
      AspeedSoCState *s = ASPEED_SOC(dev);
@@ -509,9 +509,6 @@ static void aspeed_soc_class_init(ObjectClass *oc, void 
*data)
  {
      DeviceClass *dc = DEVICE_CLASS(oc);

- dc->realize = aspeed_soc_realize;

-    /* Reason: Uses serial_hds and nd_table in realize() directly */
-    dc->user_creatable = false;
      device_class_set_props(dc, aspeed_soc_properties);
  }

@@ -527,6 +524,11 @@ static const TypeInfo aspeed_soc_type_info = {

  static void aspeed_soc_ast2400_class_init(ObjectClass *oc, void *data)
  {
      AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc);
+    DeviceClass *dc = DEVICE_CLASS(oc);
+
+    dc->realize = aspeed_ast2400_soc_realize;
+    /* Reason: Uses serial_hds and nd_table in realize() directly */
+    dc->user_creatable = false;

sc->name = "ast2400-a1";

      sc->cpu_type     = ARM_CPU_TYPE_NAME("arm926");
@@ -554,6 +556,11 @@ static const TypeInfo aspeed_soc_ast2400_type_info = {
  static void aspeed_soc_ast2500_class_init(ObjectClass *oc, void *data)
  {
      AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc);
+    DeviceClass *dc = DEVICE_CLASS(oc);
+
+    dc->realize = aspeed_ast2400_soc_realize;
+    /* Reason: Uses serial_hds and nd_table in realize() directly */
+    dc->user_creatable = false;

sc->name = "ast2500-a1";

      sc->cpu_type     = ARM_CPU_TYPE_NAME("arm1176");