[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/18] pc.c: remove a global variable, floppy_contro
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH 09/18] pc.c: remove a global variable, floppy_controller. |
Date: |
Thu, 18 Jun 2009 19:57:08 +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 16592e8..9055c0d 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -54,7 +54,6 @@
#define MAX_IDE_BUS 2
-static fdctrl_t *floppy_controller;
static RTCState *rtc_state;
typedef struct rom_reset_data {
@@ -264,7 +263,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, BlockDriverState **hd_table)
+ const char *boot_device, BlockDriverState **hd_table,
+ fdctrl_t *floppy_controller)
{
RTCState *s = rtc_state;
int nbds, bds[3] = { 0, };
@@ -866,6 +866,7 @@ static void pc_init1(ram_addr_t ram_size,
BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
BlockDriverState *fd[MAX_FD];
int using_vga = cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled;
+ fdctrl_t *floppy_controller;
PITState *pit;
IOAPICState *ioapic = NULL;
@@ -1117,7 +1118,8 @@ static void pc_init1(ram_addr_t ram_size,
}
floppy_controller = fdctrl_init(i8259[6], 2, 0, 0x3f0, 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.0.2
- [Qemu-devel] [PATCH 00/18] split out piix specific part from pc emulator., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 07/18] pc.c: Make smm enable/disable function i440fx independent., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 08/18] pc.c: remove unnecessary global variables, pit and ioapic.., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 04/18] acpi.c: make qemu_system_powerdown() piix independent., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 02/18] acpi.c: split out pc smbus routines from acpi.c into pc_smbus.c, Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 01/18] acpi.c: make qemu_system_device_hot_add piix independent., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 05/18] acpi: add acpi constants from linux header files and use them., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 03/18] acpi.c: split out apm register emulation., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 09/18] pc.c: remove a global variable, floppy_controller.,
Isaku Yamahata <=
- [Qemu-devel] [PATCH 13/18] pc.c: split out cpu initialization from pc_init1() into pc_cpus_init()., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 11/18] pc.c: introduce a function to allocate cpu irq., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 14/18] pc.c: split out memory allocation from pc_init1() into pc_memory_init(), Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 06/18] acpi.c: split acpi.c into the common part and the piix4 part., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 10/18] pc.c: remove a global variable, RTCState *rtc_state., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 18/18] pc.c: split out piix specific part from pc.c into pc_piix.c, Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 17/18] pc.c: split out pci device init from pc_init1() into pc_pci_device_init(), Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 15/18] pc.c: split out vga initialization from pc_init1() into pc_vga_init()., Isaku Yamahata, 2009/06/18
- [Qemu-devel] [PATCH 12/18] pc.c: make pc_init1() not refer ferr_irq directly., Isaku Yamahata, 2009/06/18