From patchwork Fri May 14 07:29:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 52577 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 CEA9EB7E75 for ; Fri, 14 May 2010 17:49:04 +1000 (EST) Received: from localhost ([127.0.0.1]:35060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCpdi-0004mt-BA for incoming@patchwork.ozlabs.org; Fri, 14 May 2010 03:48:58 -0400 Received: from [140.186.70.92] (port=39132 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCpOT-0006zb-Mq for qemu-devel@nongnu.org; Fri, 14 May 2010 03:33:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OCpO3-0002g3-GI for qemu-devel@nongnu.org; Fri, 14 May 2010 03:33:13 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:37526) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OCpO0-0002ek-8M for qemu-devel@nongnu.org; Fri, 14 May 2010 03:32:44 -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 59CA1107139; Fri, 14 May 2010 16:32:37 +0900 (JST) Received: (nullmailer pid 27988 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:08 +0900 Message-Id: <71224121762a835bf0b3fbfea50839edecc75057.1273821065.git.yamahata@valinux.co.jp> 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 10/26] pc: introduce a function to allocate cpu irq. 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 Introduce a function, pc_allocate_cpu_irq(), to allocate cpu irq in order to make pic_irq_request() piix independent. Later piix code will be split out to another file keeping pic_irq_request() static. Signed-off-by: Isaku Yamahata Acked-by: Gerd Hoffmann --- hw/pc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index c88158c..fa11477 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -805,6 +805,11 @@ static CPUState *pc_new_cpu(const char *cpu_model) return env; } +static qemu_irq *pc_allocate_cpu_irq(void) +{ + return qemu_allocate_irqs(pic_irq_request, NULL, 1); +} + /* PC hardware initialisation */ static void pc_init1(ram_addr_t ram_size, const char *boot_device, @@ -928,7 +933,7 @@ static void pc_init1(ram_addr_t ram_size, rom_add_option(option_rom[i]); } - cpu_irq = qemu_allocate_irqs(pic_irq_request, NULL, 1); + cpu_irq = pc_allocate_cpu_irq(); i8259 = i8259_init(cpu_irq[0]); isa_irq_state = qemu_mallocz(sizeof(*isa_irq_state)); isa_irq_state->i8259 = i8259;