From patchwork Tue Dec 8 08:33:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V9,09/20] pc: remove a global variable, floppy_controller. Date: Mon, 07 Dec 2009 22:33:28 -0000 From: Isaku Yamahata X-Patchwork-Id: 40594 Message-Id: <1260261219-16103-10-git-send-email-yamahata@valinux.co.jp> To: qemu-devel@nongnu.org, kraxel@redhat.com Cc: yamahata@valinux.co.jp Remove a global variable, floppy_controller. Since it is unnecessarily global, make it local and pass it as a function argument. Signed-off-by: Isaku Yamahata --- hw/pc.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index c728486..dcf7eeb 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -64,7 +64,6 @@ #define MAX_IDE_BUS 2 -static fdctrl_t *floppy_controller; static RTCState *rtc_state; typedef struct isa_irq_state { @@ -256,7 +255,8 @@ static int pc_boot_set(void *opaque, const char *boot_device) /* hd_table must contain 4 block drivers */ static void cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, - const char *boot_device, DriveInfo **hd_table) + const char *boot_device, DriveInfo **hd_table, + fdctrl_t *floppy_controller) { RTCState *s = rtc_state; int nbds, bds[3] = { 0, }; @@ -1005,6 +1005,7 @@ static void pc_init1(ram_addr_t ram_size, DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; DriveInfo *fd[MAX_FD]; void *fw_cfg; + fdctrl_t *floppy_controller; PITState *pit; if (ram_size >= 0xe0000000 ) { @@ -1215,7 +1216,8 @@ static void pc_init1(ram_addr_t ram_size, } floppy_controller = fdctrl_init_isa(fd); - cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd); + cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd, + floppy_controller); if (pci_enabled && usb_enabled) { usb_uhci_piix3_init(pci_bus, piix3_devfn + 2);