From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=35534 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pke2U-00022o-BX for qemu-devel@nongnu.org; Wed, 02 Feb 2011 09:50:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pke2D-0006Re-0f for qemu-devel@nongnu.org; Wed, 02 Feb 2011 09:50:31 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:26334) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pke2C-0006RN-TE for qemu-devel@nongnu.org; Wed, 02 Feb 2011 09:50:16 -0500 From: anthony.perard@citrix.com Date: Wed, 2 Feb 2011 14:49:25 +0000 Message-Id: <1296658172-16609-9-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1296658172-16609-1-git-send-email-anthony.perard@citrix.com> References: <1296658172-16609-1-git-send-email-anthony.perard@citrix.com> Subject: [Qemu-devel] [PATCH V10 08/15] xen: Introduce Xen Interrupt Controller List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel 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 765877c..27d9030 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -98,8 +98,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 2a53f8b..37d7b99 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); + void pci_xen_platform_init(PCIBus *bus); int xen_init(int smp_cpus); diff --git a/xen-all.c b/xen-all.c index 123decb..73149f2 100644 --- a/xen-all.c +++ b/xen-all.c @@ -42,6 +42,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(int smp_cpus) diff --git a/xen-stub.c b/xen-stub.c index ba95537..bc2ae12 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -24,6 +24,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; +} + void pci_xen_platform_init(PCIBus *bus) { } -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: anthony.perard@citrix.com Subject: [PATCH V10 08/15] xen: Introduce Xen Interrupt Controller Date: Wed, 2 Feb 2011 14:49:25 +0000 Message-ID: <1296658172-16609-9-git-send-email-anthony.perard@citrix.com> References: <1296658172-16609-1-git-send-email-anthony.perard@citrix.com> Return-path: In-Reply-To: <1296658172-16609-1-git-send-email-anthony.perard@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: QEMU-devel Cc: Anthony PERARD , Xen Devel , Anthony Liguori , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org 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 765877c..27d9030 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -98,8 +98,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 2a53f8b..37d7b99 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); + void pci_xen_platform_init(PCIBus *bus); int xen_init(int smp_cpus); diff --git a/xen-all.c b/xen-all.c index 123decb..73149f2 100644 --- a/xen-all.c +++ b/xen-all.c @@ -42,6 +42,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(int smp_cpus) diff --git a/xen-stub.c b/xen-stub.c index ba95537..bc2ae12 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -24,6 +24,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; +} + void pci_xen_platform_init(PCIBus *bus) { } -- 1.7.1