mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 09:43:56 -06:00
Use DEFINE_MACHINE() to register all machines
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
Andreas Färber
parent
f309ae852c
commit
e264d29de2
57 changed files with 543 additions and 798 deletions
|
|
@ -58,15 +58,10 @@ static void collie_init(MachineState *machine)
|
|||
arm_load_kernel(s->cpu, &collie_binfo);
|
||||
}
|
||||
|
||||
static QEMUMachine collie_machine = {
|
||||
.name = "collie",
|
||||
.desc = "Collie PDA (SA-1110)",
|
||||
.init = collie_init,
|
||||
};
|
||||
|
||||
static void collie_machine_init(void)
|
||||
static void collie_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&collie_machine);
|
||||
mc->desc = "Collie PDA (SA-1110)";
|
||||
mc->init = collie_init;
|
||||
}
|
||||
|
||||
machine_init(collie_machine_init)
|
||||
DEFINE_MACHINE("collie", collie_machine_init)
|
||||
|
|
|
|||
|
|
@ -74,16 +74,10 @@ static void cubieboard_init(MachineState *machine)
|
|||
arm_load_kernel(&s->a10->cpu, &cubieboard_binfo);
|
||||
}
|
||||
|
||||
static QEMUMachine cubieboard_machine = {
|
||||
.name = "cubieboard",
|
||||
.desc = "cubietech cubieboard",
|
||||
.init = cubieboard_init,
|
||||
};
|
||||
|
||||
|
||||
static void cubieboard_machine_init(void)
|
||||
static void cubieboard_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&cubieboard_machine);
|
||||
mc->desc = "cubietech cubieboard";
|
||||
mc->init = cubieboard_init;
|
||||
}
|
||||
|
||||
machine_init(cubieboard_machine_init)
|
||||
DEFINE_MACHINE("cubieboard", cubieboard_machine_init)
|
||||
|
|
|
|||
|
|
@ -148,15 +148,10 @@ static void canon_a1100_init(MachineState *machine)
|
|||
digic4_board_init(&digic4_board_canon_a1100);
|
||||
}
|
||||
|
||||
static QEMUMachine canon_a1100 = {
|
||||
.name = "canon-a1100",
|
||||
.desc = "Canon PowerShot A1100 IS",
|
||||
.init = &canon_a1100_init,
|
||||
};
|
||||
|
||||
static void digic_register_machines(void)
|
||||
static void canon_a1100_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&canon_a1100);
|
||||
mc->desc = "Canon PowerShot A1100 IS";
|
||||
mc->init = &canon_a1100_init;
|
||||
}
|
||||
|
||||
machine_init(digic_register_machines)
|
||||
DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init)
|
||||
|
|
|
|||
|
|
@ -144,24 +144,20 @@ static void smdkc210_init(MachineState *machine)
|
|||
arm_load_kernel(ARM_CPU(first_cpu), &exynos4_board_binfo);
|
||||
}
|
||||
|
||||
static QEMUMachine exynos4_machine_nuri = {
|
||||
.name = "nuri",
|
||||
.desc = "Samsung NURI board (Exynos4210)",
|
||||
.init = nuri_init,
|
||||
.max_cpus = EXYNOS4210_NCPUS,
|
||||
};
|
||||
|
||||
static QEMUMachine exynos4_machine_smdkc210 = {
|
||||
.name = "smdkc210",
|
||||
.desc = "Samsung SMDKC210 board (Exynos4210)",
|
||||
.init = smdkc210_init,
|
||||
.max_cpus = EXYNOS4210_NCPUS,
|
||||
};
|
||||
|
||||
static void exynos4_machine_init(void)
|
||||
static void exynos4_machine_nuri_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&exynos4_machine_nuri);
|
||||
qemu_register_machine(&exynos4_machine_smdkc210);
|
||||
mc->desc = "Samsung NURI board (Exynos4210)";
|
||||
mc->init = nuri_init;
|
||||
mc->max_cpus = EXYNOS4210_NCPUS;
|
||||
}
|
||||
|
||||
machine_init(exynos4_machine_init);
|
||||
DEFINE_MACHINE("nuri", exynos4_machine_nuri_machine_init)
|
||||
|
||||
static void exynos4_machine_smdkc210_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "Samsung SMDKC210 board (Exynos4210)";
|
||||
mc->init = smdkc210_init;
|
||||
mc->max_cpus = EXYNOS4210_NCPUS;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("smdkc210", exynos4_machine_smdkc210_machine_init)
|
||||
|
|
|
|||
|
|
@ -121,22 +121,18 @@ static void verdex_init(MachineState *machine)
|
|||
qdev_get_gpio_in(cpu->gpio, 99));
|
||||
}
|
||||
|
||||
static QEMUMachine connex_machine = {
|
||||
.name = "connex",
|
||||
.desc = "Gumstix Connex (PXA255)",
|
||||
.init = connex_init,
|
||||
};
|
||||
|
||||
static QEMUMachine verdex_machine = {
|
||||
.name = "verdex",
|
||||
.desc = "Gumstix Verdex (PXA270)",
|
||||
.init = verdex_init,
|
||||
};
|
||||
|
||||
static void gumstix_machine_init(void)
|
||||
static void connex_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&connex_machine);
|
||||
qemu_register_machine(&verdex_machine);
|
||||
mc->desc = "Gumstix Connex (PXA255)";
|
||||
mc->init = connex_init;
|
||||
}
|
||||
|
||||
machine_init(gumstix_machine_init);
|
||||
DEFINE_MACHINE("connex", connex_machine_init)
|
||||
|
||||
static void verdex_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "Gumstix Verdex (PXA270)";
|
||||
mc->init = verdex_init;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("verdex", verdex_machine_init)
|
||||
|
|
|
|||
|
|
@ -391,26 +391,22 @@ static void midway_init(MachineState *machine)
|
|||
calxeda_init(machine, CALXEDA_MIDWAY);
|
||||
}
|
||||
|
||||
static QEMUMachine highbank_machine = {
|
||||
.name = "highbank",
|
||||
.desc = "Calxeda Highbank (ECX-1000)",
|
||||
.init = highbank_init,
|
||||
.block_default_type = IF_SCSI,
|
||||
.max_cpus = 4,
|
||||
};
|
||||
|
||||
static QEMUMachine midway_machine = {
|
||||
.name = "midway",
|
||||
.desc = "Calxeda Midway (ECX-2000)",
|
||||
.init = midway_init,
|
||||
.block_default_type = IF_SCSI,
|
||||
.max_cpus = 4,
|
||||
};
|
||||
|
||||
static void calxeda_machines_init(void)
|
||||
static void highbank_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&highbank_machine);
|
||||
qemu_register_machine(&midway_machine);
|
||||
mc->desc = "Calxeda Highbank (ECX-1000)";
|
||||
mc->init = highbank_init;
|
||||
mc->block_default_type = IF_SCSI;
|
||||
mc->max_cpus = 4;
|
||||
}
|
||||
|
||||
machine_init(calxeda_machines_init);
|
||||
DEFINE_MACHINE("highbank", highbank_machine_init)
|
||||
|
||||
static void midway_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "Calxeda Midway (ECX-2000)";
|
||||
mc->init = midway_init;
|
||||
mc->block_default_type = IF_SCSI;
|
||||
mc->max_cpus = 4;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("midway", midway_machine_init)
|
||||
|
|
|
|||
|
|
@ -145,15 +145,10 @@ static void imx25_pdk_init(MachineState *machine)
|
|||
}
|
||||
}
|
||||
|
||||
static QEMUMachine imx25_pdk_machine = {
|
||||
.name = "imx25_pdk",
|
||||
.desc = "ARM i.MX25 PDK board (ARM926)",
|
||||
.init = imx25_pdk_init,
|
||||
};
|
||||
|
||||
static void imx25_pdk_machine_init(void)
|
||||
static void imx25_pdk_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&imx25_pdk_machine);
|
||||
mc->desc = "ARM i.MX25 PDK board (ARM926)";
|
||||
mc->init = imx25_pdk_init;
|
||||
}
|
||||
|
||||
machine_init(imx25_pdk_machine_init)
|
||||
DEFINE_MACHINE("imx25_pdk", imx25_pdk_machine_init)
|
||||
|
|
|
|||
|
|
@ -619,18 +619,13 @@ static void integratorcp_init(MachineState *machine)
|
|||
arm_load_kernel(cpu, &integrator_binfo);
|
||||
}
|
||||
|
||||
static QEMUMachine integratorcp_machine = {
|
||||
.name = "integratorcp",
|
||||
.desc = "ARM Integrator/CP (ARM926EJ-S)",
|
||||
.init = integratorcp_init,
|
||||
};
|
||||
|
||||
static void integratorcp_machine_init(void)
|
||||
static void integratorcp_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&integratorcp_machine);
|
||||
mc->desc = "ARM Integrator/CP (ARM926EJ-S)";
|
||||
mc->init = integratorcp_init;
|
||||
}
|
||||
|
||||
machine_init(integratorcp_machine_init);
|
||||
DEFINE_MACHINE("integratorcp", integratorcp_machine_init)
|
||||
|
||||
static Property core_properties[] = {
|
||||
DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0),
|
||||
|
|
|
|||
13
hw/arm/kzm.c
13
hw/arm/kzm.c
|
|
@ -139,15 +139,10 @@ static void kzm_init(MachineState *machine)
|
|||
}
|
||||
}
|
||||
|
||||
static QEMUMachine kzm_machine = {
|
||||
.name = "kzm",
|
||||
.desc = "ARM KZM Emulation Baseboard (ARM1136)",
|
||||
.init = kzm_init,
|
||||
};
|
||||
|
||||
static void kzm_machine_init(void)
|
||||
static void kzm_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&kzm_machine);
|
||||
mc->desc = "ARM KZM Emulation Baseboard (ARM1136)";
|
||||
mc->init = kzm_init;
|
||||
}
|
||||
|
||||
machine_init(kzm_machine_init)
|
||||
DEFINE_MACHINE("kzm", kzm_machine_init)
|
||||
|
|
|
|||
|
|
@ -188,15 +188,10 @@ static void mainstone_init(MachineState *machine)
|
|||
mainstone_common_init(get_system_memory(), machine, mainstone, 0x196);
|
||||
}
|
||||
|
||||
static QEMUMachine mainstone2_machine = {
|
||||
.name = "mainstone",
|
||||
.desc = "Mainstone II (PXA27x)",
|
||||
.init = mainstone_init,
|
||||
};
|
||||
|
||||
static void mainstone_machine_init(void)
|
||||
static void mainstone2_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&mainstone2_machine);
|
||||
mc->desc = "Mainstone II (PXA27x)";
|
||||
mc->init = mainstone_init;
|
||||
}
|
||||
|
||||
machine_init(mainstone_machine_init);
|
||||
DEFINE_MACHINE("mainstone", mainstone2_machine_init)
|
||||
|
|
|
|||
|
|
@ -1709,18 +1709,13 @@ static void musicpal_init(MachineState *machine)
|
|||
arm_load_kernel(cpu, &musicpal_binfo);
|
||||
}
|
||||
|
||||
static QEMUMachine musicpal_machine = {
|
||||
.name = "musicpal",
|
||||
.desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)",
|
||||
.init = musicpal_init,
|
||||
};
|
||||
|
||||
static void musicpal_machine_init(void)
|
||||
static void musicpal_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&musicpal_machine);
|
||||
mc->desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)";
|
||||
mc->init = musicpal_init;
|
||||
}
|
||||
|
||||
machine_init(musicpal_machine_init);
|
||||
DEFINE_MACHINE("musicpal", musicpal_machine_init)
|
||||
|
||||
static void mv88w8618_wlan_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -43,15 +43,10 @@ static void netduino2_init(MachineState *machine)
|
|||
}
|
||||
}
|
||||
|
||||
static QEMUMachine netduino2_machine = {
|
||||
.name = "netduino2",
|
||||
.desc = "Netduino 2 Machine",
|
||||
.init = netduino2_init,
|
||||
};
|
||||
|
||||
static void netduino2_machine_init(void)
|
||||
static void netduino2_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&netduino2_machine);
|
||||
mc->desc = "Netduino 2 Machine";
|
||||
mc->init = netduino2_init;
|
||||
}
|
||||
|
||||
machine_init(netduino2_machine_init);
|
||||
DEFINE_MACHINE("netduino2", netduino2_machine_init)
|
||||
|
|
|
|||
|
|
@ -1413,24 +1413,20 @@ static void n810_init(MachineState *machine)
|
|||
n8x0_init(machine, &n810_binfo, 810);
|
||||
}
|
||||
|
||||
static QEMUMachine n800_machine = {
|
||||
.name = "n800",
|
||||
.desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
|
||||
.init = n800_init,
|
||||
.default_boot_order = "",
|
||||
};
|
||||
|
||||
static QEMUMachine n810_machine = {
|
||||
.name = "n810",
|
||||
.desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
|
||||
.init = n810_init,
|
||||
.default_boot_order = "",
|
||||
};
|
||||
|
||||
static void nseries_machine_init(void)
|
||||
static void n800_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&n800_machine);
|
||||
qemu_register_machine(&n810_machine);
|
||||
mc->desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)";
|
||||
mc->init = n800_init;
|
||||
mc->default_boot_order = "";
|
||||
}
|
||||
|
||||
machine_init(nseries_machine_init);
|
||||
DEFINE_MACHINE("n800", n800_machine_init)
|
||||
|
||||
static void n810_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)";
|
||||
mc->init = n810_init;
|
||||
mc->default_boot_order = "";
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("n810", n810_machine_init)
|
||||
|
|
|
|||
|
|
@ -217,22 +217,18 @@ static void sx1_init_v2(MachineState *machine)
|
|||
sx1_init(machine, 2);
|
||||
}
|
||||
|
||||
static QEMUMachine sx1_machine_v2 = {
|
||||
.name = "sx1",
|
||||
.desc = "Siemens SX1 (OMAP310) V2",
|
||||
.init = sx1_init_v2,
|
||||
};
|
||||
|
||||
static QEMUMachine sx1_machine_v1 = {
|
||||
.name = "sx1-v1",
|
||||
.desc = "Siemens SX1 (OMAP310) V1",
|
||||
.init = sx1_init_v1,
|
||||
};
|
||||
|
||||
static void sx1_machine_init(void)
|
||||
static void sx1_machine_v2_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&sx1_machine_v2);
|
||||
qemu_register_machine(&sx1_machine_v1);
|
||||
mc->desc = "Siemens SX1 (OMAP310) V2";
|
||||
mc->init = sx1_init_v2;
|
||||
}
|
||||
|
||||
machine_init(sx1_machine_init);
|
||||
DEFINE_MACHINE("sx1", sx1_machine_v2_machine_init)
|
||||
|
||||
static void sx1_machine_v1_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "Siemens SX1 (OMAP310) V1";
|
||||
mc->init = sx1_init_v1;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("sx1-v1", sx1_machine_v1_machine_init)
|
||||
|
|
|
|||
|
|
@ -269,15 +269,10 @@ static void palmte_init(MachineState *machine)
|
|||
arm_load_kernel(mpu->cpu, &palmte_binfo);
|
||||
}
|
||||
|
||||
static QEMUMachine palmte_machine = {
|
||||
.name = "cheetah",
|
||||
.desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
|
||||
.init = palmte_init,
|
||||
};
|
||||
|
||||
static void palmte_machine_init(void)
|
||||
static void palmte_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&palmte_machine);
|
||||
mc->desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)";
|
||||
mc->init = palmte_init;
|
||||
}
|
||||
|
||||
machine_init(palmte_machine_init);
|
||||
DEFINE_MACHINE("cheetah", palmte_machine_init)
|
||||
|
|
|
|||
|
|
@ -399,41 +399,39 @@ static void realview_pbx_a9_init(MachineState *machine)
|
|||
realview_init(machine, BOARD_PBX_A9);
|
||||
}
|
||||
|
||||
static QEMUMachine realview_eb_machine = {
|
||||
.name = "realview-eb",
|
||||
.desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)",
|
||||
.init = realview_eb_init,
|
||||
.block_default_type = IF_SCSI,
|
||||
};
|
||||
|
||||
static QEMUMachine realview_eb_mpcore_machine = {
|
||||
.name = "realview-eb-mpcore",
|
||||
.desc = "ARM RealView Emulation Baseboard (ARM11MPCore)",
|
||||
.init = realview_eb_mpcore_init,
|
||||
.block_default_type = IF_SCSI,
|
||||
.max_cpus = 4,
|
||||
};
|
||||
|
||||
static QEMUMachine realview_pb_a8_machine = {
|
||||
.name = "realview-pb-a8",
|
||||
.desc = "ARM RealView Platform Baseboard for Cortex-A8",
|
||||
.init = realview_pb_a8_init,
|
||||
};
|
||||
|
||||
static QEMUMachine realview_pbx_a9_machine = {
|
||||
.name = "realview-pbx-a9",
|
||||
.desc = "ARM RealView Platform Baseboard Explore for Cortex-A9",
|
||||
.init = realview_pbx_a9_init,
|
||||
.block_default_type = IF_SCSI,
|
||||
.max_cpus = 4,
|
||||
};
|
||||
|
||||
static void realview_machine_init(void)
|
||||
static void realview_eb_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&realview_eb_machine);
|
||||
qemu_register_machine(&realview_eb_mpcore_machine);
|
||||
qemu_register_machine(&realview_pb_a8_machine);
|
||||
qemu_register_machine(&realview_pbx_a9_machine);
|
||||
mc->desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)";
|
||||
mc->init = realview_eb_init;
|
||||
mc->block_default_type = IF_SCSI;
|
||||
}
|
||||
|
||||
machine_init(realview_machine_init);
|
||||
DEFINE_MACHINE("realview-eb", realview_eb_machine_init)
|
||||
|
||||
static void realview_eb_mpcore_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "ARM RealView Emulation Baseboard (ARM11MPCore)";
|
||||
mc->init = realview_eb_mpcore_init;
|
||||
mc->block_default_type = IF_SCSI;
|
||||
mc->max_cpus = 4;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("realview-eb-mpcore", realview_eb_mpcore_machine_init)
|
||||
|
||||
static void realview_pb_a8_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "ARM RealView Platform Baseboard for Cortex-A8";
|
||||
mc->init = realview_pb_a8_init;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("realview-pb-a8", realview_pb_a8_machine_init)
|
||||
|
||||
static void realview_pbx_a9_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "ARM RealView Platform Baseboard Explore for Cortex-A9";
|
||||
mc->init = realview_pbx_a9_init;
|
||||
mc->block_default_type = IF_SCSI;
|
||||
mc->max_cpus = 4;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("realview-pbx-a9", realview_pbx_a9_machine_init)
|
||||
|
|
|
|||
|
|
@ -972,39 +972,37 @@ static void terrier_init(MachineState *machine)
|
|||
spitz_common_init(machine, terrier, 0x33f);
|
||||
}
|
||||
|
||||
static QEMUMachine akitapda_machine = {
|
||||
.name = "akita",
|
||||
.desc = "Akita PDA (PXA270)",
|
||||
.init = akita_init,
|
||||
};
|
||||
|
||||
static QEMUMachine spitzpda_machine = {
|
||||
.name = "spitz",
|
||||
.desc = "Spitz PDA (PXA270)",
|
||||
.init = spitz_init,
|
||||
};
|
||||
|
||||
static QEMUMachine borzoipda_machine = {
|
||||
.name = "borzoi",
|
||||
.desc = "Borzoi PDA (PXA270)",
|
||||
.init = borzoi_init,
|
||||
};
|
||||
|
||||
static QEMUMachine terrierpda_machine = {
|
||||
.name = "terrier",
|
||||
.desc = "Terrier PDA (PXA270)",
|
||||
.init = terrier_init,
|
||||
};
|
||||
|
||||
static void spitz_machine_init(void)
|
||||
static void akitapda_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&akitapda_machine);
|
||||
qemu_register_machine(&spitzpda_machine);
|
||||
qemu_register_machine(&borzoipda_machine);
|
||||
qemu_register_machine(&terrierpda_machine);
|
||||
mc->desc = "Akita PDA (PXA270)";
|
||||
mc->init = akita_init;
|
||||
}
|
||||
|
||||
machine_init(spitz_machine_init);
|
||||
DEFINE_MACHINE("akita", akitapda_machine_init)
|
||||
|
||||
static void spitzpda_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "Spitz PDA (PXA270)";
|
||||
mc->init = spitz_init;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("spitz", spitzpda_machine_init)
|
||||
|
||||
static void borzoipda_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "Borzoi PDA (PXA270)";
|
||||
mc->init = borzoi_init;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("borzoi", borzoipda_machine_init)
|
||||
|
||||
static void terrierpda_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "Terrier PDA (PXA270)";
|
||||
mc->init = terrier_init;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("terrier", terrierpda_machine_init)
|
||||
|
||||
static bool is_version_0(void *opaque, int version_id)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1366,25 +1366,21 @@ static void lm3s6965evb_init(MachineState *machine)
|
|||
stellaris_init(kernel_filename, cpu_model, &stellaris_boards[1]);
|
||||
}
|
||||
|
||||
static QEMUMachine lm3s811evb_machine = {
|
||||
.name = "lm3s811evb",
|
||||
.desc = "Stellaris LM3S811EVB",
|
||||
.init = lm3s811evb_init,
|
||||
};
|
||||
|
||||
static QEMUMachine lm3s6965evb_machine = {
|
||||
.name = "lm3s6965evb",
|
||||
.desc = "Stellaris LM3S6965EVB",
|
||||
.init = lm3s6965evb_init,
|
||||
};
|
||||
|
||||
static void stellaris_machine_init(void)
|
||||
static void lm3s811evb_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&lm3s811evb_machine);
|
||||
qemu_register_machine(&lm3s6965evb_machine);
|
||||
mc->desc = "Stellaris LM3S811EVB";
|
||||
mc->init = lm3s811evb_init;
|
||||
}
|
||||
|
||||
machine_init(stellaris_machine_init);
|
||||
DEFINE_MACHINE("lm3s811evb", lm3s811evb_machine_init)
|
||||
|
||||
static void lm3s6965evb_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "Stellaris LM3S6965EVB";
|
||||
mc->init = lm3s6965evb_init;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("lm3s6965evb", lm3s6965evb_machine_init)
|
||||
|
||||
static void stellaris_i2c_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -252,18 +252,13 @@ static void tosa_init(MachineState *machine)
|
|||
sl_bootparam_write(SL_PXA_PARAM_BASE);
|
||||
}
|
||||
|
||||
static QEMUMachine tosapda_machine = {
|
||||
.name = "tosa",
|
||||
.desc = "Tosa PDA (PXA255)",
|
||||
.init = tosa_init,
|
||||
};
|
||||
|
||||
static void tosapda_machine_init(void)
|
||||
static void tosapda_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&tosapda_machine);
|
||||
mc->desc = "Tosa PDA (PXA255)";
|
||||
mc->init = tosa_init;
|
||||
}
|
||||
|
||||
machine_init(tosapda_machine_init);
|
||||
DEFINE_MACHINE("tosa", tosapda_machine_init)
|
||||
|
||||
static void tosa_dac_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -391,27 +391,23 @@ static void vab_init(MachineState *machine)
|
|||
versatile_init(machine, 0x25e);
|
||||
}
|
||||
|
||||
static QEMUMachine versatilepb_machine = {
|
||||
.name = "versatilepb",
|
||||
.desc = "ARM Versatile/PB (ARM926EJ-S)",
|
||||
.init = vpb_init,
|
||||
.block_default_type = IF_SCSI,
|
||||
};
|
||||
|
||||
static QEMUMachine versatileab_machine = {
|
||||
.name = "versatileab",
|
||||
.desc = "ARM Versatile/AB (ARM926EJ-S)",
|
||||
.init = vab_init,
|
||||
.block_default_type = IF_SCSI,
|
||||
};
|
||||
|
||||
static void versatile_machine_init(void)
|
||||
static void versatilepb_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&versatilepb_machine);
|
||||
qemu_register_machine(&versatileab_machine);
|
||||
mc->desc = "ARM Versatile/PB (ARM926EJ-S)";
|
||||
mc->init = vpb_init;
|
||||
mc->block_default_type = IF_SCSI;
|
||||
}
|
||||
|
||||
machine_init(versatile_machine_init);
|
||||
DEFINE_MACHINE("versatilepb", versatilepb_machine_init)
|
||||
|
||||
static void versatileab_machine_init(MachineClass *mc)
|
||||
{
|
||||
mc->desc = "ARM Versatile/AB (ARM926EJ-S)";
|
||||
mc->init = vab_init;
|
||||
mc->block_default_type = IF_SCSI;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("versatileab", versatileab_machine_init)
|
||||
|
||||
static void vpb_sic_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -255,18 +255,13 @@ static void zynq_init(MachineState *machine)
|
|||
arm_load_kernel(ARM_CPU(first_cpu), &zynq_binfo);
|
||||
}
|
||||
|
||||
static QEMUMachine zynq_machine = {
|
||||
.name = "xilinx-zynq-a9",
|
||||
.desc = "Xilinx Zynq Platform Baseboard for Cortex-A9",
|
||||
.init = zynq_init,
|
||||
.block_default_type = IF_SCSI,
|
||||
.max_cpus = 1,
|
||||
.no_sdcard = 1,
|
||||
};
|
||||
|
||||
static void zynq_machine_init(void)
|
||||
static void zynq_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&zynq_machine);
|
||||
mc->desc = "Xilinx Zynq Platform Baseboard for Cortex-A9";
|
||||
mc->init = zynq_init;
|
||||
mc->block_default_type = IF_SCSI;
|
||||
mc->max_cpus = 1;
|
||||
mc->no_sdcard = 1;
|
||||
}
|
||||
|
||||
machine_init(zynq_machine_init);
|
||||
DEFINE_MACHINE("xilinx-zynq-a9", zynq_machine_init)
|
||||
|
|
|
|||
|
|
@ -68,15 +68,10 @@ static void xlnx_ep108_init(MachineState *machine)
|
|||
arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_ep108_binfo);
|
||||
}
|
||||
|
||||
static QEMUMachine xlnx_ep108_machine = {
|
||||
.name = "xlnx-ep108",
|
||||
.desc = "Xilinx ZynqMP EP108 board",
|
||||
.init = xlnx_ep108_init,
|
||||
};
|
||||
|
||||
static void xlnx_ep108_machine_init(void)
|
||||
static void xlnx_ep108_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&xlnx_ep108_machine);
|
||||
mc->desc = "Xilinx ZynqMP EP108 board";
|
||||
mc->init = xlnx_ep108_init;
|
||||
}
|
||||
|
||||
machine_init(xlnx_ep108_machine_init);
|
||||
DEFINE_MACHINE("xlnx-ep108", xlnx_ep108_machine_init)
|
||||
|
|
|
|||
13
hw/arm/z2.c
13
hw/arm/z2.c
|
|
@ -372,15 +372,10 @@ static void z2_init(MachineState *machine)
|
|||
arm_load_kernel(mpu->cpu, &z2_binfo);
|
||||
}
|
||||
|
||||
static QEMUMachine z2_machine = {
|
||||
.name = "z2",
|
||||
.desc = "Zipit Z2 (PXA27x)",
|
||||
.init = z2_init,
|
||||
};
|
||||
|
||||
static void z2_machine_init(void)
|
||||
static void z2_machine_init(MachineClass *mc)
|
||||
{
|
||||
qemu_register_machine(&z2_machine);
|
||||
mc->desc = "Zipit Z2 (PXA27x)";
|
||||
mc->init = z2_init;
|
||||
}
|
||||
|
||||
machine_init(z2_machine_init);
|
||||
DEFINE_MACHINE("z2", z2_machine_init)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue