Commit 3ef96221 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Andreas Färber
Browse files

machine: Conversion of QEMUMachineInitArgs to MachineState 



Total removal of QEMUMachineInitArgs struct. QEMUMachineInitArgs's fields
are copied into MachineState. Removed duplicated fields from MachineState.

All the other changes are only mechanical refactoring, no semantic changes.

Signed-off-by: default avatarMarcel Apfelbaum <marcel.a@redhat.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> (s390)
Reviewed-by: Michael S. Tsirkin <mst@redhat.com> (PC)
[AF: Renamed ms -> machine, use MACHINE_GET_CLASS()]
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 0380aef3

hw/alpha/dp264.c

+6 −6
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ static int clipper_pci_map_irq(PCIDevice *d, int irq_num) 
    return (slot + 1) * 4 + irq_num;

}



static void clipper_init(QEMUMachineInitArgs *args)

static void clipper_init(MachineState *machine)

{

    ram_addr_t ram_size = args->ram_size;

    const char *cpu_model = args->cpu_model;

    const char *kernel_filename = args->kernel_filename;

    const char *kernel_cmdline = args->kernel_cmdline;

    const char *initrd_filename = args->initrd_filename;

    ram_addr_t ram_size = machine->ram_size;

    const char *cpu_model = machine->cpu_model;

    const char *kernel_filename = machine->kernel_filename;

    const char *kernel_cmdline = machine->kernel_cmdline;

    const char *initrd_filename = machine->initrd_filename;

    AlphaCPU *cpus[4];

    PCIBus *pci_bus;

    ISABus *isa_bus;

hw/arm/collie.c

+5 −5
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ static struct arm_boot_info collie_binfo = { 
    .ram_size = 0x20000000,

};



static void collie_init(QEMUMachineInitArgs *args)

static void collie_init(MachineState *machine)

{

    const char *cpu_model = args->cpu_model;

    const char *kernel_filename = args->kernel_filename;

    const char *kernel_cmdline = args->kernel_cmdline;

    const char *initrd_filename = args->initrd_filename;

    const char *cpu_model = machine->cpu_model;

    const char *kernel_filename = machine->kernel_filename;

    const char *kernel_cmdline = machine->kernel_cmdline;

    const char *initrd_filename = machine->initrd_filename;

    StrongARMState *s;

    DriveInfo *dinfo;

    MemoryRegion *sysmem = get_system_memory();

hw/arm/cubieboard.c

+6 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ typedef struct CubieBoardState { 
    MemoryRegion sdram;

} CubieBoardState;



static void cubieboard_init(QEMUMachineInitArgs *args)

static void cubieboard_init(MachineState *machine)

{

    CubieBoardState *s = g_new(CubieBoardState, 1);

    Error *err = NULL;
@@ -63,14 +63,15 @@ static void cubieboard_init(QEMUMachineInitArgs *args) 
        exit(1);

    }



    memory_region_init_ram(&s->sdram, NULL, "cubieboard.ram", args->ram_size);

    memory_region_init_ram(&s->sdram, NULL, "cubieboard.ram",

                           machine->ram_size);

    vmstate_register_ram_global(&s->sdram);

    memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE,

                                &s->sdram);



    cubieboard_binfo.ram_size = args->ram_size;

    cubieboard_binfo.kernel_filename = args->kernel_filename;

    cubieboard_binfo.kernel_cmdline = args->kernel_cmdline;

    cubieboard_binfo.ram_size = machine->ram_size;

    cubieboard_binfo.kernel_filename = machine->kernel_filename;

    cubieboard_binfo.kernel_cmdline = machine->kernel_cmdline;

    arm_load_kernel(&s->a10->cpu, &cubieboard_binfo);

}

hw/arm/digic_boards.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static DigicBoard digic4_board_canon_a1100 = { 
    .rom1_def_filename = "canon-a1100-rom1.bin",

};



static void canon_a1100_init(QEMUMachineInitArgs *args)

static void canon_a1100_init(MachineState *machine)

{

    digic4_board_init(&digic4_board_canon_a1100);

}

hw/arm/exynos4_boards.c

+11 −11
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void lan9215_init(uint32_t base, qemu_irq irq) 
    }

}



static Exynos4210State *exynos4_boards_init_common(QEMUMachineInitArgs *args,

static Exynos4210State *exynos4_boards_init_common(MachineState *machine,

                                                   Exynos4BoardType board_type)

{

    if (smp_cpus != EXYNOS4210_NCPUS && !qtest_enabled()) {
@@ -108,9 +108,9 @@ static Exynos4210State *exynos4_boards_init_common(QEMUMachineInitArgs *args, 
    exynos4_board_binfo.board_id = exynos4_board_id[board_type];

    exynos4_board_binfo.smp_bootreg_addr =

            exynos4_board_smp_bootreg_addr[board_type];

    exynos4_board_binfo.kernel_filename = args->kernel_filename;

    exynos4_board_binfo.initrd_filename = args->initrd_filename;

    exynos4_board_binfo.kernel_cmdline = args->kernel_cmdline;

    exynos4_board_binfo.kernel_filename = machine->kernel_filename;

    exynos4_board_binfo.initrd_filename = machine->initrd_filename;

    exynos4_board_binfo.kernel_cmdline = machine->kernel_cmdline;

    exynos4_board_binfo.gic_cpu_if_addr =

            EXYNOS4210_SMP_PRIVATE_BASE_ADDR + 0x100;
@@ -120,24 +120,24 @@ static Exynos4210State *exynos4_boards_init_common(QEMUMachineInitArgs *args, 
            " initrd_filename: %s\n",

            exynos4_board_ram_size[board_type] / 1048576,

            exynos4_board_ram_size[board_type],

            args->kernel_filename,

            args->kernel_cmdline,

            args->initrd_filename);

            machine->kernel_filename,

            machine->kernel_cmdline,

            machine->initrd_filename);



    return exynos4210_init(get_system_memory(),

            exynos4_board_ram_size[board_type]);

}



static void nuri_init(QEMUMachineInitArgs *args)

static void nuri_init(MachineState *machine)

{

    exynos4_boards_init_common(args, EXYNOS4_BOARD_NURI);

    exynos4_boards_init_common(machine, EXYNOS4_BOARD_NURI);



    arm_load_kernel(ARM_CPU(first_cpu), &exynos4_board_binfo);

}



static void smdkc210_init(QEMUMachineInitArgs *args)

static void smdkc210_init(MachineState *machine)

{

    Exynos4210State *s = exynos4_boards_init_common(args,

    Exynos4210State *s = exynos4_boards_init_common(machine,

                                                    EXYNOS4_BOARD_SMDKC210);



    lan9215_init(SMDK_LAN9118_BASE_ADDR,