提交 01b9e8c1 编写于 作者: I Isaku Yamahata 提交者: Blue Swirl

pc: remove a global variable, floppy_controller.

Remove a global variable, floppy_controller.
Since it is unnecessarily global, make it local and pass it as
a function argument.
Signed-off-by: NIsaku Yamahata <yamahata@valinux.co.jp>
Acked-by: NGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
上级 57864959
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
#define MAX_IDE_BUS 2 #define MAX_IDE_BUS 2
static FDCtrl *floppy_controller;
static RTCState *rtc_state; static RTCState *rtc_state;
#define E820_NR_ENTRIES 16 #define E820_NR_ENTRIES 16
...@@ -273,7 +272,8 @@ static int pc_boot_set(void *opaque, const char *boot_device) ...@@ -273,7 +272,8 @@ static int pc_boot_set(void *opaque, const char *boot_device)
/* hd_table must contain 4 block drivers */ /* hd_table must contain 4 block drivers */
static void cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, 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; RTCState *s = rtc_state;
int val; int val;
...@@ -834,6 +834,7 @@ static void pc_init1(ram_addr_t ram_size, ...@@ -834,6 +834,7 @@ static void pc_init1(ram_addr_t ram_size,
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
DriveInfo *fd[MAX_FD]; DriveInfo *fd[MAX_FD];
void *fw_cfg; void *fw_cfg;
FDCtrl *floppy_controller;
PITState *pit; PITState *pit;
if (ram_size >= 0xe0000000 ) { if (ram_size >= 0xe0000000 ) {
...@@ -1035,7 +1036,8 @@ static void pc_init1(ram_addr_t ram_size, ...@@ -1035,7 +1036,8 @@ static void pc_init1(ram_addr_t ram_size,
} }
floppy_controller = fdctrl_init_isa(fd); 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) { if (pci_enabled && usb_enabled) {
usb_uhci_piix3_init(pci_bus, piix3_devfn + 2); usb_uhci_piix3_init(pci_bus, piix3_devfn + 2);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册