Re: [PATCH 2/2] hw/riscv: virt: Remove the riscv_ prefix of the machine* functions

[Philippe Mathieu-Daudé]

On 5/21/20 4:42 PM, Bin Meng wrote:
> From: Bin Meng <address@hidden>
>
> Remove the riscv_ prefix of the machine* functions.
>
> Signed-off-by: Bin Meng <address@hidden>
> ---
>
>   hw/riscv/virt.c | 20 ++++++++++----------
>   1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index c695a44..f1d6b61 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -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)

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>