Skip to content

Commit

Permalink
Remove unused parameters from QEMUMachineInitFunc (Laurent Vivier)
Browse files Browse the repository at this point in the history 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3687 c046a42c-6fe2-441c-8c8c-71466251a162
  • Loading branch information
blueswir1 committed Nov 18, 2007
1 parent c6d6dd7 commit b881c2c
Show file tree
Hide file tree
Showing 25 changed files with 54 additions and 75 deletions.
4 changes: 2 additions & 2 deletions hw/an5206.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ void DMA_run (void)

/* Board init. */

static void an5206_init(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
static void an5206_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
9 changes: 5 additions & 4 deletions hw/boards.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
#define HW_BOARDS_H

typedef void QEMUMachineInitFunc(int ram_size, int vga_ram_size,
const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model);
const char *boot_device, DisplayState *ds,
const char *kernel_filename,
const char *kernel_cmdline,
const char *initrd_filename,
const char *cpu_model);

typedef struct QEMUMachine {
const char *name;
Expand Down
1 change: 0 additions & 1 deletion hw/dummy_m68k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

static void dummy_m68k_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
4 changes: 2 additions & 2 deletions hw/etraxfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ static void dummy_cpu_set_irq(void *opaque, int irq, int level)
}

static
void bareetraxfs_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
void bareetraxfs_init (int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
1 change: 0 additions & 1 deletion hw/integratorcp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ static void icp_control_init(uint32_t base)

static void integratorcp_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
1 change: 0 additions & 1 deletion hw/mcf5208.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ static void mcf5208_sys_init(qemu_irq *pic)

static void mcf5208evb_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
4 changes: 2 additions & 2 deletions hw/mips_malta.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -756,8 +756,8 @@ static void main_cpu_reset(void *opaque)
}

static
void mips_malta_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
void mips_malta_init (int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
4 changes: 2 additions & 2 deletions hw/mips_mipssim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ static void main_cpu_reset(void *opaque)
}

static void
mips_mipssim_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
mips_mipssim_init (int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
4 changes: 2 additions & 2 deletions hw/mips_pica61.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ static void main_cpu_reset(void *opaque)
}

static
void mips_pica61_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
void mips_pica61_init (int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
4 changes: 2 additions & 2 deletions hw/mips_r4k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ static void main_cpu_reset(void *opaque)
}

static
void mips_r4k_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
void mips_r4k_init (int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
1 change: 0 additions & 1 deletion hw/palm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ static void palmte_gpio_setup(struct omap_mpu_state_s *cpu)

static void palmte_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
20 changes: 8 additions & 12 deletions hw/pc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,8 +693,8 @@ static void pc_init_ne2k_isa(NICInfo *nd, qemu_irq *pic)
}

/* PC hardware initialisation */
static void pc_init1(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
static void pc_init1(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename,
int pci_enabled, const char *cpu_model)
Expand Down Expand Up @@ -982,30 +982,26 @@ static void pc_init1(int ram_size, int vga_ram_size, const char *boot_device,
#endif
}

static void pc_init_pci(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename,
int snapshot,
static void pc_init_pci(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename,
const char *kernel_cmdline,
const char *initrd_filename,
const char *cpu_model)
{
pc_init1(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot,
pc_init1(ram_size, vga_ram_size, boot_device, ds,
kernel_filename, kernel_cmdline,
initrd_filename, 1, cpu_model);
}

static void pc_init_isa(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename,
int snapshot,
static void pc_init_isa(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename,
const char *kernel_cmdline,
const char *initrd_filename,
const char *cpu_model)
{
pc_init1(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot,
pc_init1(ram_size, vga_ram_size, boot_device, ds,
kernel_filename, kernel_cmdline,
initrd_filename, 0, cpu_model);
}
Expand Down
2 changes: 0 additions & 2 deletions hw/ppc405_boards.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ static void ref405ep_fpga_init (uint32_t base)

static void ref405ep_init (int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename,
const char *kernel_cmdline,
const char *initrd_filename,
Expand Down Expand Up @@ -505,7 +504,6 @@ static void taihu_cpld_init (uint32_t base)

static void taihu_405ep_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename,
const char *kernel_cmdline,
const char *initrd_filename,
Expand Down
1 change: 0 additions & 1 deletion hw/ppc_chrp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ static CPUReadMemoryFunc *unin_read[] = {
/* PowerPC Mac99 hardware initialisation */
static void ppc_core99_init (int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename,
const char *kernel_cmdline,
const char *initrd_filename,
Expand Down
1 change: 0 additions & 1 deletion hw/ppc_oldworld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ static int vga_osi_call (CPUState *env)

static void ppc_heathrow_init (int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename,
const char *kernel_cmdline,
const char *initrd_filename,
Expand Down
5 changes: 2 additions & 3 deletions hw/ppc_prep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,8 @@ CPUReadMemoryFunc *PPC_prep_io_read[] = {

/* PowerPC PREP hardware initialisation */
static void ppc_prep_init (int ram_size, int vga_ram_size,
const char *boot_device,
DisplayState *ds, const char **fd_filename,
int snapshot, const char *kernel_filename,
const char *boot_device, DisplayState *ds,
const char *kernel_filename,
const char *kernel_cmdline,
const char *initrd_filename,
const char *cpu_model)
Expand Down
4 changes: 2 additions & 2 deletions hw/r2d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#define SDRAM_BASE 0x0c000000 /* Physical location of SDRAM: Area 3 */
#define SDRAM_SIZE 0x04000000

static void r2d_init(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState * ds, const char **fd_filename, int snapshot,
static void r2d_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState * ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
1 change: 0 additions & 1 deletion hw/realview.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

static void realview_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
4 changes: 2 additions & 2 deletions hw/shix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ void vga_screen_dump(const char *filename)
/* XXXXX */
}

static void shix_init(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState * ds, const char **fd_filename, int snapshot,
static void shix_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState * ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
4 changes: 0 additions & 4 deletions hw/spitz.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,6 @@ static void spitz_common_init(int ram_size, int vga_ram_size,

static void spitz_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand All @@ -1244,7 +1243,6 @@ static void spitz_init(int ram_size, int vga_ram_size,

static void borzoi_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand All @@ -1254,7 +1252,6 @@ static void borzoi_init(int ram_size, int vga_ram_size,

static void akita_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand All @@ -1264,7 +1261,6 @@ static void akita_init(int ram_size, int vga_ram_size,

static void terrier_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
2 changes: 0 additions & 2 deletions hw/stellaris.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,6 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,
/* FIXME: Figure out how to generate these from stellaris_boards. */
static void lm3s811evb_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand All @@ -1087,7 +1086,6 @@ static void lm3s811evb_init(int ram_size, int vga_ram_size,

static void lm3s6965evb_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
20 changes: 10 additions & 10 deletions hw/sun4m.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,10 +573,10 @@ static void sun4m_common_init(int RAM_size, const char *boot_device, DisplayStat
}

/* SPARCstation 5 hardware initialisation */
static void ss5_init(int RAM_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
static void ss5_init(int RAM_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
if (cpu_model == NULL)
cpu_model = "Fujitsu MB86904";
Expand All @@ -586,10 +586,10 @@ static void ss5_init(int RAM_size, int vga_ram_size, const char *boot_device,
}

/* SPARCstation 10 hardware initialisation */
static void ss10_init(int RAM_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
static void ss10_init(int RAM_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
if (cpu_model == NULL)
cpu_model = "TI SuperSparc II";
Expand All @@ -599,8 +599,8 @@ static void ss10_init(int RAM_size, int vga_ram_size, const char *boot_device,
}

/* SPARCserver 600MP hardware initialisation */
static void ss600mp_init(int RAM_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
static void ss600mp_init(int RAM_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Expand Down
8 changes: 4 additions & 4 deletions hw/sun4u.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,10 @@ static const int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
static fdctrl_t *floppy_controller;

/* Sun4u hardware initialisation */
static void sun4u_init(int ram_size, int vga_ram_size, const char *boot_devices,
DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
static void sun4u_init(int ram_size, int vga_ram_size,
const char *boot_devices, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
CPUState *env;
char buf[1024];
Expand Down
17 changes: 8 additions & 9 deletions hw/versatilepb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ static qemu_irq *vpb_sic_init(uint32_t base, qemu_irq *parent, int irq)

static void versatile_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model,
int board_id)
Expand Down Expand Up @@ -276,24 +275,24 @@ static void versatile_init(int ram_size, int vga_ram_size,
initrd_filename, board_id, 0x0);
}

static void vpb_init(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
static void vpb_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
versatile_init(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot,
versatile_init(ram_size, vga_ram_size,
boot_device, ds,
kernel_filename, kernel_cmdline,
initrd_filename, cpu_model, 0x183);
}

static void vab_init(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
static void vab_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
versatile_init(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot,
versatile_init(ram_size, vga_ram_size,
boot_device, ds,
kernel_filename, kernel_cmdline,
initrd_filename, cpu_model, 0x25e);
}
Expand Down
3 changes: 1 addition & 2 deletions vl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8529,8 +8529,7 @@ int main(int argc, char **argv)
}
}

machine->init(ram_size, vga_ram_size, boot_devices,
ds, fd_filename, snapshot,
machine->init(ram_size, vga_ram_size, boot_devices, ds,
kernel_filename, kernel_cmdline, initrd_filename, cpu_model);

/* init USB devices */
Expand Down

0 comments on commit b881c2c

Please sign in to comment.