mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
target/riscv: remove .instance_post_init
Unlike other uses of .instance_post_init, accel_cpu_instance_init() *registers* properties, and therefore must be run before device_post_init() which sets them to their values from -global. In order to move all registration of properties to .instance_init, call accel_cpu_instance_init() at the end of riscv_cpu_init(). Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
70f48d7fb1
commit
42bc8af140
1 changed files with 2 additions and 6 deletions
|
@ -1083,11 +1083,6 @@ static bool riscv_cpu_is_dynamic(Object *cpu_obj)
|
|||
return object_dynamic_cast(cpu_obj, TYPE_RISCV_DYNAMIC_CPU) != NULL;
|
||||
}
|
||||
|
||||
static void riscv_cpu_post_init(Object *obj)
|
||||
{
|
||||
accel_cpu_instance_init(CPU(obj));
|
||||
}
|
||||
|
||||
static void riscv_cpu_init(Object *obj)
|
||||
{
|
||||
RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(obj);
|
||||
|
@ -1143,6 +1138,8 @@ static void riscv_cpu_init(Object *obj)
|
|||
riscv_register_custom_csrs(cpu, mcc->def->custom_csrs);
|
||||
}
|
||||
#endif
|
||||
|
||||
accel_cpu_instance_init(CPU(obj));
|
||||
}
|
||||
|
||||
typedef struct misa_ext_info {
|
||||
|
@ -2885,7 +2882,6 @@ static const TypeInfo riscv_cpu_type_infos[] = {
|
|||
.instance_size = sizeof(RISCVCPU),
|
||||
.instance_align = __alignof(RISCVCPU),
|
||||
.instance_init = riscv_cpu_init,
|
||||
.instance_post_init = riscv_cpu_post_init,
|
||||
.abstract = true,
|
||||
.class_size = sizeof(RISCVCPUClass),
|
||||
.class_init = riscv_cpu_common_class_init,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue