From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1InFrn-0003zB-K3 for qemu-devel@nongnu.org; Wed, 31 Oct 2007 11:52:27 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1InFrm-0003yn-PA for qemu-devel@nongnu.org; Wed, 31 Oct 2007 11:52:27 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1InFrm-0003yh-Lm for qemu-devel@nongnu.org; Wed, 31 Oct 2007 11:52:26 -0400 Received: from ecfrec.frec.bull.fr ([129.183.4.8]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1InFrl-00044y-90 for qemu-devel@nongnu.org; Wed, 31 Oct 2007 11:52:26 -0400 Received: from localhost (localhost [127.0.0.1]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id 167FB19D97B for ; Wed, 31 Oct 2007 16:52:18 +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 25387-06 for ; Wed, 31 Oct 2007 16:52:14 +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 A1F2219D94F for ; Wed, 31 Oct 2007 16:52:13 +0100 (CET) In-Reply-To: <11938459144026@bull.net> Date: Wed, 31 Oct 2007 16:51:56 +0100 Message-Id: <1193845916426@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 4/7] remove fd_filename from the machine init interface Reply-To: Laurent Vivier , qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent.Vivier@bull.net As the parameter fd_filename seems unused and as we can't provide it anymore using the "-disk" interface, this patch removes it. -- hw/an5206.c | 2 +- hw/etraxfs.c | 2 +- hw/integratorcp.c | 2 +- hw/mcf5208.c | 2 +- hw/mips_malta.c | 2 +- hw/mips_mipssim.c | 2 +- hw/mips_pica61.c | 2 +- hw/mips_r4k.c | 2 +- hw/palm.c | 2 +- hw/pc.c | 12 +++++------- hw/ppc405_boards.c | 4 ++-- hw/ppc_chrp.c | 2 +- hw/ppc_oldworld.c | 2 +- hw/ppc_prep.c | 2 +- hw/r2d.c | 2 +- hw/realview.c | 2 +- hw/shix.c | 2 +- hw/spitz.c | 8 ++++---- hw/sun4m.c | 4 ++-- hw/sun4u.c | 2 +- hw/versatilepb.c | 10 +++++----- vl.c | 2 +- vl.h | 2 +- 23 files changed, 36 insertions(+), 38 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-10-31 14:23:52.000000000 +0100 +++ qemu/vl.h 2007-10-31 14:51:08.000000000 +0100 @@ -732,7 +732,7 @@ =20 typedef void QEMUMachineInitFunc(int ram_size, int vga_ram_size, const char *boot_device, - DisplayState *ds, const char **fd_filename, int snapshot, + DisplayState *ds, int snapshot, 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/an5206.c 2007-10-31 14:51:40.000000000 +0100 @@ -28,7 +28,7 @@ /* 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, + DisplayState *ds, int snapshot, 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/etraxfs.c 2007-10-31 14:51:50.000000000 +0100 @@ -108,7 +108,7 @@ =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, + DisplayState *ds, int snapshot, 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/integratorcp.c 2007-10-31 14:52:07.000000000 +0100 @@ -464,7 +464,7 @@ =20 static void integratorcp_init(int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, - const char **fd_filename, int snapshot, + 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/mcf5208.c 2007-10-31 14:52:14.000000000 +0100 @@ -199,7 +199,7 @@ =20 static void mcf5208evb_init(int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, - const char **fd_filename, int snapshot, + 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/mips_malta.c 2007-10-31 14:52:27.000000000 +0100 @@ -741,7 +741,7 @@ =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, + DisplayState *ds, int snapshot, 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/mips_mipssim.c 2007-10-31 14:52:35.000000000 +0100 @@ -75,7 +75,7 @@ =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, + DisplayState *ds, int snapshot, 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/palm.c 2007-10-31 14:53:01.000000000 +0100 @@ -117,7 +117,7 @@ =20 static void palmte_init(int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, - const char **fd_filename, int snapshot, + 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/ppc405_boards.c 2007-10-31 14:53:42.000000000 +0100 @@ -173,7 +173,7 @@ =20 static void ref405ep_init (int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, - const char **fd_filename, int snapshot, + int snapshot, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, @@ -499,7 +499,7 @@ =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, + 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/ppc_chrp.c 2007-10-31 14:53:49.000000000 +0100 @@ -50,7 +50,7 @@ /* 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, + 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/ppc_oldworld.c 2007-10-31 14:53:57.000000000 +0100 @@ -94,7 +94,7 @@ =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, + 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/r2d.c 2007-10-31 14:54:11.000000000 +0100 @@ -28,7 +28,7 @@ #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, + DisplayState * ds, int snapshot, 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/shix.c 2007-10-31 14:54:27.000000000 +0100 @@ -63,7 +63,7 @@ } =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, + DisplayState * ds, int snapshot, 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/spitz.c 2007-10-31 14:54:50.000000000 +0100 @@ -1230,7 +1230,7 @@ =20 static void spitz_init(int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, - const char **fd_filename, int snapshot, + int snapshot, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { @@ -1240,7 +1240,7 @@ =20 static void borzoi_init(int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, - const char **fd_filename, int snapshot, + int snapshot, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { @@ -1250,7 +1250,7 @@ =20 static void akita_init(int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, - const char **fd_filename, int snapshot, + int snapshot, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { @@ -1260,7 +1260,7 @@ =20 static void terrier_init(int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, - const char **fd_filename, int snapshot, + 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-10-31 14:12:40.000000000 +0100 +++ qemu/hw/sun4u.c 2007-10-31 14:55:12.000000000 +0100 @@ -332,7 +332,7 @@ =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, + DisplayState *ds, int snapshot, 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-10-31 14:13:20.000000000 +0100 +++ qemu/hw/mips_pica61.c 2007-10-31 14:52:42.000000000 +0100 @@ -56,7 +56,7 @@ =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, + DisplayState *ds, int snapshot, 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-10-31 14:13:20.000000000 +0100 +++ qemu/hw/mips_r4k.c 2007-10-31 14:52:53.000000000 +0100 @@ -138,7 +138,7 @@ =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, + DisplayState *ds, int snapshot, 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-10-31 14:23:52.000000000 +0100 +++ qemu/hw/pc.c 2007-10-31 14:53:25.000000000 +0100 @@ -669,7 +669,7 @@ =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, + DisplayState *ds, int snapshot, const char *kernel_filename, const char *kernel_cmdli= ne, const char *initrd_filename, int pci_enabled) @@ -949,29 +949,27 @@ } =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, + DisplayState *ds, int snapshot, 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, + ds, snapshot, kernel_filename, kernel_cmdline, initrd_filename, 1); } =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, + DisplayState *ds, int snapshot, 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, + ds, snapshot, kernel_filename, kernel_cmdline, initrd_filename, 0); } 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-10-31 14:13:20.000000000 +0100 +++ qemu/hw/ppc_prep.c 2007-10-31 14:54:03.000000000 +0100 @@ -522,7 +522,7 @@ =20 /* PowerPC PREP hardware initialisation */ static void ppc_prep_init (int ram_size, int vga_ram_size, const char *boo= t_device, - DisplayState *ds, const char **fd_filename, + DisplayState *ds, int snapshot, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, 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-10-31 14:23:52.000000000 +0100 +++ qemu/hw/realview.c 2007-10-31 14:54:19.000000000 +0100 @@ -14,7 +14,7 @@ =20 static void realview_init(int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, - const char **fd_filename, int snapshot, + 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-10-31 14:23:52.000000000 +0100 +++ qemu/hw/sun4m.c 2007-10-31 14:55:03.000000000 +0100 @@ -571,7 +571,7 @@ =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, + DisplayState *ds, int snapshot, const char *kernel_filename, const char *kernel_cmd= line, const char *initrd_filename, const char *cpu_model) { @@ -584,7 +584,7 @@ =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, + DisplayState *ds, int snapshot, 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-10-31 14:23:52.000000000 +0100 +++ qemu/hw/versatilepb.c 2007-10-31 14:55:34.000000000 +0100 @@ -153,7 +153,7 @@ =20 static void versatile_init(int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, - const char **fd_filename, int snapshot, + int snapshot, const char *kernel_filename, const char *kernel_cmdli= ne, const char *initrd_filename, const char *cpu_model, int board_id) @@ -268,23 +268,23 @@ } =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, + DisplayState *ds, int snapshot, 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, + ds, snapshot, 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, + DisplayState *ds, int snapshot, 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, + ds, snapshot, 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-10-31 14:46:45.000000000 +0100 +++ qemu/vl.c 2007-10-31 14:49:59.000000000 +0100 @@ -8754,7 +8754,7 @@ } =20 machine->init(ram_size, vga_ram_size, boot_device, - ds, NULL, snapshot, + ds, snapshot, kernel_filename, kernel_cmdline, initrd_filename, cpu_mo= del); =20 /* init USB devices */