From patchwork Fri May 14 07:29:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [10/26] pc: introduce a function to allocate cpu irq. Date: Thu, 13 May 2010 21:29:08 -0000 From: Isaku Yamahata X-Patchwork-Id: 52577 Message-Id: <71224121762a835bf0b3fbfea50839edecc75057.1273821065.git.yamahata@valinux.co.jp> To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, yamahata@valinux.co.jp, kraxel@redhat.com 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;