Commit e264d29d authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Andreas Färber
Browse files

Use DEFINE_MACHINE() to register all machines 



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

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
[AF: Style cleanups, convert imx25_pdk machine]
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent f309ae85

hw/alpha/dp264.c

+6 −11
Original line number Diff line number Diff line
@@ -168,17 +168,12 @@ static void clipper_init(MachineState *machine) 
    }

}



static QEMUMachine clipper_machine = {

    .name = "clipper",

    .desc = "Alpha DP264/CLIPPER",

    .init = clipper_init,

    .max_cpus = 4,

    .is_default = 1,

};



static void clipper_machine_init(void)

static void clipper_machine_init(MachineClass *mc)

{

    qemu_register_machine(&clipper_machine);

    mc->desc = "Alpha DP264/CLIPPER";

    mc->init = clipper_init;

    mc->max_cpus = 4;

    mc->is_default = 1;

}



machine_init(clipper_machine_init);
 
DEFINE_MACHINE("clipper", clipper_machine_init)

hw/arm/collie.c

+4 −9
Original line number Diff line number Diff line
@@ -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)

hw/arm/cubieboard.c

+4 −10
Original line number Diff line number Diff line
@@ -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)

hw/arm/digic_boards.c

+4 −9
Original line number Diff line number Diff line
@@ -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)

hw/arm/exynos4_boards.c

+12 −16
Original line number Diff line number Diff line
@@ -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 void exynos4_machine_nuri_machine_init(MachineClass *mc)

{

    mc->desc = "Samsung NURI board (Exynos4210)";

    mc->init = nuri_init;

    mc->max_cpus = EXYNOS4210_NCPUS;

}



static QEMUMachine exynos4_machine_smdkc210 = {

    .name = "smdkc210",

    .desc = "Samsung SMDKC210 board (Exynos4210)",

    .init = smdkc210_init,

    .max_cpus = EXYNOS4210_NCPUS,

};

DEFINE_MACHINE("nuri", exynos4_machine_nuri_machine_init)



static void exynos4_machine_init(void)

static void exynos4_machine_smdkc210_machine_init(MachineClass *mc)

{

    qemu_register_machine(&exynos4_machine_nuri);

    qemu_register_machine(&exynos4_machine_smdkc210);

    mc->desc = "Samsung SMDKC210 board (Exynos4210)";

    mc->init = smdkc210_init;

    mc->max_cpus = EXYNOS4210_NCPUS;

}



machine_init(exynos4_machine_init);
 
DEFINE_MACHINE("smdkc210", exynos4_machine_smdkc210_machine_init)