From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57035 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q4dfB-0007Pr-FE for qemu-devel@nongnu.org; Tue, 29 Mar 2011 14:29:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q4df8-0003jE-CD for qemu-devel@nongnu.org; Tue, 29 Mar 2011 14:29:07 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:7014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q4df8-0003gw-4f for qemu-devel@nongnu.org; Tue, 29 Mar 2011 14:29:06 -0400 From: anthony.perard@citrix.com Date: Tue, 29 Mar 2011 19:28:01 +0100 Message-Id: <1301423290-12443-9-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1301423290-12443-1-git-send-email-anthony.perard@citrix.com> References: <1301423290-12443-1-git-send-email-anthony.perard@citrix.com> Subject: [Qemu-devel] [PATCH V12 08/17] xen: Introduce Xen Interrupt Controller List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel , Anthony Liguori , Alexander Graf Cc: Anthony PERARD , Xen Devel , Stefano Stabellini From: Anthony PERARD Every set_irq call makes a Xen hypercall. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini --- hw/pc_piix.c | 8 ++++++-- hw/xen.h | 2 ++ xen-all.c | 12 ++++++++++++ xen-stub.c | 5 +++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index b9b99d2..7da166d 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -99,8 +99,12 @@ 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]); + if (!xen_enabled()) { + cpu_irq = pc_allocate_cpu_irq(); + i8259 = i8259_init(cpu_irq[0]); + } else { + i8259 = xen_interrupt_controller_init(); + } isa_irq_state = qemu_mallocz(sizeof(*isa_irq_state)); isa_irq_state->i8259 = i8259; if (pci_enabled) { diff --git a/hw/xen.h b/hw/xen.h index 620827d..63d953f 100644 --- a/hw/xen.h +++ b/hw/xen.h @@ -35,6 +35,8 @@ int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num); void xen_piix3_set_irq(void *opaque, int irq_num, int level); void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len); +qemu_irq *xen_interrupt_controller_init(void); + int xen_init(void); #if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400 diff --git a/xen-all.c b/xen-all.c index 0bc0978..22bd413 100644 --- a/xen-all.c +++ b/xen-all.c @@ -40,6 +40,18 @@ void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len) } } +/* Xen Interrupt Controller */ + +static void xen_set_irq(void *opaque, int irq, int level) +{ + xc_hvm_set_isa_irq_level(xen_xc, xen_domid, irq, level); +} + +qemu_irq *xen_interrupt_controller_init(void) +{ + return qemu_allocate_irqs(xen_set_irq, NULL, 16); +} + /* Initialise Xen */ int xen_init(void) diff --git a/xen-stub.c b/xen-stub.c index dc90f10..3a8449c 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -22,6 +22,11 @@ void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len) { } +qemu_irq *xen_interrupt_controller_init(void) +{ + return NULL; +} + int xen_init(void) { return -ENOSYS; -- 1.7.2.3