It appears that fd_filename and snapshot are not needed/used by machine init functions (QEMUMachineInitFunc).
This patch removes them.
Index: qemu/vl.h
===================================================================
--- qemu.orig/vl.h 2007-11-08 16:36:36.000000000 +0100
+++ qemu/vl.h 2007-11-08 16:37:04.000000000 +0100
@@ -790,8 +790,7 @@
#ifndef QEMU_TOOL
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-08 16:36:35.000000000 +0100
+++ qemu/hw/an5206.c 2007-11-08 16:37:04.000000000 +0100
@@ -27,8 +27,8 @@
/* 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-08 16:36:35.000000000 +0100
+++ qemu/hw/etraxfs.c 2007-11-08 16:37:04.000000000 +0100
@@ -107,8 +107,8 @@
}
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-08 16:36:35.000000000 +0100
+++ qemu/hw/integratorcp.c 2007-11-08 16:37:04.000000000 +0100
@@ -464,7 +464,6 @@
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-08 16:36:35.000000000 +0100
+++ qemu/hw/mcf5208.c 2007-11-08 16:37:04.000000000 +0100
@@ -199,7 +199,6 @@
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-08 16:36:35.000000000 +0100
+++ qemu/hw/mips_malta.c 2007-11-08 16:37:04.000000000 +0100
@@ -740,8 +740,8 @@
}
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-08 16:36:35.000000000 +0100
+++ qemu/hw/mips_mipssim.c 2007-11-08 16:37:04.000000000 +0100
@@ -94,8 +94,8 @@
}
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-08 16:36:35.000000000 +0100
+++ qemu/hw/palm.c 2007-11-08 16:37:04.000000000 +0100
@@ -179,7 +179,6 @@
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-08 16:36:35.000000000 +0100
+++ qemu/hw/ppc405_boards.c 2007-11-08 16:37:04.000000000 +0100
@@ -173,7 +173,6 @@
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_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-08 16:36:35.000000000 +0100
+++ qemu/hw/ppc_chrp.c 2007-11-08 16:37:04.000000000 +0100
@@ -50,7 +50,6 @@
/* 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-08 16:36:35.000000000 +0100
+++ qemu/hw/ppc_oldworld.c 2007-11-08 16:37:04.000000000 +0100
@@ -94,7 +94,6 @@
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-08 16:36:35.000000000 +0100
+++ qemu/hw/r2d.c 2007-11-08 16:37:04.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-08 16:36:35.000000000 +0100
+++ qemu/hw/shix.c 2007-11-08 16:37:04.000000000 +0100
@@ -62,8 +62,8 @@
/* 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-08 16:36:35.000000000 +0100
+++ qemu/hw/spitz.c 2007-11-08 16:37:04.000000000 +0100
@@ -1230,7 +1230,6 @@
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)
{
@@ -1240,7 +1239,6 @@
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)
{
@@ -1250,7 +1248,6 @@
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)
{
@@ -1260,7 +1257,6 @@
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-08 16:36:35.000000000 +0100
+++ qemu/hw/sun4u.c 2007-11-08 16:37:04.000000000 +0100
@@ -331,8 +331,8 @@
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-08 16:36:36.000000000 +0100
+++ qemu/hw/mips_pica61.c 2007-11-08 16:37:04.000000000 +0100
@@ -55,8 +55,8 @@
}
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-08 16:36:36.000000000 +0100
+++ qemu/hw/mips_r4k.c 2007-11-08 16:37:04.000000000 +0100
@@ -137,8 +137,8 @@
}
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-08 16:36:37.000000000 +0100
+++ qemu/hw/pc.c 2007-11-08 16:37:04.000000000 +0100
@@ -672,8 +672,8 @@
}
/* 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)
@@ -949,30 +949,28 @@
#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);
}
-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);
}
Index: qemu/hw/ppc_prep.c
===================================================================
--- qemu.orig/hw/ppc_prep.c 2007-11-08 16:36:36.000000000 +0100
+++ qemu/hw/ppc_prep.c 2007-11-08 16:37:04.000000000 +0100
@@ -521,9 +521,9 @@
#define NVRAM_SIZE 0x2000
/* 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,
+static void ppc_prep_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/realview.c
===================================================================
--- qemu.orig/hw/realview.c 2007-11-08 16:36:36.000000000 +0100
+++ qemu/hw/realview.c 2007-11-08 16:37:04.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-08 16:36:36.000000000 +0100
+++ qemu/hw/sun4m.c 2007-11-08 16:37:04.000000000 +0100
@@ -571,8 +571,8 @@
}
/* 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)
{
@@ -584,8 +584,8 @@
}
/* 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)
{
Index: qemu/hw/versatilepb.c
===================================================================
--- qemu.orig/hw/versatilepb.c 2007-11-08 16:36:36.000000000 +0100
+++ qemu/hw/versatilepb.c 2007-11-08 16:37:04.000000000 +0100
@@ -153,7 +153,6 @@
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)
@@ -267,24 +266,24 @@
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-08 16:36:36.000000000 +0100
+++ qemu/vl.c 2007-11-08 16:37:39.000000000 +0100
@@ -8464,8 +8464,7 @@
}
}
- machine->init(ram_size, vga_ram_size, boot_device,
- ds, fd_filename, snapshot,
+ machine->init(ram_size, vga_ram_size, boot_device, ds,
kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
/* init USB devices */
signature.asc
Description: Ceci est une partie de message numériquement signée
