From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37120 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwYvm-0006Pk-O4 for qemu-devel@nongnu.org; Fri, 17 Sep 2010 07:16:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OwYvk-00082q-Ov for qemu-devel@nongnu.org; Fri, 17 Sep 2010 07:16:38 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:45944) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OwYvk-00081M-Lc for qemu-devel@nongnu.org; Fri, 17 Sep 2010 07:16:36 -0400 From: anthony.perard@citrix.com Date: Fri, 17 Sep 2010 12:15:01 +0100 Message-Id: <1284722107-28550-7-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1284722107-28550-1-git-send-email-anthony.perard@citrix.com> References: <1284722107-28550-1-git-send-email-anthony.perard@citrix.com> Subject: [Qemu-devel] [PATCH RFC V3 06/12] xen: add a 8259 Interrupt Controller List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: anthony.perard@citrix.com, Stefano Stabellini , xen-devel@lists.xensource.com, Stefano.Stabellini@eu.citrix.com From: Anthony PERARD Introduce a 8259 Interrupt Controller for target-xen; every set_irq call makes a Xen hypercall. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini --- hw/xen_common.h | 2 ++ hw/xen_machine_fv.c | 5 ++--- xen-all.c | 12 ++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/xen_common.h b/hw/xen_common.h index 2cbc376..dd54063 100644 --- a/hw/xen_common.h +++ b/hw/xen_common.h @@ -52,4 +52,6 @@ typedef xc_interface *qemu_xc_interface; # define xc_fd(xen_xc) (*(int*)xen_xc) #endif +qemu_irq *i8259_xen_init(void); + #endif /* QEMU_HW_XEN_COMMON_H */ diff --git a/hw/xen_machine_fv.c b/hw/xen_machine_fv.c index 65fd44a..dfdff55 100644 --- a/hw/xen_machine_fv.c +++ b/hw/xen_machine_fv.c @@ -35,6 +35,7 @@ #include "xen/hvm/hvm_info_table.h" #include "xen_platform.h" +#include "xen_common.h" #define MAX_IDE_BUS 2 @@ -50,7 +51,6 @@ static void xen_init_fv(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; @@ -74,8 +74,7 @@ static void xen_init_fv(ram_addr_t ram_size, env = cpu_init(cpu_model); env->halted = 1; - cpu_irq = pc_allocate_cpu_irq(); - i8259 = i8259_init(cpu_irq[0]); + i8259 = i8259_xen_init(); isa_irq_state = qemu_mallocz(sizeof(*isa_irq_state)); isa_irq_state->i8259 = i8259; diff --git a/xen-all.c b/xen-all.c index 948e439..765f87a 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) } } +/* i8259 */ + +static void i8259_set_irq(void *opaque, int irq, int level) +{ + xc_hvm_set_isa_irq_level(xen_xc, xen_domid, irq, level); +} + +qemu_irq *i8259_xen_init(void) +{ + return qemu_allocate_irqs(i8259_set_irq, NULL, 16); +} + /* Initialise Xen */ int xen_init(int smp_cpus) -- 1.6.5