motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 02:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use DEFINE_MACHINE() to register all machines

Browse source 
Convert all machines to use DEFINE_MACHINE() instead of QEMUMachine
automatically using a script.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
[AF: Style cleanups, convert imx25_pdk machine]
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Eduardo Habkost 2015-09-04 15:37:08 -03:00 • committed by Andreas Färber
parent f309ae852c
commit e264d29de2
57 changed files with 543 additions and 798 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hw/xtensa/sim.c
View file

@ -104,17 +104,12 @@ static void xtensa_sim_init(MachineState *machine)
}
}
static QEMUMachine xtensa_sim_machine = {
.name = "sim",
.desc = "sim machine (" XTENSA_DEFAULT_CPU_MODEL ")",
.is_default = true,
.init = xtensa_sim_init,
.max_cpus = 4,
};
static void xtensa_sim_machine_init(void)
static void xtensa_sim_machine_init(MachineClass *mc)
{
qemu_register_machine(&xtensa_sim_machine);
mc->desc = "sim machine (" XTENSA_DEFAULT_CPU_MODEL ")";
mc->is_default = true;
mc->init = xtensa_sim_init;
mc->max_cpus = 4;
}
machine_init(xtensa_sim_machine_init);
DEFINE_MACHINE("sim", xtensa_sim_machine_init)

66
hw/xtensa/xtfpga.c
View file

@ -428,40 +428,38 @@ static void xtensa_kc705_init(MachineState *machine)
lx_init(&kc705_board, machine);
}
static QEMUMachine xtensa_lx60_machine = {
.name = "lx60",
.desc = "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")",
.init = xtensa_lx60_init,
.max_cpus = 4,
};
static QEMUMachine xtensa_lx200_machine = {
.name = "lx200",
.desc = "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")",
.init = xtensa_lx200_init,
.max_cpus = 4,
};
static QEMUMachine xtensa_ml605_machine = {
.name = "ml605",
.desc = "ml605 EVB (" XTENSA_DEFAULT_CPU_MODEL ")",
.init = xtensa_ml605_init,
.max_cpus = 4,
};
static QEMUMachine xtensa_kc705_machine = {
.name = "kc705",
.desc = "kc705 EVB (" XTENSA_DEFAULT_CPU_MODEL ")",
.init = xtensa_kc705_init,
.max_cpus = 4,
};
static void xtensa_lx_machines_init(void)
static void xtensa_lx60_machine_init(MachineClass *mc)
{
qemu_register_machine(&xtensa_lx60_machine);
qemu_register_machine(&xtensa_lx200_machine);
qemu_register_machine(&xtensa_ml605_machine);
qemu_register_machine(&xtensa_kc705_machine);
mc->desc = "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")";
mc->init = xtensa_lx60_init;
mc->max_cpus = 4;
}
machine_init(xtensa_lx_machines_init);
DEFINE_MACHINE("lx60", xtensa_lx60_machine_init)
static void xtensa_lx200_machine_init(MachineClass *mc)
{
mc->desc = "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")";
mc->init = xtensa_lx200_init;
mc->max_cpus = 4;
}
DEFINE_MACHINE("lx200", xtensa_lx200_machine_init)
static void xtensa_ml605_machine_init(MachineClass *mc)
{
mc->desc = "ml605 EVB (" XTENSA_DEFAULT_CPU_MODEL ")";
mc->init = xtensa_ml605_init;
mc->max_cpus = 4;
}
DEFINE_MACHINE("ml605", xtensa_ml605_machine_init)
static void xtensa_kc705_machine_init(MachineClass *mc)
{
mc->desc = "kc705 EVB (" XTENSA_DEFAULT_CPU_MODEL ")";
mc->init = xtensa_kc705_init;
mc->max_cpus = 4;
}
DEFINE_MACHINE("kc705", xtensa_kc705_machine_init)