diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-05-20 07:45:07 +0200 |
|---|---|---|
| committer | Alistair Francis <alistair.francis@wdc.com> | 2023-06-13 17:17:17 +1000 |
| commit | e0782b11bd7ef0c8e5cb9b5e83c32736a143deee (patch) | |
| tree | b8cee9015a0a1852f41f6b264c69ed88d200913b /hw/riscv | |
| parent | 9b29697fefa59431984aed9118e6fc062da0ee10 (diff) | |
| download | qemu-e0782b11bd7ef0c8e5cb9b5e83c32736a143deee.zip qemu-e0782b11bd7ef0c8e5cb9b5e83c32736a143deee.tar.gz qemu-e0782b11bd7ef0c8e5cb9b5e83c32736a143deee.tar.bz2 | |
hw/riscv/opentitan: Declare QOM types using DEFINE_TYPES() macro
When multiple QOM types are registered in the same file,
it is simpler to use the the DEFINE_TYPES() macro. Replace
the type_init() / type_register_static() combination. This
is in preparation of adding the OpenTitan machine type to
this array in a pair of commits.
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-3-philmd@linaro.org>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Diffstat (limited to 'hw/riscv')
| -rw-r--r-- | hw/riscv/opentitan.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index 2d21ee3..294955e 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -320,17 +320,14 @@ static void lowrisc_ibex_soc_class_init(ObjectClass *oc, void *data) dc->user_creatable = false; } -static const TypeInfo lowrisc_ibex_soc_type_info = { - .name = TYPE_RISCV_IBEX_SOC, - .parent = TYPE_DEVICE, - .instance_size = sizeof(LowRISCIbexSoCState), - .instance_init = lowrisc_ibex_soc_init, - .class_init = lowrisc_ibex_soc_class_init, +static const TypeInfo open_titan_types[] = { + { + .name = TYPE_RISCV_IBEX_SOC, + .parent = TYPE_DEVICE, + .instance_size = sizeof(LowRISCIbexSoCState), + .instance_init = lowrisc_ibex_soc_init, + .class_init = lowrisc_ibex_soc_class_init, + } }; -static void lowrisc_ibex_soc_register_types(void) -{ - type_register_static(&lowrisc_ibex_soc_type_info); -} - -type_init(lowrisc_ibex_soc_register_types) +DEFINE_TYPES(open_titan_types) |