Commit 5f072e1f authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Blue Swirl
Browse files

create struct for machine initialization arguments 



This should help us to:
- More easily add or remove machine initialization arguments without
  having to change every single machine init function;
- More easily make mechanical changes involving the machine init
  functions in the future;
- Let machine initialization forward the init arguments to other
  functions more easily.

This change was half-mechanical process: first the struct was added with
the local ram_size, boot_device, kernel_*, initrd_*, and cpu_model local
variable initialization to all functions. Then the compiler helped me
locate the local variables that are unused, so they could be removed.

Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent a96d8bea

hw/alpha_dp264.c

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

}



static void clipper_init(ram_addr_t ram_size,

                         const char *boot_device,

                         const char *kernel_filename,

                         const char *kernel_cmdline,

                         const char *initrd_filename,

                         const char *cpu_model)

static void clipper_init(QEMUMachineInitArgs *args)

{

    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;

    CPUAlphaState *cpus[4];

    PCIBus *pci_bus;

    ISABus *isa_bus;

hw/an5206.c

+4 −4
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ 


/* Board init.  */



static void an5206_init(ram_addr_t ram_size,

                     const char *boot_device,

                     const char *kernel_filename, const char *kernel_cmdline,

                     const char *initrd_filename, const char *cpu_model)

static void an5206_init(QEMUMachineInitArgs *args)

{

    ram_addr_t ram_size = args->ram_size;

    const char *cpu_model = args->cpu_model;

    const char *kernel_filename = args->kernel_filename;

    CPUM68KState *env;

    int kernel_size;

    uint64_t elf_entry;

hw/axis_dev88.c

+5 −4
Original line number Diff line number Diff line
@@ -242,11 +242,12 @@ static const MemoryRegionOps gpio_ops = { 
static struct cris_load_info li;



static

void axisdev88_init (ram_addr_t ram_size,

                     const char *boot_device,

                     const char *kernel_filename, const char *kernel_cmdline,

                     const char *initrd_filename, const char *cpu_model)

void axisdev88_init(QEMUMachineInitArgs *args)

{

    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;

    CRISCPU *cpu;

    CPUCRISState *env;

    DeviceState *dev;

hw/boards.h

+10 −6
Original line number Diff line number Diff line
@@ -5,12 +5,16 @@ 


#include "qdev.h"



typedef void QEMUMachineInitFunc(ram_addr_t ram_size,

                                 const char *boot_device,

                                 const char *kernel_filename,

                                 const char *kernel_cmdline,

                                 const char *initrd_filename,

                                 const char *cpu_model);

typedef struct QEMUMachineInitArgs {

    ram_addr_t ram_size;

    const char *boot_device;

    const char *kernel_filename;

    const char *kernel_cmdline;

    const char *initrd_filename;

    const char *cpu_model;

} QEMUMachineInitArgs;



typedef void QEMUMachineInitFunc(QEMUMachineInitArgs *args);



typedef void QEMUMachineResetFunc(void);

hw/collie.c

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

};



static void collie_init(ram_addr_t ram_size,

                const char *boot_device,

                const char *kernel_filename, const char *kernel_cmdline,

                const char *initrd_filename, const char *cpu_model)

static void collie_init(QEMUMachineInitArgs *args)

{

    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;

    StrongARMState *s;

    DriveInfo *dinfo;

    MemoryRegion *sysmem = get_system_memory();