Patchwork [08/26] pc: remove a global variable, floppy_controller.

login
register
mail settings
Submitter Isaku Yamahata
Date May 14, 2010, 7:29 a.m.
Message ID <06033b8c91d840d2be337c5835b031d3be6f090d.1273821065.git.yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/52579/
State New
Headers show

Comments

Isaku Yamahata - May 14, 2010, 7:29 a.m.
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 <yamahata@valinux.co.jp>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/pc.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/pc.c b/hw/pc.c
index b23684e..3b6da4a 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -65,7 +65,6 @@ 
 
 #define MAX_IDE_BUS 2
 
-static FDCtrl *floppy_controller;
 static RTCState *rtc_state;
 
 #define E820_NR_ENTRIES		16
@@ -273,7 +272,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 *floppy_controller)
 {
     RTCState *s = rtc_state;
     int val;
@@ -834,6 +834,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 *floppy_controller;
     PITState *pit;
 
     if (ram_size >= 0xe0000000 ) {
@@ -1035,7 +1036,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);