From patchwork Wed Mar 16 09:29:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 87193 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 85478B6FF3 for ; Wed, 16 Mar 2011 20:38:59 +1100 (EST) Received: from localhost ([127.0.0.1]:47646 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PznBu-0001pJ-Ml for incoming@patchwork.ozlabs.org; Wed, 16 Mar 2011 05:38:54 -0400 Received: from [140.186.70.92] (port=34416 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pzn35-0006Et-1r for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:29:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pzn31-0006Ea-55 for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:29:46 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:37368) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pzn30-0006D8-Qr for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:29: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 B50EA1891F; Wed, 16 Mar 2011 18:29:41 +0900 (JST) Received: (nullmailer pid 18367 invoked by uid 1000); Wed, 16 Mar 2011 09:29:37 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2011 18:29:27 +0900 Message-Id: <112abfca62740f08dc597a8a7eefe99afdb4bb3c.1300266238.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.7.1.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) X-Received-From: 210.128.90.3 Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 16/26] pc, pc_piix: split out allocating isa irqs 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 Factor out the logic of allocating isa irqs. This simplifies the pc initialization and will reduce the code duplication of q35 pc initialization. Signed-off-by: Isaku Yamahata --- hw/pc.c | 16 ++++++++++++++-- hw/pc.h | 2 +- hw/pc_piix.c | 8 +------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 4d67d9f..39c7cf0 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1044,9 +1044,21 @@ void pc_memory_init(ram_addr_t ram_size, } } -qemu_irq *pc_allocate_cpu_irq(void) +qemu_irq *pc_isa_irq(IsaIrqState **isa_irq_state_p) { - return qemu_allocate_irqs(pic_irq_request, NULL, 1); + qemu_irq *cpu_irq; + qemu_irq *i8259; + IsaIrqState *isa_irq_state; + qemu_irq *isa_irq; + + cpu_irq = qemu_allocate_irqs(pic_irq_request, NULL, 1);; + i8259 = i8259_init(cpu_irq[0]); + isa_irq_state = qemu_mallocz(sizeof(*isa_irq_state)); + isa_irq_state->i8259 = i8259; + isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24); + + *isa_irq_state_p = isa_irq_state; + return isa_irq; } void pc_vga_init(PCIBus *pci_bus) diff --git a/hw/pc.h b/hw/pc.h index feb8a7a..0ee4b89 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -135,7 +135,7 @@ void pc_memory_init(ram_addr_t ram_size, const char *initrd_filename, ram_addr_t *below_4g_mem_size_p, ram_addr_t *above_4g_mem_size_p); -qemu_irq *pc_allocate_cpu_irq(void); +qemu_irq *pc_isa_irq(IsaIrqState **isa_irq_state_p); void pc_vga_init(PCIBus *pci_bus); void pc_basic_device_init(qemu_irq *isa_irq, ISADevice **rtc_state); diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 337f2ec..1ac69ff 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -76,9 +76,7 @@ static void pc_init1(ram_addr_t ram_size, PCIBus *pci_bus; PCII440FXState *i440fx_state; int piix3_devfn = -1; - qemu_irq *cpu_irq; qemu_irq *isa_irq; - qemu_irq *i8259; qemu_irq *cmos_s3; qemu_irq *smi_irq; IsaIrqState *isa_irq_state; @@ -96,14 +94,10 @@ static void pc_init1(ram_addr_t ram_size, pc_memory_init(ram_size, kernel_filename, kernel_cmdline, initrd_filename, &below_4g_mem_size, &above_4g_mem_size); - 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; + isa_irq = pc_isa_irq(&isa_irq_state); if (pci_enabled) { ioapic_init(isa_irq_state); } - isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24); if (pci_enabled) { pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, isa_irq, ram_size);