[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V8 08/18] pc: remove a global variable, floppy_contr
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH V8 08/18] pc: remove a global variable, floppy_controller. |
Date: |
Fri, 4 Dec 2009 14:50:55 +0900 |
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 <address@hidden>
---
hw/pc.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 2d9de6c..8ec85cb 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);
--
1.6.5.4
- [Qemu-devel] [PATCH V8 11/18] pc: make pc_init1() not refer ferr_irq directly., (continued)
- [Qemu-devel] [PATCH V8 11/18] pc: make pc_init1() not refer ferr_irq directly., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 02/18] acpi: split out apm register emulation from acpi.c, Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 05/18] acpi_piix4: remove unused variable in get_pmsts()., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 06/18] pc, i440fx: Make smm enable/disable function i440fx independent., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 18/18] pc_piix: initialize ioapic before use., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 03/18] acpi: add acpi constants from linux header files and use them., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 07/18] pc: make an unnecessary global variable, pit, local., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 14/18] pc: split out vga initialization from pc_init1() into pc_vga_init()., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 08/18] pc: remove a global variable, floppy_controller.,
Isaku Yamahata <=
- [Qemu-devel] [PATCH V8 13/18] pc: split out memory allocation from pc_init1() into pc_memory_init(), Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 17/18] pc: split out piix specific part from pc.c into pc_piix.c, Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 09/18] pc: remove a global variable, RTCState *rtc_state., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 15/18] pc: split out basic device init from pc_init1() into pc_basic_device_init(), Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 12/18] pc: split out cpu initialization from pc_init1() into pc_cpus_init()., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 04/18] acpi: split acpi.c into the common part and the piix4 part., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 16/18] pc: split out pci device init from pc_init1() into pc_pci_device_init(), Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 10/18] pc: introduce a function to allocate cpu irq., Isaku Yamahata, 2009/12/04