Re: [PATCH 5/5] hw/riscv/opentitan: Correct OpenTitanState parent type/size

[Daniel Henrique Barboza]

On 5/20/23 02:45, Philippe Mathieu-Daudé wrote:

OpenTitanState is the 'machine' (or 'board') state: it isn't
a SysBus device, but inherits from the MachineState type.
Correct the instance size.
Doing so we  avoid leaking an OpenTitanState pointer in
opentitan_machine_init().

Fixes: fe0fe4735e ("riscv: Initial commit of OpenTitan machine")
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---

Reviewed-by: Daniel Henrique Barboza <dbarb...@ventanamicro.com>

  include/hw/riscv/opentitan.h | 3 ++-
  hw/riscv/opentitan.c         | 3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/hw/riscv/opentitan.h b/include/hw/riscv/opentitan.h
index 806ff73528..609473d07b 100644
--- a/include/hw/riscv/opentitan.h
+++ b/include/hw/riscv/opentitan.h
@@ -55,10 +55,11 @@ struct LowRISCIbexSoCState {
  };

#define TYPE_OPENTITAN_MACHINE MACHINE_TYPE_NAME("opentitan")

+OBJECT_DECLARE_SIMPLE_TYPE(OpenTitanState, OPENTITAN_MACHINE)

typedef struct OpenTitanState {

      /*< private >*/
-    SysBusDevice parent_obj;
+    MachineState parent_obj;

/*< public >*/

      LowRISCIbexSoCState soc;
diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
index 9535308197..6a2fcc4ade 100644
--- a/hw/riscv/opentitan.c
+++ b/hw/riscv/opentitan.c
@@ -78,8 +78,8 @@ static const MemMapEntry ibex_memmap[] = {
  static void opentitan_machine_init(MachineState *machine)
  {
      MachineClass *mc = MACHINE_GET_CLASS(machine);
+    OpenTitanState *s = OPENTITAN_MACHINE(machine);
      const MemMapEntry *memmap = ibex_memmap;
-    OpenTitanState *s = g_new0(OpenTitanState, 1);
      MemoryRegion *sys_mem = get_system_memory();

if (machine->ram_size != mc->default_ram_size) {

@@ -330,6 +330,7 @@ static const TypeInfo open_titan_types[] = {
      }, {
          .name           = TYPE_OPENTITAN_MACHINE,
          .parent         = TYPE_MACHINE,
+        .instance_size  = sizeof(OpenTitanState),
          .class_init     = opentitan_machine_class_init,
      }
  };