hw/riscv: sifive_u: Remove the riscv_ prefix of the soc* functions
Subsystems (2)
PATCH 1/2 hw/riscv: sifive_u: Remove the riscv_ prefix of the soc* functions
From: Bin Meng <[email protected]>
To keep consistency with the machine* functions, remove the riscv_ prefix of the soc* functions.
---
hw/riscv/sifive_u.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
hw/riscv/sifive_u.c +12 -12
@@ -481,7 +481,7 @@ static void sifive_u_machine_init_register_types(void)type_init (sifive_u_machine_init_register_types) -static void riscv_sifive_u_soc_init(Object *obj) +static void sifive_u_soc_instance_init(Object *obj) {MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (obj);
@@ -520,7 +520,7 @@ static void riscv_sifive_u_soc_init(Object *obj) TYPE_CADENCE_GEM); } -static void riscv_sifive_u_soc_realize (DeviceState *dev,Error **errp) +static void sifive_u_soc_realize (DeviceState *dev,Error **errp) {MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (dev);
@@ -635,32 +635,32 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) memmap[SIFIVE_U_GEM_MGMT].base, memmap[SIFIVE_U_GEM_MGMT].size); } -static Property riscv_sifive_u_soc_props[] = { +static Property sifive_u_soc_props[] = {DEFINE_PROP_UINT32 ("serial" , SiFiveUSoCState, serial,OTP_SERIAL ),DEFINE_PROP_END_OF_LIST () }; -static void riscv_sifive_u_soc_class_init (ObjectClass *oc,void *data) +static void sifive_u_soc_class_init (ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc); -device_class_set_props (dc, riscv_sifive_u_soc_props); - dc->realize = riscv_sifive_u_soc_realize; +device_class_set_props (dc, sifive_u_soc_props); + dc->realize = sifive_u_soc_realize;/* Reason: Uses serial_hds in realize function, thus can't be used twice */ dc->user_creatable = false; } -static const TypeInfo riscv_sifive_u_soc_type_info = { +static const TypeInfo sifive_u_soc_type_info = { .name =TYPE_RISCV_U_SOC , .parent =TYPE_DEVICE , .instance_size =sizeof (SiFiveUSoCState), - .instance_init = riscv_sifive_u_soc_init, - .class_init = riscv_sifive_u_soc_class_init, + .instance_init = sifive_u_soc_instance_init, + .class_init = sifive_u_soc_class_init, }; -static void riscv_sifive_u_soc_register_types (void ) +static void sifive_u_soc_register_types (void ) { -type_register_static (&riscv_sifive_u_soc_type_info); +type_register_static (&sifive_u_soc_type_info); } -type_init (riscv_sifive_u_soc_register_types) +type_init (sifive_u_soc_register_types)
Signature · 1 line
2.7.4
PATCH 2/2 hw/riscv: virt: Remove the riscv_ prefix of the machine* functions
From: Bin Meng <[email protected]>
Remove the riscv_ prefix of the machine* functions.
---
hw/riscv/virt.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
hw/riscv/virt.c +10 -10
@@ -471,7 +471,7 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem,return dev; } -static void riscv_virt_board_init (MachineState *machine) +static void virt_machine_init (MachineState *machine) {const struct MemmapEntry *memmap = virt_memmap;RISCVVirtState *s =RISCV_VIRT_MACHINE (machine);
@@ -632,32 +632,32 @@ static void riscv_virt_board_init(MachineState *machine)g_free (plic_hart_config); } -static void riscv_virt_machine_instance_init (Object *obj) +static void virt_machine_instance_init (Object *obj) { } -static void riscv_virt_machine_class_init (ObjectClass *oc,void *data) +static void virt_machine_class_init (ObjectClass *oc,void *data) {MachineClass *mc =MACHINE_CLASS (oc); mc->desc ="RISC-V VirtIO board" ; - mc->init = riscv_virt_board_init; + mc->init = virt_machine_init; mc->max_cpus =8 ; mc->default_cpu_type =VIRT_CPU ; mc->pci_allow_0_address = true; } -static const TypeInfo riscv_virt_machine_typeinfo = { +static const TypeInfo virt_machine_typeinfo = { .name =MACHINE_TYPE_NAME ("virt" ), .parent =TYPE_MACHINE , - .class_init = riscv_virt_machine_class_init, - .instance_init = riscv_virt_machine_instance_init, + .class_init = virt_machine_class_init, + .instance_init = virt_machine_instance_init, .instance_size =sizeof (RISCVVirtState), }; -static void riscv_virt_machine_init_register_types (void ) +static void virt_machine_init_register_types (void ) { -type_register_static (&riscv_virt_machine_typeinfo); +type_register_static (&virt_machine_typeinfo); } -type_init (riscv_virt_machine_init_register_types) +type_init (virt_machine_init_register_types)
Signature · 1 line
2.7.4
Re: [PATCH 2/2] hw/riscv: virt: Remove the riscv_ prefix of the machine* functions
Quoted 56 lines · Bin Meng
From: Bin Meng <[email protected]>
Remove the
riscv_prefix of the machine* functions.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/virt.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)hw/riscv/virt.c +7
-7@@ -471,7 +471,7 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem,return dev; } -static void riscv_virt_board_init (MachineState *machine) +static void virt_machine_init (MachineState *machine) {const struct MemmapEntry *memmap = virt_memmap;RISCVVirtState *s =RISCV_VIRT_MACHINE (machine);@@ -632,32 +632,32 @@ static void riscv_virt_board_init(MachineState *machine)g_free (plic_hart_config); } -static void riscv_virt_machine_instance_init (Object *obj) +static void virt_machine_instance_init (Object *obj) { } -static void riscv_virt_machine_class_init (ObjectClass *oc,void *data) +static void virt_machine_class_init (ObjectClass *oc,void *data) {MachineClass *mc =MACHINE_CLASS (oc); mc->desc ="RISC-V VirtIO board" ; - mc->init = riscv_virt_board_init; + mc->init = virt_machine_init; mc->max_cpus =8 ; mc->default_cpu_type =VIRT_CPU ; mc->pci_allow_0_address = true; } -static const TypeInfo riscv_virt_machine_typeinfo = { +static const TypeInfo virt_machine_typeinfo = { .name =MACHINE_TYPE_NAME ("virt" ), .parent =TYPE_MACHINE , - .class_init = riscv_virt_machine_class_init, - .instance_init = riscv_virt_machine_instance_init, + .class_init = virt_machine_class_init, + .instance_init = virt_machine_instance_init, .instance_size =sizeof (RISCVVirtState), };
hw/riscv/virt.c static void riscv_virt_board_init(MachineState *machine) · line 663
Quoted 10 lines
hw/riscv/virt.c +3
-3-static void riscv_virt_machine_init_register_types (void ) +static void virt_machine_init_register_types (void ) { -type_register_static (&riscv_virt_machine_typeinfo); +type_register_static (&virt_machine_typeinfo); } -type_init (riscv_virt_machine_init_register_types) +type_init (virt_machine_init_register_types)
Re: [PATCH 2/2] hw/riscv: virt: Remove the riscv_ prefix of the machine* functions
In reply to Bin MengQuoted 6 lines · Bin Meng
From: Bin Meng <[email protected]>
Remove the
riscv_prefix of the machine* functions.Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 64 lines
---
hw/riscv/virt.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)hw/riscv/virt.c +10
-11@@ -471,7 +471,7 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem,return dev; } -static void riscv_virt_board_init (MachineState *machine) +static void virt_machine_init (MachineState *machine) {const struct MemmapEntry *memmap = virt_memmap;RISCVVirtState *s =RISCV_VIRT_MACHINE (machine);@@ -632,32 +632,32 @@ static void riscv_virt_board_init(MachineState *machine)g_free (plic_hart_config); } -static void riscv_virt_machine_instance_init (Object *obj) +static void virt_machine_instance_init (Object *obj) { } -static void riscv_virt_machine_class_init (ObjectClass *oc,void *data) +static void virt_machine_class_init (ObjectClass *oc,void *data) {MachineClass *mc =MACHINE_CLASS (oc); mc->desc ="RISC-V VirtIO board" ; - mc->init = riscv_virt_board_init; + mc->init = virt_machine_init; mc->max_cpus =8 ; mc->default_cpu_type =VIRT_CPU ; mc->pci_allow_0_address = true; } -static const TypeInfo riscv_virt_machine_typeinfo = { +static const TypeInfo virt_machine_typeinfo = { .name =MACHINE_TYPE_NAME ("virt" ), .parent =TYPE_MACHINE , - .class_init = riscv_virt_machine_class_init, - .instance_init = riscv_virt_machine_instance_init, + .class_init = virt_machine_class_init, + .instance_init = virt_machine_instance_init, .instance_size =sizeof (RISCVVirtState), }; -static void riscv_virt_machine_init_register_types (void ) +static void virt_machine_init_register_types (void ) { -type_register_static (&riscv_virt_machine_typeinfo); +type_register_static (&virt_machine_typeinfo); } -type_init (riscv_virt_machine_init_register_types) +type_init (virt_machine_init_register_types) --2.7.4
Quoted 67 lines · Bin Meng
From: Bin Meng <[email protected]>
To keep consistency with the machine* functions, remove the
riscv_prefix of the soc* functions.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_u.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)hw/riscv/sifive_u.c +9
-9@@ -481,7 +481,7 @@ static void sifive_u_machine_init_register_types(void)type_init (sifive_u_machine_init_register_types) -static void riscv_sifive_u_soc_init(Object *obj) +static void sifive_u_soc_instance_init(Object *obj) {MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (obj);@@ -520,7 +520,7 @@ static void riscv_sifive_u_soc_init(Object *obj) TYPE_CADENCE_GEM); } -static void riscv_sifive_u_soc_realize (DeviceState *dev,Error **errp) +static void sifive_u_soc_realize (DeviceState *dev,Error **errp) {MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (dev);@@ -635,32 +635,32 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) memmap[SIFIVE_U_GEM_MGMT].base, memmap[SIFIVE_U_GEM_MGMT].size); } -static Property riscv_sifive_u_soc_props[] = { +static Property sifive_u_soc_props[] = {DEFINE_PROP_UINT32 ("serial" , SiFiveUSoCState, serial,OTP_SERIAL ),DEFINE_PROP_END_OF_LIST () }; -static void riscv_sifive_u_soc_class_init (ObjectClass *oc,void *data) +static void sifive_u_soc_class_init (ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc); -device_class_set_props (dc, riscv_sifive_u_soc_props); - dc->realize = riscv_sifive_u_soc_realize; +device_class_set_props (dc, sifive_u_soc_props); + dc->realize = sifive_u_soc_realize;/* Reason: Uses serial_hds in realize function, thus can't be used twice */ dc->user_creatable = false; } -static const TypeInfo riscv_sifive_u_soc_type_info = { +static const TypeInfo sifive_u_soc_type_info = { .name =TYPE_RISCV_U_SOC , .parent =TYPE_DEVICE , .instance_size =sizeof (SiFiveUSoCState), - .instance_init = riscv_sifive_u_soc_init, - .class_init = riscv_sifive_u_soc_class_init, + .instance_init = sifive_u_soc_instance_init, + .class_init = sifive_u_soc_class_init, };
hw/riscv/sifive_u.c static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) · line 666
Quoted 10 lines
hw/riscv/sifive_u.c +3
-3-static void riscv_sifive_u_soc_register_types (void ) +static void sifive_u_soc_register_types (void ) { -type_register_static (&riscv_sifive_u_soc_type_info); +type_register_static (&sifive_u_soc_type_info); } -type_init (riscv_sifive_u_soc_register_types) +type_init (sifive_u_soc_register_types)
Alistair Francis
Reviewed-byQuoted 8 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Bin Meng
From: Bin Meng <[email protected]>
To keep consistency with the machine* functions, remove the
riscv_prefix of the soc* functions.Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 75 lines
Quoted 61 lines
---
hw/riscv/sifive_u.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)hw/riscv/sifive_u.c +9
-9@@ -481,7 +481,7 @@ static void sifive_u_machine_init_register_types(void)type_init (sifive_u_machine_init_register_types) -static void riscv_sifive_u_soc_init(Object *obj) +static void sifive_u_soc_instance_init(Object *obj) {MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (obj);@@ -520,7 +520,7 @@ static void riscv_sifive_u_soc_init(Object *obj) TYPE_CADENCE_GEM); } -static void riscv_sifive_u_soc_realize (DeviceState *dev,Error **errp) +static void sifive_u_soc_realize (DeviceState *dev,Error **errp) {MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (dev);@@ -635,32 +635,32 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) memmap[SIFIVE_U_GEM_MGMT].base, memmap[SIFIVE_U_GEM_MGMT].size); } -static Property riscv_sifive_u_soc_props[] = { +static Property sifive_u_soc_props[] = {DEFINE_PROP_UINT32 ("serial" , SiFiveUSoCState, serial,OTP_SERIAL ),DEFINE_PROP_END_OF_LIST () }; -static void riscv_sifive_u_soc_class_init (ObjectClass *oc,void *data) +static void sifive_u_soc_class_init (ObjectClass *oc,void *data) {DeviceClass *dc =DEVICE_CLASS (oc); -device_class_set_props (dc, riscv_sifive_u_soc_props); - dc->realize = riscv_sifive_u_soc_realize; +device_class_set_props (dc, sifive_u_soc_props); + dc->realize = sifive_u_soc_realize;/* Reason: Uses serial_hds in realize function, thus can't be used twice */ dc->user_creatable = false; } -static const TypeInfo riscv_sifive_u_soc_type_info = { +static const TypeInfo sifive_u_soc_type_info = { .name =TYPE_RISCV_U_SOC , .parent =TYPE_DEVICE , .instance_size =sizeof (SiFiveUSoCState), - .instance_init = riscv_sifive_u_soc_init, - .class_init = riscv_sifive_u_soc_class_init, + .instance_init = sifive_u_soc_instance_init, + .class_init = sifive_u_soc_class_init, };hw/riscv/sifive_u.c static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) · line 666
Quoted 10 lines
hw/riscv/sifive_u.c +3
-3-static void riscv_sifive_u_soc_register_types (void ) +static void sifive_u_soc_register_types (void ) { -type_register_static (&riscv_sifive_u_soc_type_info); +type_register_static (&sifive_u_soc_type_info); } -type_init (riscv_sifive_u_soc_register_types) +type_init (sifive_u_soc_register_types)Reviewed-by Philippe Mathieu-Daudé <[email protected]>