It appears that fd_filename and snapshot are not needed/used by machine init functions (QEMUMachineInitFunc). This patch removes them. --- hw/an5206.c | 4 ++-- hw/dummy_m68k.c | 1 - hw/etraxfs.c | 4 ++-- hw/integratorcp.c | 1 - hw/mcf5208.c | 1 - hw/mips_malta.c | 4 ++-- hw/mips_mipssim.c | 4 ++-- hw/mips_pica61.c | 4 ++-- hw/mips_r4k.c | 4 ++-- hw/palm.c | 1 - hw/pc.c | 20 ++++++++------------ hw/ppc405_boards.c | 2 -- hw/ppc_chrp.c | 1 - hw/ppc_oldworld.c | 1 - hw/ppc_prep.c | 5 ++--- hw/r2d.c | 4 ++-- hw/realview.c | 1 - hw/shix.c | 4 ++-- hw/spitz.c | 4 ---- hw/stellaris.c | 2 -- hw/sun4m.c | 12 ++++++------ hw/sun4u.c | 4 ++-- hw/versatilepb.c | 17 ++++++++--------- vl.c | 3 +-- vl.h | 3 +-- 25 files changed, 44 insertions(+), 67 deletions(-) Index: qemu/vl.h =================================================================== --- qemu.orig/vl.h 2007-11-12 17:56:00.000000000 +0100 +++ qemu/vl.h 2007-11-12 17:56:31.000000000 +0100 @@ -582,8 +582,7 @@ extern uint8_t _translate_keycode(const #ifdef NEED_CPU_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 *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model); Index: qemu/hw/an5206.c =================================================================== --- qemu.orig/hw/an5206.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/an5206.c 2007-11-12 17:56:31.000000000 +0100 @@ -27,8 +27,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) { Index: qemu/hw/etraxfs.c =================================================================== --- qemu.orig/hw/etraxfs.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/etraxfs.c 2007-11-12 17:56:31.000000000 +0100 @@ -107,8 +107,8 @@ static void dummy_cpu_set_irq(void *opaq } 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) { Index: qemu/hw/integratorcp.c =================================================================== --- qemu.orig/hw/integratorcp.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/integratorcp.c 2007-11-12 17:56:31.000000000 +0100 @@ -466,7 +466,6 @@ static void icp_control_init(uint32_t ba 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) { Index: qemu/hw/mcf5208.c =================================================================== --- qemu.orig/hw/mcf5208.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/mcf5208.c 2007-11-12 17:56:31.000000000 +0100 @@ -199,7 +199,6 @@ static void mcf5208_sys_init(qemu_irq *p 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) { Index: qemu/hw/mips_malta.c =================================================================== --- qemu.orig/hw/mips_malta.c 2007-11-12 17:56:01.000000000 +0100 +++ qemu/hw/mips_malta.c 2007-11-12 17:56:31.000000000 +0100 @@ -746,8 +746,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) { Index: qemu/hw/mips_mipssim.c =================================================================== --- qemu.orig/hw/mips_mipssim.c 2007-11-12 17:56:01.000000000 +0100 +++ qemu/hw/mips_mipssim.c 2007-11-12 17:56:31.000000000 +0100 @@ -100,8 +100,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) { Index: qemu/hw/palm.c =================================================================== --- qemu.orig/hw/palm.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/palm.c 2007-11-12 17:56:31.000000000 +0100 @@ -179,7 +179,6 @@ static void palmte_gpio_setup(struct oma 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) { Index: qemu/hw/ppc405_boards.c =================================================================== --- qemu.orig/hw/ppc405_boards.c 2007-11-12 17:56:01.000000000 +0100 +++ qemu/hw/ppc405_boards.c 2007-11-12 17:56:31.000000000 +0100 @@ -173,7 +173,6 @@ static void ref405ep_fpga_init (uint32_t 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, @@ -499,7 +498,6 @@ static void taihu_cpld_init (uint32_t ba 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, Index: qemu/hw/ppc_chrp.c =================================================================== --- qemu.orig/hw/ppc_chrp.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/ppc_chrp.c 2007-11-12 17:56:31.000000000 +0100 @@ -50,7 +50,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, Index: qemu/hw/ppc_oldworld.c =================================================================== --- qemu.orig/hw/ppc_oldworld.c 2007-11-12 17:56:01.000000000 +0100 +++ qemu/hw/ppc_oldworld.c 2007-11-12 17:56:31.000000000 +0100 @@ -94,7 +94,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, Index: qemu/hw/r2d.c =================================================================== --- qemu.orig/hw/r2d.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/r2d.c 2007-11-12 17:56:31.000000000 +0100 @@ -27,8 +27,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) { Index: qemu/hw/shix.c =================================================================== --- qemu.orig/hw/shix.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/shix.c 2007-11-12 17:56:31.000000000 +0100 @@ -62,8 +62,8 @@ void vga_screen_dump(const char *filenam /* 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) { Index: qemu/hw/spitz.c =================================================================== --- qemu.orig/hw/spitz.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/spitz.c 2007-11-12 17:56:31.000000000 +0100 @@ -1234,7 +1234,6 @@ static void spitz_common_init(int ram_si 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) { @@ -1244,7 +1243,6 @@ static void spitz_init(int ram_size, int 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) { @@ -1254,7 +1252,6 @@ static void borzoi_init(int ram_size, in 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) { @@ -1264,7 +1261,6 @@ static void akita_init(int ram_size, int 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) { Index: qemu/hw/sun4u.c =================================================================== --- qemu.orig/hw/sun4u.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/sun4u.c 2007-11-12 17:56:31.000000000 +0100 @@ -306,8 +306,8 @@ static const int parallel_irq[MAX_PARALL static fdctrl_t *floppy_controller; /* Sun4u hardware initialisation */ -static void sun4u_init(int ram_size, int vga_ram_size, const char *boot_device, - DisplayState *ds, const char **fd_filename, int snapshot, +static void sun4u_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) { Index: qemu/hw/mips_pica61.c =================================================================== --- qemu.orig/hw/mips_pica61.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/mips_pica61.c 2007-11-12 17:56:31.000000000 +0100 @@ -54,8 +54,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) { Index: qemu/hw/mips_r4k.c =================================================================== --- qemu.orig/hw/mips_r4k.c 2007-11-12 17:56:01.000000000 +0100 +++ qemu/hw/mips_r4k.c 2007-11-12 17:56:31.000000000 +0100 @@ -137,8 +137,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) { Index: qemu/hw/pc.c =================================================================== --- qemu.orig/hw/pc.c 2007-11-12 17:56:01.000000000 +0100 +++ qemu/hw/pc.c 2007-11-12 17:56:31.000000000 +0100 @@ -684,8 +684,8 @@ static void pc_init_ne2k_isa(NICInfo *nd } /* 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) @@ -973,30 +973,26 @@ static void pc_init1(int ram_size, int v #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); } Index: qemu/hw/ppc_prep.c =================================================================== --- qemu.orig/hw/ppc_prep.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/ppc_prep.c 2007-11-12 17:56:31.000000000 +0100 @@ -522,9 +522,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) Index: qemu/hw/realview.c =================================================================== --- qemu.orig/hw/realview.c 2007-11-12 17:56:01.000000000 +0100 +++ qemu/hw/realview.c 2007-11-12 17:56:31.000000000 +0100 @@ -14,7 +14,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) { Index: qemu/hw/sun4m.c =================================================================== --- qemu.orig/hw/sun4m.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/sun4m.c 2007-11-12 17:56:31.000000000 +0100 @@ -603,8 +603,8 @@ static void sun4m_common_init(int RAM_si } /* 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, +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) { @@ -616,8 +616,8 @@ static void ss5_init(int RAM_size, int v } /* 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, +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) { @@ -629,8 +629,8 @@ static void ss10_init(int RAM_size, int } /* 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) { Index: qemu/hw/versatilepb.c =================================================================== --- qemu.orig/hw/versatilepb.c 2007-11-12 17:56:01.000000000 +0100 +++ qemu/hw/versatilepb.c 2007-11-12 17:56:31.000000000 +0100 @@ -153,7 +153,6 @@ static qemu_irq *vpb_sic_init(uint32_t b 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) @@ -270,24 +269,24 @@ static void versatile_init(int 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); } Index: qemu/vl.c =================================================================== --- qemu.orig/vl.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/vl.c 2007-11-12 17:56:31.000000000 +0100 @@ -8511,8 +8511,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 */ Index: qemu/hw/dummy_m68k.c =================================================================== --- qemu.orig/hw/dummy_m68k.c 2007-11-12 17:56:00.000000000 +0100 +++ qemu/hw/dummy_m68k.c 2007-11-12 17:56:31.000000000 +0100 @@ -14,7 +14,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) { Index: qemu/hw/stellaris.c =================================================================== --- qemu.orig/hw/stellaris.c 2007-11-12 17:56:01.000000000 +0100 +++ qemu/hw/stellaris.c 2007-11-12 17:56:31.000000000 +0100 @@ -1072,7 +1072,6 @@ static void stellaris_init(const char *k /* 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) { @@ -1081,7 +1080,6 @@ static void lm3s811evb_init(int 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) {