From patchwork Fri May 14 07:29:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 52570 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 BC537B7E8B for ; Fri, 14 May 2010 17:38:02 +1000 (EST) Received: from localhost ([127.0.0.1]:46388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCpS6-00006Z-9I for incoming@patchwork.ozlabs.org; Fri, 14 May 2010 03:36:58 -0400 Received: from [140.186.70.92] (port=33021 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCpOM-0006w5-E2 for qemu-devel@nongnu.org; Fri, 14 May 2010 03:33:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OCpNz-0002ea-MR for qemu-devel@nongnu.org; Fri, 14 May 2010 03:33:06 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:37502) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OCpNy-0002cD-SV for qemu-devel@nongnu.org; Fri, 14 May 2010 03:32:43 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 7D1671070F3; Fri, 14 May 2010 16:32:35 +0900 (JST) Received: (nullmailer pid 27990 invoked by uid 1000); Fri, 14 May 2010 07:29:25 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Fri, 14 May 2010 16:29:09 +0900 Message-Id: X-Mailer: git-send-email 1.6.6.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: blauwirbel@gmail.com, yamahata@valinux.co.jp, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 11/26] pc: make pc_init1() not refer ferr_irq directly. 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 By introducing a registering function, make pc_init1() not refer to ferr_irq directly in order to make ferr_irq piix independent. Later pc_init1() will be split out into another file keeping ferr_irq static. Signed-off-by: Isaku Yamahata Acked-by: Gerd Hoffmann --- hw/pc.c | 8 +++++++- hw/pc.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index fa11477..18c025b 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -102,6 +102,12 @@ static void ioport80_write(void *opaque, uint32_t addr, uint32_t data) /* MSDOS compatibility mode FPU exception support */ static qemu_irq ferr_irq; + +void pc_register_ferr_irq(qemu_irq irq) +{ + ferr_irq = irq; +} + /* XXX: add IGNNE support */ void cpu_set_ferr(CPUX86State *s) { @@ -950,7 +956,7 @@ static void pc_init1(ram_addr_t ram_size, } isa_bus_irqs(isa_irq); - ferr_irq = isa_reserve_irq(13); + pc_register_ferr_irq(isa_reserve_irq(13)); /* init basic PC hardware */ register_ioport_write(0x80, 1, 1, ioport80_write, NULL); diff --git a/hw/pc.h b/hw/pc.h index 77239a0..abf02de 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -77,6 +77,8 @@ void rtc_set_date(RTCState *s, const struct tm *tm); /* pc.c */ extern int fd_bootchk; +void pc_register_ferr_irq(qemu_irq irq); + void ioport_set_a20(int enable); int ioport_get_a20(void);