Remove unused parameters from QEMUMachineInitFunc (Laurent Vivier)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3687 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/an5206.c b/hw/an5206.c
index 5e12ed8..52be63b 100644 (file)
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -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)
 {

diff --git a/hw/boards.h b/hw/boards.h
index 7eee866..73a44a4 100644 (file)
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -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;

diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 8121620..705d304 100644 (file)
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -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)
 {

diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index ba4d400..dfef962 100644 (file)
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -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)
 {

diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 6211226..f1d71ff 100644 (file)
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -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)
 {

diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index b3389f0..d7e7dcf 100644 (file)
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -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)
 {

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index f133da3..4d95fbf 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -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)
 {

diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index b9eec84..fe75314 100644 (file)
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -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)
 {

diff --git a/hw/mips_pica61.c b/hw/mips_pica61.c
index 6e9f345..2a358d5 100644 (file)
--- a/hw/mips_pica61.c
+++ b/hw/mips_pica61.c
@@ -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)
 {

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 42effb3..d090a2a 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -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)
 {

diff --git a/hw/palm.c b/hw/palm.c
index 63edd90..9400ea7 100644 (file)
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -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)
 {

diff --git a/hw/pc.c b/hw/pc.c
index 69eeadb..7049c44 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -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)
@@ -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);
 }

diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 7fd53d3..91fecc8 100644 (file)
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -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,
@@ -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,

diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c
index 34e1921..9d89b66 100644 (file)
--- a/hw/ppc_chrp.c
+++ b/hw/ppc_chrp.c
@@ -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,

diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index ac09c83..f3fe1a9 100644 (file)
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -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,

diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 4fcd5dd..1d6634c 100644 (file)
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -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)

diff --git a/hw/r2d.c b/hw/r2d.c
index 4bca6be..b6cc31c 100644 (file)
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -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)
 {

diff --git a/hw/realview.c b/hw/realview.c
index 808df10..7e8586f 100644 (file)
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -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)
 {

diff --git a/hw/shix.c b/hw/shix.c
index c891381..533b159 100644 (file)
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -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)
 {

diff --git a/hw/spitz.c b/hw/spitz.c
index c829921..461a60d 100644 (file)
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -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)
 {
@@ -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)
 {
@@ -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)
 {
@@ -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)
 {

diff --git a/hw/stellaris.c b/hw/stellaris.c
index 0bd76ab..878c7f8 100644 (file)
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -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)
 {
@@ -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)
 {

diff --git a/hw/sun4m.c b/hw/sun4m.c
index 7187956..e8adc45 100644 (file)
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -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";
@@ -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";
@@ -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)
 {

diff --git a/hw/sun4u.c b/hw/sun4u.c
index 336a74c..6fb7fae 100644 (file)
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -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];

diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index fa5f57a..66e11bf 100644 (file)
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -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)
@@ -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);
 }

diff --git a/vl.c b/vl.c
index e54afbf..8b2b5bd 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -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 */