From patchwork Wed Jan 6 02:39:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 42253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E01B2B6EEE for ; Wed, 6 Jan 2010 13:51:38 +1100 (EST) Received: from localhost ([127.0.0.1]:36884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSLzi-0007m4-Uu for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2010 21:51:35 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSLod-0004OT-VC for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:40:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSLoY-0004KB-MU for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:40:07 -0500 Received: from [199.232.76.173] (port=54794 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSLoU-0004Im-En for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:39:58 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:60932) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSLoT-0003kz-1w for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:39:58 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 20EE1182A3; Wed, 6 Jan 2010 11:39:46 +0900 (JST) Received: (nullmailer pid 28744 invoked by uid 1000); Wed, 06 Jan 2010 02:39:51 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kraxel@redhat.com, aurelien@aurel32.net Date: Wed, 6 Jan 2010 11:39:33 +0900 Message-Id: <1262745591-28697-10-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1262745591-28697-1-git-send-email-yamahata@valinux.co.jp> References: <1262745591-28697-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V12 09/27] pc: remove a global variable, floppy_controller. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Acked-by: Gerd Hoffmann --- hw/pc.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 0dee9d7..f5eb026 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, }; @@ -1016,6 +1016,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 ) { @@ -1226,7 +1227,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);