From 6f09e686f807611aa03a91e37e9fb5cfc5283703 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Fri, 14 May 2010 16:29:08 +0900 Subject: pc: introduce a function to allocate cpu irq. 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 Signed-off-by: Blue Swirl --- hw/pc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'hw/pc.c') diff --git a/hw/pc.c b/hw/pc.c index c88158ca2b..fa11477e15 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; -- cgit v1.2.3