hw/riscv: virt: Remove the riscv_ prefix of the machine* functions

Remove the riscv_ prefix of the machine* functions.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 1590072147-13035-2-git-send-email-bmeng.cn@gmail.com
Message-Id: <1590072147-13035-2-git-send-email-bmeng.cn@gmail.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Bin Meng 2020-05-21 07:42:27 -07:00 committed by Alistair Francis
parent 139177b1d4
commit b2a3a071f7

View file

@ -471,7 +471,7 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem,
return dev; return dev;
} }
static void riscv_virt_board_init(MachineState *machine) static void virt_machine_init(MachineState *machine)
{ {
const struct MemmapEntry *memmap = virt_memmap; const struct MemmapEntry *memmap = virt_memmap;
RISCVVirtState *s = RISCV_VIRT_MACHINE(machine); RISCVVirtState *s = RISCV_VIRT_MACHINE(machine);
@ -632,32 +632,32 @@ static void riscv_virt_board_init(MachineState *machine)
g_free(plic_hart_config); 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); MachineClass *mc = MACHINE_CLASS(oc);
mc->desc = "RISC-V VirtIO board"; mc->desc = "RISC-V VirtIO board";
mc->init = riscv_virt_board_init; mc->init = virt_machine_init;
mc->max_cpus = 8; mc->max_cpus = 8;
mc->default_cpu_type = VIRT_CPU; mc->default_cpu_type = VIRT_CPU;
mc->pci_allow_0_address = true; mc->pci_allow_0_address = true;
} }
static const TypeInfo riscv_virt_machine_typeinfo = { static const TypeInfo virt_machine_typeinfo = {
.name = MACHINE_TYPE_NAME("virt"), .name = MACHINE_TYPE_NAME("virt"),
.parent = TYPE_MACHINE, .parent = TYPE_MACHINE,
.class_init = riscv_virt_machine_class_init, .class_init = virt_machine_class_init,
.instance_init = riscv_virt_machine_instance_init, .instance_init = virt_machine_instance_init,
.instance_size = sizeof(RISCVVirtState), .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)