From: Laurent Vivier <Laurent.Vivier@bull.net>
To: qemu-devel@nongnu.org
Cc: Laurent.Vivier@bull.net
Subject: [Qemu-devel] [PATCH 4/7] remove fd_filename from the machine init interface
Date: Wed, 31 Oct 2007 16:51:56 +0100 [thread overview]
Message-ID: <1193845916426@bull.net> (raw)
In-Reply-To: <11938459144026@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
===================================================================
--- 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 @@
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);
Index: qemu/hw/an5206.c
===================================================================
--- 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. */
static void an5206_init(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)
{
Index: qemu/hw/etraxfs.c
===================================================================
--- 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 @@
static
void bareetraxfs_init (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)
{
Index: qemu/hw/integratorcp.c
===================================================================
--- 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 @@
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_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Index: qemu/hw/mcf5208.c
===================================================================
--- 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 @@
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_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Index: qemu/hw/mips_malta.c
===================================================================
--- 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 @@
static
void mips_malta_init (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)
{
Index: qemu/hw/mips_mipssim.c
===================================================================
--- 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 @@
static void
mips_mipssim_init (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)
{
Index: qemu/hw/palm.c
===================================================================
--- 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 @@
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
===================================================================
--- 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 @@
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 @@
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
===================================================================
--- 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
===================================================================
--- 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 @@
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
===================================================================
--- 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
static void r2d_init(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)
{
Index: qemu/hw/shix.c
===================================================================
--- 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 @@
}
static void shix_init(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)
{
Index: qemu/hw/spitz.c
===================================================================
--- 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 @@
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 @@
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 @@
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 @@
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
===================================================================
--- 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 @@
/* 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,
+ 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
===================================================================
--- 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 @@
static
void mips_pica61_init (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)
{
Index: qemu/hw/mips_r4k.c
===================================================================
--- 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 @@
static
void mips_r4k_init (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)
{
Index: qemu/hw/pc.c
===================================================================
--- 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 @@
/* 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,
+ DisplayState *ds, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename,
int pci_enabled)
@@ -949,29 +949,27 @@
}
static void pc_init_pci(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)
{
pc_init1(ram_size, vga_ram_size, boot_device,
- ds, fd_filename, snapshot,
+ ds, snapshot,
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,
+ 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
===================================================================
--- 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 @@
/* 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,
+ DisplayState *ds,
int snapshot, const char *kernel_filename,
const char *kernel_cmdline,
const char *initrd_filename,
Index: qemu/hw/realview.c
===================================================================
--- 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 @@
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_cmdline,
const char *initrd_filename, const char *cpu_model)
{
Index: qemu/hw/sun4m.c
===================================================================
--- 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 @@
/* 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,
+ DisplayState *ds, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
@@ -584,7 +584,7 @@
/* 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,
+ DisplayState *ds, int snapshot,
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-10-31 14:23:52.000000000 +0100
+++ qemu/hw/versatilepb.c 2007-10-31 14:55:34.000000000 +0100
@@ -153,7 +153,7 @@
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_cmdline,
const char *initrd_filename, const char *cpu_model,
int board_id)
@@ -268,23 +268,23 @@
}
static void vpb_init(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)
{
versatile_init(ram_size, vga_ram_size, boot_device,
- ds, fd_filename, snapshot,
+ ds, snapshot,
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,
+ DisplayState *ds, int snapshot,
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,
+ ds, snapshot,
kernel_filename, kernel_cmdline,
initrd_filename, cpu_model, 0x25e);
}
Index: qemu/vl.c
===================================================================
--- 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 @@
}
machine->init(ram_size, vga_ram_size, boot_device,
- ds, NULL, snapshot,
+ ds, snapshot,
kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
/* init USB devices */
next prev parent reply other threads:[~2007-10-31 15:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-31 15:51 [Qemu-devel] [PATCH 0/7] Add -disk interface Laurent Vivier
2007-10-31 15:51 ` [Qemu-devel] [PATCH 1/7] Add arg -disk to define new disk with more features Laurent Vivier
2007-10-31 15:51 ` [Qemu-devel] [PATCH 2/7] Add scsi support for the target PC Laurent Vivier
2007-10-31 15:51 ` [Qemu-devel] [PATCH 3/7] Add floppy support by -disk Laurent Vivier
2007-10-31 15:51 ` Laurent Vivier [this message]
2007-10-31 15:51 ` [Qemu-devel] [PATCH 5/7] Add parallel flash " Laurent Vivier
2007-10-31 15:51 ` [Qemu-devel] [PATCH 6/7] Add " Laurent Vivier
2007-10-31 15:51 ` [Qemu-devel] [PATCH 7/7] Add SecureDigital " Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1193845916426@bull.net \
--to=laurent.vivier@bull.net \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.