gwj / at91sam9263 · Commits

Commit b881c2c6e774d40b33980f00f830431deed9e896

Authored by blueswir1
1 parent c6d6dd7c

Remove unused parameters from QEMUMachineInitFunc (Laurent Vivier) 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3687 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 25 changed files with 54 additions and 75 deletions
hw/an5206.c
  View file @b881c2c
... ... @@ -30,8 +30,8 @@ void DMA_run (void)
30 30  
31 31 /* Board init. */
32 32  
33   -static void an5206_init(int ram_size, int vga_ram_size, const char *boot_device,
34   - DisplayState *ds, const char **fd_filename, int snapshot,
  33 +static void an5206_init(int ram_size, int vga_ram_size,
  34 + const char *boot_device, DisplayState *ds,
35 35 const char *kernel_filename, const char *kernel_cmdline,
36 36 const char *initrd_filename, const char *cpu_model)
37 37 {
... ...
hw/boards.h
  View file @b881c2c
... ... @@ -4,10 +4,11 @@
4 4 #define HW_BOARDS_H
5 5  
6 6 typedef void QEMUMachineInitFunc(int ram_size, int vga_ram_size,
7   - const char *boot_device,
8   - DisplayState *ds, const char **fd_filename, int snapshot,
9   - const char *kernel_filename, const char *kernel_cmdline,
10   - const char *initrd_filename, const char *cpu_model);
  7 + const char *boot_device, DisplayState *ds,
  8 + const char *kernel_filename,
  9 + const char *kernel_cmdline,
  10 + const char *initrd_filename,
  11 + const char *cpu_model);
11 12  
12 13 typedef struct QEMUMachine {
13 14 const char *name;
... ...
hw/dummy_m68k.c
  View file @b881c2c
... ... @@ -16,7 +16,6 @@
16 16  
17 17 static void dummy_m68k_init(int ram_size, int vga_ram_size,
18 18 const char *boot_device, DisplayState *ds,
19   - const char **fd_filename, int snapshot,
20 19 const char *kernel_filename, const char *kernel_cmdline,
21 20 const char *initrd_filename, const char *cpu_model)
22 21 {
... ...
hw/etraxfs.c
  View file @b881c2c
... ... @@ -109,8 +109,8 @@ static void dummy_cpu_set_irq(void *opaque, int irq, int level)
109 109 }
110 110  
111 111 static
112   -void bareetraxfs_init (int ram_size, int vga_ram_size, const char *boot_device,
113   - DisplayState *ds, const char **fd_filename, int snapshot,
  112 +void bareetraxfs_init (int ram_size, int vga_ram_size,
  113 + const char *boot_device, DisplayState *ds,
114 114 const char *kernel_filename, const char *kernel_cmdline,
115 115 const char *initrd_filename, const char *cpu_model)
116 116 {
... ...
hw/integratorcp.c
  View file @b881c2c
... ... @@ -471,7 +471,6 @@ static void icp_control_init(uint32_t base)
471 471  
472 472 static void integratorcp_init(int ram_size, int vga_ram_size,
473 473 const char *boot_device, DisplayState *ds,
474   - const char **fd_filename, int snapshot,
475 474 const char *kernel_filename, const char *kernel_cmdline,
476 475 const char *initrd_filename, const char *cpu_model)
477 476 {
... ...
hw/mcf5208.c
  View file @b881c2c
... ... @@ -204,7 +204,6 @@ static void mcf5208_sys_init(qemu_irq *pic)
204 204  
205 205 static void mcf5208evb_init(int ram_size, int vga_ram_size,
206 206 const char *boot_device, DisplayState *ds,
207   - const char **fd_filename, int snapshot,
208 207 const char *kernel_filename, const char *kernel_cmdline,
209 208 const char *initrd_filename, const char *cpu_model)
210 209 {
... ...
hw/mips_malta.c
  View file @b881c2c
... ... @@ -756,8 +756,8 @@ static void main_cpu_reset(void *opaque)
756 756 }
757 757  
758 758 static
759   -void mips_malta_init (int ram_size, int vga_ram_size, const char *boot_device,
760   - DisplayState *ds, const char **fd_filename, int snapshot,
  759 +void mips_malta_init (int ram_size, int vga_ram_size,
  760 + const char *boot_device, DisplayState *ds,
761 761 const char *kernel_filename, const char *kernel_cmdline,
762 762 const char *initrd_filename, const char *cpu_model)
763 763 {
... ...
hw/mips_mipssim.c
  View file @b881c2c
... ... @@ -106,8 +106,8 @@ static void main_cpu_reset(void *opaque)
106 106 }
107 107  
108 108 static void
109   -mips_mipssim_init (int ram_size, int vga_ram_size, const char *boot_device,
110   - DisplayState *ds, const char **fd_filename, int snapshot,
  109 +mips_mipssim_init (int ram_size, int vga_ram_size,
  110 + const char *boot_device, DisplayState *ds,
111 111 const char *kernel_filename, const char *kernel_cmdline,
112 112 const char *initrd_filename, const char *cpu_model)
113 113 {
... ...
hw/mips_pica61.c
  View file @b881c2c
... ... @@ -60,8 +60,8 @@ static void main_cpu_reset(void *opaque)
60 60 }
61 61  
62 62 static
63   -void mips_pica61_init (int ram_size, int vga_ram_size, const char *boot_device,
64   - DisplayState *ds, const char **fd_filename, int snapshot,
  63 +void mips_pica61_init (int ram_size, int vga_ram_size,
  64 + const char *boot_device, DisplayState *ds,
65 65 const char *kernel_filename, const char *kernel_cmdline,
66 66 const char *initrd_filename, const char *cpu_model)
67 67 {
... ...
hw/mips_r4k.c
  View file @b881c2c
... ... @@ -143,8 +143,8 @@ static void main_cpu_reset(void *opaque)
143 143 }
144 144  
145 145 static
146   -void mips_r4k_init (int ram_size, int vga_ram_size, const char *boot_device,
147   - DisplayState *ds, const char **fd_filename, int snapshot,
  146 +void mips_r4k_init (int ram_size, int vga_ram_size,
  147 + const char *boot_device, DisplayState *ds,
148 148 const char *kernel_filename, const char *kernel_cmdline,
149 149 const char *initrd_filename, const char *cpu_model)
150 150 {
... ...
hw/palm.c
  View file @b881c2c
... ... @@ -185,7 +185,6 @@ static void palmte_gpio_setup(struct omap_mpu_state_s *cpu)
185 185  
186 186 static void palmte_init(int ram_size, int vga_ram_size,
187 187 const char *boot_device, DisplayState *ds,
188   - const char **fd_filename, int snapshot,
189 188 const char *kernel_filename, const char *kernel_cmdline,
190 189 const char *initrd_filename, const char *cpu_model)
191 190 {
... ...
... ... @@ -693,8 +693,8 @@ static void pc_init_ne2k_isa(NICInfo *nd, qemu_irq *pic)
693 693 }
694 694  
695 695 /* PC hardware initialisation */
696   -static void pc_init1(int ram_size, int vga_ram_size, const char *boot_device,
697   - DisplayState *ds, const char **fd_filename, int snapshot,
  696 +static void pc_init1(int ram_size, int vga_ram_size,
  697 + const char *boot_device, DisplayState *ds,
698 698 const char *kernel_filename, const char *kernel_cmdline,
699 699 const char *initrd_filename,
700 700 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,
982 982 #endif
983 983 }
984 984  
985   -static void pc_init_pci(int ram_size, int vga_ram_size, const char *boot_device,
986   - DisplayState *ds, const char **fd_filename,
987   - int snapshot,
  985 +static void pc_init_pci(int ram_size, int vga_ram_size,
  986 + const char *boot_device, DisplayState *ds,
988 987 const char *kernel_filename,
989 988 const char *kernel_cmdline,
990 989 const char *initrd_filename,
991 990 const char *cpu_model)
992 991 {
993   - pc_init1(ram_size, vga_ram_size, boot_device,
994   - ds, fd_filename, snapshot,
  992 + pc_init1(ram_size, vga_ram_size, boot_device, ds,
995 993 kernel_filename, kernel_cmdline,
996 994 initrd_filename, 1, cpu_model);
997 995 }
998 996  
999   -static void pc_init_isa(int ram_size, int vga_ram_size, const char *boot_device,
1000   - DisplayState *ds, const char **fd_filename,
1001   - int snapshot,
  997 +static void pc_init_isa(int ram_size, int vga_ram_size,
  998 + const char *boot_device, DisplayState *ds,
1002 999 const char *kernel_filename,
1003 1000 const char *kernel_cmdline,
1004 1001 const char *initrd_filename,
1005 1002 const char *cpu_model)
1006 1003 {
1007   - pc_init1(ram_size, vga_ram_size, boot_device,
1008   - ds, fd_filename, snapshot,
  1004 + pc_init1(ram_size, vga_ram_size, boot_device, ds,
1009 1005 kernel_filename, kernel_cmdline,
1010 1006 initrd_filename, 0, cpu_model);
1011 1007 }
... ...
hw/ppc405_boards.c
  View file @b881c2c
... ... @@ -179,7 +179,6 @@ static void ref405ep_fpga_init (uint32_t base)
179 179  
180 180 static void ref405ep_init (int ram_size, int vga_ram_size,
181 181 const char *boot_device, DisplayState *ds,
182   - const char **fd_filename, int snapshot,
183 182 const char *kernel_filename,
184 183 const char *kernel_cmdline,
185 184 const char *initrd_filename,
... ... @@ -505,7 +504,6 @@ static void taihu_cpld_init (uint32_t base)
505 504  
506 505 static void taihu_405ep_init(int ram_size, int vga_ram_size,
507 506 const char *boot_device, DisplayState *ds,
508   - const char **fd_filename, int snapshot,
509 507 const char *kernel_filename,
510 508 const char *kernel_cmdline,
511 509 const char *initrd_filename,
... ...
hw/ppc_chrp.c
  View file @b881c2c
... ... @@ -57,7 +57,6 @@ static CPUReadMemoryFunc *unin_read[] = {
57 57 /* PowerPC Mac99 hardware initialisation */
58 58 static void ppc_core99_init (int ram_size, int vga_ram_size,
59 59 const char *boot_device, DisplayState *ds,
60   - const char **fd_filename, int snapshot,
61 60 const char *kernel_filename,
62 61 const char *kernel_cmdline,
63 62 const char *initrd_filename,
... ...
hw/ppc_oldworld.c
  View file @b881c2c
... ... @@ -102,7 +102,6 @@ static int vga_osi_call (CPUState *env)
102 102  
103 103 static void ppc_heathrow_init (int ram_size, int vga_ram_size,
104 104 const char *boot_device, DisplayState *ds,
105   - const char **fd_filename, int snapshot,
106 105 const char *kernel_filename,
107 106 const char *kernel_cmdline,
108 107 const char *initrd_filename,
... ...
hw/ppc_prep.c
  View file @b881c2c
... ... @@ -531,9 +531,8 @@ CPUReadMemoryFunc *PPC_prep_io_read[] = {
531 531  
532 532 /* PowerPC PREP hardware initialisation */
533 533 static void ppc_prep_init (int ram_size, int vga_ram_size,
534   - const char *boot_device,
535   - DisplayState *ds, const char **fd_filename,
536   - int snapshot, const char *kernel_filename,
  534 + const char *boot_device, DisplayState *ds,
  535 + const char *kernel_filename,
537 536 const char *kernel_cmdline,
538 537 const char *initrd_filename,
539 538 const char *cpu_model)
... ...
hw/r2d.c
  View file @b881c2c
... ... @@ -30,8 +30,8 @@
30 30 #define SDRAM_BASE 0x0c000000 /* Physical location of SDRAM: Area 3 */
31 31 #define SDRAM_SIZE 0x04000000
32 32  
33   -static void r2d_init(int ram_size, int vga_ram_size, const char *boot_device,
34   - DisplayState * ds, const char **fd_filename, int snapshot,
  33 +static void r2d_init(int ram_size, int vga_ram_size,
  34 + const char *boot_device, DisplayState * ds,
35 35 const char *kernel_filename, const char *kernel_cmdline,
36 36 const char *initrd_filename, const char *cpu_model)
37 37 {
... ...
hw/realview.c
  View file @b881c2c
... ... @@ -20,7 +20,6 @@
20 20  
21 21 static void realview_init(int ram_size, int vga_ram_size,
22 22 const char *boot_device, DisplayState *ds,
23   - const char **fd_filename, int snapshot,
24 23 const char *kernel_filename, const char *kernel_cmdline,
25 24 const char *initrd_filename, const char *cpu_model)
26 25 {
... ...
hw/shix.c
  View file @b881c2c
... ... @@ -65,8 +65,8 @@ void vga_screen_dump(const char *filename)
65 65 /* XXXXX */
66 66 }
67 67  
68   -static void shix_init(int ram_size, int vga_ram_size, const char *boot_device,
69   - DisplayState * ds, const char **fd_filename, int snapshot,
  68 +static void shix_init(int ram_size, int vga_ram_size,
  69 + const char *boot_device, DisplayState * ds,
70 70 const char *kernel_filename, const char *kernel_cmdline,
71 71 const char *initrd_filename, const char *cpu_model)
72 72 {
... ...
hw/spitz.c
  View file @b881c2c
... ... @@ -1234,7 +1234,6 @@ static void spitz_common_init(int ram_size, int vga_ram_size,
1234 1234  
1235 1235 static void spitz_init(int ram_size, int vga_ram_size,
1236 1236 const char *boot_device, DisplayState *ds,
1237   - const char **fd_filename, int snapshot,
1238 1237 const char *kernel_filename, const char *kernel_cmdline,
1239 1238 const char *initrd_filename, const char *cpu_model)
1240 1239 {
... ... @@ -1244,7 +1243,6 @@ static void spitz_init(int ram_size, int vga_ram_size,
1244 1243  
1245 1244 static void borzoi_init(int ram_size, int vga_ram_size,
1246 1245 const char *boot_device, DisplayState *ds,
1247   - const char **fd_filename, int snapshot,
1248 1246 const char *kernel_filename, const char *kernel_cmdline,
1249 1247 const char *initrd_filename, const char *cpu_model)
1250 1248 {
... ... @@ -1254,7 +1252,6 @@ static void borzoi_init(int ram_size, int vga_ram_size,
1254 1252  
1255 1253 static void akita_init(int ram_size, int vga_ram_size,
1256 1254 const char *boot_device, DisplayState *ds,
1257   - const char **fd_filename, int snapshot,
1258 1255 const char *kernel_filename, const char *kernel_cmdline,
1259 1256 const char *initrd_filename, const char *cpu_model)
1260 1257 {
... ... @@ -1264,7 +1261,6 @@ static void akita_init(int ram_size, int vga_ram_size,
1264 1261  
1265 1262 static void terrier_init(int ram_size, int vga_ram_size,
1266 1263 const char *boot_device, DisplayState *ds,
1267   - const char **fd_filename, int snapshot,
1268 1264 const char *kernel_filename, const char *kernel_cmdline,
1269 1265 const char *initrd_filename, const char *cpu_model)
1270 1266 {
... ...
hw/stellaris.c
  View file @b881c2c
... ... @@ -1078,7 +1078,6 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,
1078 1078 /* FIXME: Figure out how to generate these from stellaris_boards. */
1079 1079 static void lm3s811evb_init(int ram_size, int vga_ram_size,
1080 1080 const char *boot_device, DisplayState *ds,
1081   - const char **fd_filename, int snapshot,
1082 1081 const char *kernel_filename, const char *kernel_cmdline,
1083 1082 const char *initrd_filename, const char *cpu_model)
1084 1083 {
... ... @@ -1087,7 +1086,6 @@ static void lm3s811evb_init(int ram_size, int vga_ram_size,
1087 1086  
1088 1087 static void lm3s6965evb_init(int ram_size, int vga_ram_size,
1089 1088 const char *boot_device, DisplayState *ds,
1090   - const char **fd_filename, int snapshot,
1091 1089 const char *kernel_filename, const char *kernel_cmdline,
1092 1090 const char *initrd_filename, const char *cpu_model)
1093 1091 {
... ...
hw/sun4m.c
  View file @b881c2c
... ... @@ -573,10 +573,10 @@ static void sun4m_common_init(int RAM_size, const char *boot_device, DisplayStat
573 573 }
574 574  
575 575 /* SPARCstation 5 hardware initialisation */
576   -static void ss5_init(int RAM_size, int vga_ram_size, const char *boot_device,
577   - DisplayState *ds, const char **fd_filename, int snapshot,
578   - const char *kernel_filename, const char *kernel_cmdline,
579   - const char *initrd_filename, const char *cpu_model)
  576 +static void ss5_init(int RAM_size, int vga_ram_size,
  577 + const char *boot_device, DisplayState *ds,
  578 + const char *kernel_filename, const char *kernel_cmdline,
  579 + const char *initrd_filename, const char *cpu_model)
580 580 {
581 581 if (cpu_model == NULL)
582 582 cpu_model = "Fujitsu MB86904";
... ... @@ -586,10 +586,10 @@ static void ss5_init(int RAM_size, int vga_ram_size, const char *boot_device,
586 586 }
587 587  
588 588 /* SPARCstation 10 hardware initialisation */
589   -static void ss10_init(int RAM_size, int vga_ram_size, const char *boot_device,
590   - DisplayState *ds, const char **fd_filename, int snapshot,
591   - const char *kernel_filename, const char *kernel_cmdline,
592   - const char *initrd_filename, const char *cpu_model)
  589 +static void ss10_init(int RAM_size, int vga_ram_size,
  590 + const char *boot_device, DisplayState *ds,
  591 + const char *kernel_filename, const char *kernel_cmdline,
  592 + const char *initrd_filename, const char *cpu_model)
593 593 {
594 594 if (cpu_model == NULL)
595 595 cpu_model = "TI SuperSparc II";
... ... @@ -599,8 +599,8 @@ static void ss10_init(int RAM_size, int vga_ram_size, const char *boot_device,
599 599 }
600 600  
601 601 /* SPARCserver 600MP hardware initialisation */
602   -static void ss600mp_init(int RAM_size, int vga_ram_size, const char *boot_device,
603   - DisplayState *ds, const char **fd_filename, int snapshot,
  602 +static void ss600mp_init(int RAM_size, int vga_ram_size,
  603 + const char *boot_device, DisplayState *ds,
604 604 const char *kernel_filename, const char *kernel_cmdline,
605 605 const char *initrd_filename, const char *cpu_model)
606 606 {
... ...
hw/sun4u.c
  View file @b881c2c
... ... @@ -226,10 +226,10 @@ static const int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
226 226 static fdctrl_t *floppy_controller;
227 227  
228 228 /* Sun4u hardware initialisation */
229   -static void sun4u_init(int ram_size, int vga_ram_size, const char *boot_devices,
230   - DisplayState *ds, const char **fd_filename, int snapshot,
231   - const char *kernel_filename, const char *kernel_cmdline,
232   - const char *initrd_filename, const char *cpu_model)
  229 +static void sun4u_init(int ram_size, int vga_ram_size,
  230 + const char *boot_devices, DisplayState *ds,
  231 + const char *kernel_filename, const char *kernel_cmdline,
  232 + const char *initrd_filename, const char *cpu_model)
233 233 {
234 234 CPUState *env;
235 235 char buf[1024];
... ...
hw/versatilepb.c
  View file @b881c2c
... ... @@ -159,7 +159,6 @@ static qemu_irq *vpb_sic_init(uint32_t base, qemu_irq *parent, int irq)
159 159  
160 160 static void versatile_init(int ram_size, int vga_ram_size,
161 161 const char *boot_device, DisplayState *ds,
162   - const char **fd_filename, int snapshot,
163 162 const char *kernel_filename, const char *kernel_cmdline,
164 163 const char *initrd_filename, const char *cpu_model,
165 164 int board_id)
... ... @@ -276,24 +275,24 @@ static void versatile_init(int ram_size, int vga_ram_size,
276 275 initrd_filename, board_id, 0x0);
277 276 }
278 277  
279   -static void vpb_init(int ram_size, int vga_ram_size, const char *boot_device,
280   - DisplayState *ds, const char **fd_filename, int snapshot,
  278 +static void vpb_init(int ram_size, int vga_ram_size,
  279 + const char *boot_device, DisplayState *ds,
281 280 const char *kernel_filename, const char *kernel_cmdline,
282 281 const char *initrd_filename, const char *cpu_model)
283 282 {
284   - versatile_init(ram_size, vga_ram_size, boot_device,
285   - ds, fd_filename, snapshot,
  283 + versatile_init(ram_size, vga_ram_size,
  284 + boot_device, ds,
286 285 kernel_filename, kernel_cmdline,
287 286 initrd_filename, cpu_model, 0x183);
288 287 }
289 288  
290   -static void vab_init(int ram_size, int vga_ram_size, const char *boot_device,
291   - DisplayState *ds, const char **fd_filename, int snapshot,
  289 +static void vab_init(int ram_size, int vga_ram_size,
  290 + const char *boot_device, DisplayState *ds,
292 291 const char *kernel_filename, const char *kernel_cmdline,
293 292 const char *initrd_filename, const char *cpu_model)
294 293 {
295   - versatile_init(ram_size, vga_ram_size, boot_device,
296   - ds, fd_filename, snapshot,
  294 + versatile_init(ram_size, vga_ram_size,
  295 + boot_device, ds,
297 296 kernel_filename, kernel_cmdline,
298 297 initrd_filename, cpu_model, 0x25e);
299 298 }
... ...
... ... @@ -8529,8 +8529,7 @@ int main(int argc, char **argv)
8529 8529 }
8530 8530 }
8531 8531  
8532   - machine->init(ram_size, vga_ram_size, boot_devices,
8533   - ds, fd_filename, snapshot,
  8532 + machine->init(ram_size, vga_ram_size, boot_devices, ds,
8534 8533 kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
8535 8534  
8536 8535 /* init USB devices */
... ...