From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Irarn-0006OA-Nh for qemu-devel@nongnu.org; Mon, 12 Nov 2007 10:06:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Irarm-0006Nt-R2 for qemu-devel@nongnu.org; Mon, 12 Nov 2007 10:06:23 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Irarm-0006Nq-Nc for qemu-devel@nongnu.org; Mon, 12 Nov 2007 10:06:22 -0500 Received: from ecfrec.frec.bull.fr ([129.183.4.8]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Irarl-0001cM-52 for qemu-devel@nongnu.org; Mon, 12 Nov 2007 10:06:22 -0500 Received: from localhost (localhost [127.0.0.1]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id DBED119D950 for ; Mon, 12 Nov 2007 16:05:41 +0100 (CET) Received: from ecfrec.frec.bull.fr ([127.0.0.1]) by localhost (ecfrec.frec.bull.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 19810-02 for ; Mon, 12 Nov 2007 16:05:38 +0100 (CET) Received: from ecn002.frec.bull.fr (ecn002.frec.bull.fr [129.183.4.6]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id 8C27C19D94E for ; Mon, 12 Nov 2007 16:05:37 +0100 (CET) In-Reply-To: <1194879921645@bull.net> Date: Mon, 12 Nov 2007 16:05:21 +0100 Message-Id: <1194879921937@bull.net> Mime-Version: 1.0 From: Laurent Vivier Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="iso-8859-1" Subject: [Qemu-devel] [PATCH 1/2][UPDATE] remove unused parameters from QEMUMachineInitFunc Reply-To: Laurent Vivier , qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org 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/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/sun4m.c | 8 ++++---- hw/sun4u.c | 4 ++-- hw/versatilepb.c | 17 ++++++++--------- vl.c | 3 +-- vl.h | 3 +-- 23 files changed, 42 insertions(+), 62 deletions(-) Index: qemu/vl.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/vl.h 2007-11-12 14:59:25.000000000 +0100 +++ qemu/vl.h 2007-11-12 14:59:27.000000000 +0100 @@ -582,8 +582,7 @@ extern uint8_t _translate_keycode(const=20 #ifdef NEED_CPU_H =20 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); =20 Index: qemu/hw/an5206.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/an5206.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/an5206.c 2007-11-12 14:59:27.000000000 +0100 @@ -27,8 +27,8 @@ void DMA_run (void) =20 /* Board init. */ =20 -static void an5206_init(int ram_size, int vga_ram_size, const char *boot_d= evice, - DisplayState *ds, const char **fd_filename, int snaps= hot, +static void an5206_init(int ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmdli= ne, const char *initrd_filename, const char *cpu_model) { Index: qemu/hw/etraxfs.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/etraxfs.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/etraxfs.c 2007-11-12 14:59:27.000000000 +0100 @@ -107,8 +107,8 @@ static void dummy_cpu_set_irq(void *opaq } =20 static -void bareetraxfs_init (int ram_size, int vga_ram_size, const char *boot_de= vice, - DisplayState *ds, const char **fd_filename, int sna= pshot, +void bareetraxfs_init (int ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmd= line, const char *initrd_filename, const char *cpu_model) { Index: qemu/hw/integratorcp.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/integratorcp.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/integratorcp.c 2007-11-12 14:59:27.000000000 +0100 @@ -466,7 +466,6 @@ static void icp_control_init(uint32_t ba =20 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_cmdli= ne, const char *initrd_filename, const char *cpu_model) { Index: qemu/hw/mcf5208.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/mcf5208.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/mcf5208.c 2007-11-12 14:59:27.000000000 +0100 @@ -199,7 +199,6 @@ static void mcf5208_sys_init(qemu_irq *p =20 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_cmdli= ne, const char *initrd_filename, const char *cpu_model) { Index: qemu/hw/mips_malta.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/mips_malta.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/mips_malta.c 2007-11-12 14:59:27.000000000 +0100 @@ -746,8 +746,8 @@ static void main_cpu_reset(void *opaque) } =20 static -void mips_malta_init (int ram_size, int vga_ram_size, const char *boot_dev= ice, - DisplayState *ds, const char **fd_filename, int snap= shot, +void mips_malta_init (int ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmdl= ine, const char *initrd_filename, const char *cpu_model) { Index: qemu/hw/mips_mipssim.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/mips_mipssim.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/mips_mipssim.c 2007-11-12 14:59:27.000000000 +0100 @@ -100,8 +100,8 @@ static void main_cpu_reset(void *opaque) } =20 static void -mips_mipssim_init (int ram_size, int vga_ram_size, const char *boot_device, - DisplayState *ds, const char **fd_filename, int snapsho= t, +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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/palm.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/palm.c 2007-11-12 14:59:27.000000000 +0100 @@ -179,7 +179,6 @@ static void palmte_gpio_setup(struct oma =20 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/ppc405_boards.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/ppc405_boards.c 2007-11-12 14:59:27.000000000 +0100 @@ -173,7 +173,6 @@ static void ref405ep_fpga_init (uint32_t =20 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 =20 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/ppc_chrp.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/ppc_chrp.c 2007-11-12 14:59:27.000000000 +0100 @@ -50,7 +50,6 @@ static CPUReadMemoryFunc *unin_read[] =3D=20 /* 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/ppc_oldworld.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/ppc_oldworld.c 2007-11-12 14:59:27.000000000 +0100 @@ -94,7 +94,6 @@ static int vga_osi_call (CPUState *env) =20 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/r2d.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/r2d.c 2007-11-12 14:59:27.000000000 +0100 @@ -27,8 +27,8 @@ #define SDRAM_BASE 0x0c000000 /* Physical location of SDRAM: Area 3 */ #define SDRAM_SIZE 0x04000000 =20 -static void r2d_init(int ram_size, int vga_ram_size, const char *boot_devi= ce, - 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/shix.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/shix.c 2007-11-12 14:59:27.000000000 +0100 @@ -62,8 +62,8 @@ void vga_screen_dump(const char *filenam /* XXXXX */ } =20 -static void shix_init(int ram_size, int vga_ram_size, const char *boot_dev= ice, - 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/spitz.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/spitz.c 2007-11-12 14:59:27.000000000 +0100 @@ -1234,7 +1234,6 @@ static void spitz_common_init(int ram_si =20 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 =20 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 =20 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 =20 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/sun4u.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/sun4u.c 2007-11-12 14:59:27.000000000 +0100 @@ -306,8 +306,8 @@ static const int parallel_irq[MAX_PARALL static fdctrl_t *floppy_controller; =20 /* Sun4u hardware initialisation */ -static void sun4u_init(int ram_size, int vga_ram_size, const char *boot_de= vice, - 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/mips_pica61.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/mips_pica61.c 2007-11-12 14:59:27.000000000 +0100 @@ -54,8 +54,8 @@ static void main_cpu_reset(void *opaque) } =20 static -void mips_pica61_init (int ram_size, int vga_ram_size, const char *boot_de= vice, - DisplayState *ds, const char **fd_filename, int snapsh= ot, +void mips_pica61_init (int ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmdlin= e, const char *initrd_filename, const char *cpu_model) { Index: qemu/hw/mips_r4k.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/mips_r4k.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/mips_r4k.c 2007-11-12 14:59:27.000000000 +0100 @@ -137,8 +137,8 @@ static void main_cpu_reset(void *opaque) } =20 static -void mips_r4k_init (int ram_size, int vga_ram_size, const char *boot_devic= e, - DisplayState *ds, const char **fd_filename, int snapsh= ot, +void mips_r4k_init (int ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmdlin= e, const char *initrd_filename, const char *cpu_model) { Index: qemu/hw/pc.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/pc.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/pc.c 2007-11-12 14:59:27.000000000 +0100 @@ -684,8 +684,8 @@ static void pc_init_ne2k_isa(NICInfo *nd } =20 /* PC hardware initialisation */ -static void pc_init1(int ram_size, int vga_ram_size, const char *boot_devi= ce, - DisplayState *ds, const char **fd_filename, int snaps= hot, +static void pc_init1(int ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmdli= ne, 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 } =20 -static void pc_init_pci(int ram_size, int vga_ram_size, const char *boot_d= evice, - 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); } =20 -static void pc_init_isa(int ram_size, int vga_ram_size, const char *boot_d= evice, - 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/ppc_prep.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/ppc_prep.c 2007-11-12 14:59:27.000000000 +0100 @@ -522,9 +522,8 @@ CPUReadMemoryFunc *PPC_prep_io_read[] =3D=20 =20 /* 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/realview.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/realview.c 2007-11-12 14:59:27.000000000 +0100 @@ -14,7 +14,6 @@ =20 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_cmdli= ne, const char *initrd_filename, const char *cpu_model) { Index: qemu/hw/sun4m.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/sun4m.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/sun4m.c 2007-11-12 14:59:27.000000000 +0100 @@ -603,8 +603,8 @@ static void sun4m_common_init(int RAM_si } =20 /* SPARCstation 5 hardware initialisation */ -static void ss5_init(int RAM_size, int vga_ram_size, const char *boot_devi= ce, - DisplayState *ds, const char **fd_filename, int sna= pshot, +static void ss5_init(int RAM_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmd= line, const char *initrd_filename, const char *cpu_model) { @@ -616,8 +616,8 @@ static void ss5_init(int RAM_size, int v } =20 /* SPARCstation 10 hardware initialisation */ -static void ss10_init(int RAM_size, int vga_ram_size, const char *boot_dev= ice, - DisplayState *ds, const char **fd_filename, in= t snapshot, +static void ss10_init(int RAM_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kerne= l_cmdline, const char *initrd_filename, const char *cpu_m= odel) { Index: qemu/hw/versatilepb.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/hw/versatilepb.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/hw/versatilepb.c 2007-11-12 14:59:27.000000000 +0100 @@ -153,7 +153,6 @@ static qemu_irq *vpb_sic_init(uint32_t b =20 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_cmdli= ne, 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); } =20 -static void vpb_init(int ram_size, int vga_ram_size, const char *boot_devi= ce, - DisplayState *ds, const char **fd_filename, int snaps= hot, +static void vpb_init(int ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmdli= ne, 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); } =20 -static void vab_init(int ram_size, int vga_ram_size, const char *boot_devi= ce, - DisplayState *ds, const char **fd_filename, int snaps= hot, +static void vab_init(int ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmdli= ne, 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu.orig/vl.c 2007-11-12 14:59:25.000000000 +0100 +++ qemu/vl.c 2007-11-12 14:59:27.000000000 +0100 @@ -8511,8 +8511,7 @@ int main(int argc, char **argv) } } =20 - 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_mo= del); =20 /* init USB devices */