hw/riscv/opentitan: Correct OpenTitanState parent type/size
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é <philmd@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> Message-Id: <20230520054510.68822-6-philmd@linaro.org> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
parent
8696b74a6f
commit
a828ba9d46
@ -78,8 +78,8 @@ static const MemMapEntry ibex_memmap[] = {
|
|||||||
static void opentitan_machine_init(MachineState *machine)
|
static void opentitan_machine_init(MachineState *machine)
|
||||||
{
|
{
|
||||||
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||||
|
OpenTitanState *s = OPENTITAN_MACHINE(machine);
|
||||||
const MemMapEntry *memmap = ibex_memmap;
|
const MemMapEntry *memmap = ibex_memmap;
|
||||||
OpenTitanState *s = g_new0(OpenTitanState, 1);
|
|
||||||
MemoryRegion *sys_mem = get_system_memory();
|
MemoryRegion *sys_mem = get_system_memory();
|
||||||
|
|
||||||
if (machine->ram_size != mc->default_ram_size) {
|
if (machine->ram_size != mc->default_ram_size) {
|
||||||
@ -330,6 +330,7 @@ static const TypeInfo open_titan_types[] = {
|
|||||||
}, {
|
}, {
|
||||||
.name = TYPE_OPENTITAN_MACHINE,
|
.name = TYPE_OPENTITAN_MACHINE,
|
||||||
.parent = TYPE_MACHINE,
|
.parent = TYPE_MACHINE,
|
||||||
|
.instance_size = sizeof(OpenTitanState),
|
||||||
.class_init = opentitan_machine_class_init,
|
.class_init = opentitan_machine_class_init,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -55,10 +55,11 @@ struct LowRISCIbexSoCState {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#define TYPE_OPENTITAN_MACHINE MACHINE_TYPE_NAME("opentitan")
|
#define TYPE_OPENTITAN_MACHINE MACHINE_TYPE_NAME("opentitan")
|
||||||
|
OBJECT_DECLARE_SIMPLE_TYPE(OpenTitanState, OPENTITAN_MACHINE)
|
||||||
|
|
||||||
typedef struct OpenTitanState {
|
typedef struct OpenTitanState {
|
||||||
/*< private >*/
|
/*< private >*/
|
||||||
SysBusDevice parent_obj;
|
MachineState parent_obj;
|
||||||
|
|
||||||
/*< public >*/
|
/*< public >*/
|
||||||
LowRISCIbexSoCState soc;
|
LowRISCIbexSoCState soc;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user