From: stefano.stabellini@eu.citrix.com To: qemu-devel@nongnu.org Cc: Anthony.Perard@citrix.com, Anthony PERARD <anthony.perard@citrix.com>, xen-devel@lists.xensource.com, Stefano Stabellini <stefano.stabellini@eu.citrix.com> Subject: [Qemu-devel] [PATCH 05/15] xen: add a 8259 Interrupt Controller Date: Thu, 12 Aug 2010 15:09:52 +0100 [thread overview] Message-ID: <1281622202-3453-5-git-send-email-stefano.stabellini@eu.citrix.com> (raw) In-Reply-To: <alpine.DEB.2.00.1008121244200.2545@kaball-desktop> From: Anthony PERARD <anthony.perard@citrix.com> Introduce a 8259 Interrupt Controller for target-xen; every set_irq call makes a Xen hypercall. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- Makefile.target | 2 +- hw/xen_common.h | 3 ++ hw/xen_machine_fv.c | 5 +-- target-xen/i8259-xen-stub.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 target-xen/i8259-xen-stub.c diff --git a/Makefile.target b/Makefile.target index 63dc7d1..d1b63f2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -319,7 +319,7 @@ libobj-y := $(filter-out $(bad-libobj-y), $(libobj-y)) endif obj-xen-y += xen_machine_fv.o -obj-xen-y += i8259.o +obj-xen-y += i8259-xen-stub.o obj-xen-y += pc.o obj-xen-y += piix_pci.o obj-xen-y += mc146818rtc.o diff --git a/hw/xen_common.h b/hw/xen_common.h index 8a55b44..020fdd7 100644 --- a/hw/xen_common.h +++ b/hw/xen_common.h @@ -31,4 +31,7 @@ # define xen_wmb() wmb() #endif +/* hw/i8259-xen-stub.c */ +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 5fef7de..114addf 100644 --- a/hw/xen_machine_fv.c +++ b/hw/xen_machine_fv.c @@ -32,6 +32,7 @@ #include "ide.h" #include "sysemu.h" +#include "xen_common.h" #include "xen_backend.h" #include "xenstore.h" #include "xen/hvm/hvm_info_table.h" @@ -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; @@ -80,8 +80,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/target-xen/i8259-xen-stub.c b/target-xen/i8259-xen-stub.c new file mode 100644 index 0000000..aa2aae1 --- /dev/null +++ b/target-xen/i8259-xen-stub.c @@ -0,0 +1,63 @@ +/* Xen 8259 stub for interrupt controller emulation + * + * Copyright (c) 2003-2004 Fabrice Bellard + * Copyright (c) 2005 Intel corperation + * Copyright (c) 2008 Citrix / Xensource + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "hw/hw.h" +#include "hw/pc.h" +#include "monitor.h" +#include "hw/xen_common.h" +#include "hw/xen_backend.h" + +#include <xen/hvm/ioreq.h> + +PicState2 *isa_pic = NULL; + +void pic_update_irq(PicState2 *s) +{ +} + +static void i8259_set_irq(void *opaque, int irq, int level) +{ + xc_hvm_set_isa_irq_level(xen_xc, xen_domid, irq, level); +} + +int pic_read_irq(PicState2 *s) +{ + return -1; +} + +void irq_info(Monitor *mon) +{ + monitor_printf(mon, "irq statistics not supported with Xen.\n"); +} + +void pic_info(Monitor *mon) +{ + monitor_printf(mon, "pic_info not supported with Xen .\n"); +} + +qemu_irq *i8259_xen_init(void) +{ + return qemu_allocate_irqs(i8259_set_irq, NULL, 16); +} -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: stefano.stabellini@eu.citrix.com To: qemu-devel@nongnu.org Cc: Anthony.Perard@citrix.com, Anthony PERARD <anthony.perard@citrix.com>, xen-devel@lists.xensource.com, Anthony Liguori <anthony@codemonkey.ws>, Stefano Stabellini <stefano.stabellini@eu.citrix.com> Subject: [PATCH 05/15] xen: add a 8259 Interrupt Controller Date: Thu, 12 Aug 2010 15:09:52 +0100 [thread overview] Message-ID: <1281622202-3453-5-git-send-email-stefano.stabellini@eu.citrix.com> (raw) In-Reply-To: <alpine.DEB.2.00.1008121244200.2545@kaball-desktop> From: Anthony PERARD <anthony.perard@citrix.com> Introduce a 8259 Interrupt Controller for target-xen; every set_irq call makes a Xen hypercall. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- Makefile.target | 2 +- hw/xen_common.h | 3 ++ hw/xen_machine_fv.c | 5 +-- target-xen/i8259-xen-stub.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 target-xen/i8259-xen-stub.c diff --git a/Makefile.target b/Makefile.target index 63dc7d1..d1b63f2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -319,7 +319,7 @@ libobj-y := $(filter-out $(bad-libobj-y), $(libobj-y)) endif obj-xen-y += xen_machine_fv.o -obj-xen-y += i8259.o +obj-xen-y += i8259-xen-stub.o obj-xen-y += pc.o obj-xen-y += piix_pci.o obj-xen-y += mc146818rtc.o diff --git a/hw/xen_common.h b/hw/xen_common.h index 8a55b44..020fdd7 100644 --- a/hw/xen_common.h +++ b/hw/xen_common.h @@ -31,4 +31,7 @@ # define xen_wmb() wmb() #endif +/* hw/i8259-xen-stub.c */ +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 5fef7de..114addf 100644 --- a/hw/xen_machine_fv.c +++ b/hw/xen_machine_fv.c @@ -32,6 +32,7 @@ #include "ide.h" #include "sysemu.h" +#include "xen_common.h" #include "xen_backend.h" #include "xenstore.h" #include "xen/hvm/hvm_info_table.h" @@ -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; @@ -80,8 +80,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/target-xen/i8259-xen-stub.c b/target-xen/i8259-xen-stub.c new file mode 100644 index 0000000..aa2aae1 --- /dev/null +++ b/target-xen/i8259-xen-stub.c @@ -0,0 +1,63 @@ +/* Xen 8259 stub for interrupt controller emulation + * + * Copyright (c) 2003-2004 Fabrice Bellard + * Copyright (c) 2005 Intel corperation + * Copyright (c) 2008 Citrix / Xensource + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "hw/hw.h" +#include "hw/pc.h" +#include "monitor.h" +#include "hw/xen_common.h" +#include "hw/xen_backend.h" + +#include <xen/hvm/ioreq.h> + +PicState2 *isa_pic = NULL; + +void pic_update_irq(PicState2 *s) +{ +} + +static void i8259_set_irq(void *opaque, int irq, int level) +{ + xc_hvm_set_isa_irq_level(xen_xc, xen_domid, irq, level); +} + +int pic_read_irq(PicState2 *s) +{ + return -1; +} + +void irq_info(Monitor *mon) +{ + monitor_printf(mon, "irq statistics not supported with Xen.\n"); +} + +void pic_info(Monitor *mon) +{ + monitor_printf(mon, "pic_info not supported with Xen .\n"); +} + +qemu_irq *i8259_xen_init(void) +{ + return qemu_allocate_irqs(i8259_set_irq, NULL, 16); +} -- 1.7.0.4
next prev parent reply other threads:[~2010-08-12 14:12 UTC|newest] Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-08-12 14:08 [Qemu-devel] [PATCH 00/15] RFC xen device model support Stefano Stabellini 2010-08-12 14:08 ` Stefano Stabellini 2010-08-12 14:09 ` [Qemu-devel] [PATCH 01/15] xen: Update libxc calls stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-12 14:19 ` [Qemu-devel] " Paolo Bonzini 2010-08-12 14:19 ` Paolo Bonzini 2010-08-12 14:28 ` [Qemu-devel] " Stefano Stabellini 2010-08-12 14:28 ` Stefano Stabellini 2010-08-12 14:29 ` [Qemu-devel] " Stefano Stabellini 2010-08-12 14:29 ` Stefano Stabellini 2010-08-18 9:50 ` [Qemu-devel] " Gerd Hoffmann 2010-08-18 11:47 ` Stefano Stabellini 2010-08-18 11:47 ` Stefano Stabellini 2010-08-12 14:09 ` [Qemu-devel] [PATCH 02/15] xen: Add xen_machine_fv stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-16 13:42 ` [Qemu-devel] " Kevin Wolf 2010-08-16 13:42 ` Kevin Wolf 2010-08-16 14:04 ` [Qemu-devel] " Stefano Stabellini 2010-08-16 14:13 ` Kevin Wolf 2010-08-16 14:13 ` Kevin Wolf 2010-08-16 14:38 ` [Qemu-devel] " Anthony Liguori 2010-08-16 14:38 ` Anthony Liguori 2010-08-16 14:51 ` [Qemu-devel] " Kevin Wolf 2010-08-16 14:51 ` Kevin Wolf 2010-08-16 15:00 ` [Qemu-devel] " Stefano Stabellini 2010-08-16 15:00 ` Stefano Stabellini 2010-08-16 15:07 ` [Qemu-devel] " Anthony Liguori 2010-08-16 15:07 ` Anthony Liguori 2010-08-12 14:09 ` [Qemu-devel] [PATCH 03/15] xen: Add a new target to qemu: target-xen stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-12 18:56 ` [Qemu-devel] " Blue Swirl 2010-08-13 12:47 ` [Xen-devel] " Ian Jackson 2010-08-13 12:47 ` Ian Jackson 2010-08-13 17:35 ` [Xen-devel] " Blue Swirl 2010-08-13 17:35 ` Blue Swirl 2010-08-13 13:10 ` Stefano Stabellini 2010-08-13 17:46 ` Blue Swirl 2010-08-13 18:50 ` [Qemu-devel] " Anthony Liguori 2010-08-13 18:50 ` Anthony Liguori 2010-08-12 14:09 ` [Qemu-devel] [PATCH 04/15] xen: xen_machine_fv, initialize xenstore stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini [this message] 2010-08-12 14:09 ` [PATCH 05/15] xen: add a 8259 Interrupt Controller stefano.stabellini 2010-08-12 14:09 ` [Qemu-devel] [PATCH 06/15] xen: Add the Xen platform pci device stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-12 18:26 ` [Qemu-devel] " Blue Swirl 2010-08-13 13:09 ` Stefano Stabellini 2010-08-12 14:09 ` [Qemu-devel] [PATCH 07/15] xen: handle xenstore events stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-12 14:09 ` [Qemu-devel] [PATCH 08/15] xen: Read and write the state of the VM in xenstore stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-13 18:53 ` [Qemu-devel] " Anthony Liguori 2010-08-13 18:53 ` Anthony Liguori 2010-08-15 14:12 ` [Qemu-devel] " Paolo Bonzini 2010-08-15 14:12 ` Paolo Bonzini 2010-08-16 11:15 ` [Qemu-devel] " Stefano Stabellini 2010-08-16 11:15 ` Stefano Stabellini 2010-08-16 12:13 ` [Qemu-devel] " Paolo Bonzini 2010-08-16 12:13 ` Paolo Bonzini 2010-08-16 12:59 ` [Qemu-devel] " Stefano Stabellini 2010-08-16 12:59 ` Stefano Stabellini 2010-08-12 14:09 ` [Qemu-devel] [PATCH 09/15] xen: Initialize event channels and io rings stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-12 18:42 ` [Qemu-devel] " Blue Swirl 2010-08-13 13:10 ` Stefano Stabellini 2010-08-13 18:54 ` [Qemu-devel] " Anthony Liguori 2010-08-13 18:54 ` Anthony Liguori 2010-08-12 14:09 ` [Qemu-devel] [PATCH 10/15] xen: Introduce the Xen mapcache stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-13 18:55 ` [Qemu-devel] " Anthony Liguori 2010-08-13 18:55 ` Anthony Liguori 2010-08-12 14:09 ` [Qemu-devel] [PATCH 11/15] piix3: introduce register_set_irq and register_map_irq stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-12 18:44 ` [Qemu-devel] " Blue Swirl 2010-08-13 13:10 ` Stefano Stabellini 2010-08-12 14:09 ` [Qemu-devel] [PATCH 12/15] piix_pci: introduce a write_config notifier stefano.stabellini 2010-08-12 14:09 ` stefano.stabellini 2010-08-12 18:35 ` [Qemu-devel] " Blue Swirl 2010-08-13 13:10 ` Stefano Stabellini 2010-09-05 7:34 ` [Qemu-devel] " Michael S. Tsirkin 2010-09-05 7:34 ` Michael S. Tsirkin 2010-08-12 14:10 ` [Qemu-devel] [PATCH 13/15] vl.c: Introduce getter for shutdown_requested and reset_requested stefano.stabellini 2010-08-12 14:10 ` stefano.stabellini 2010-08-12 14:10 ` [Qemu-devel] [PATCH 14/15] xen: destroy the VM when shutdown is requested stefano.stabellini 2010-08-12 14:10 ` stefano.stabellini 2010-08-13 18:56 ` [Qemu-devel] " Anthony Liguori 2010-08-13 18:56 ` Anthony Liguori 2010-08-12 14:10 ` [Qemu-devel] [PATCH 15/15] xen: Add a Xen specific ACPI Implementation to target-xen stefano.stabellini 2010-08-12 14:10 ` stefano.stabellini 2010-08-12 18:46 ` [Qemu-devel] " Blue Swirl 2010-08-13 13:10 ` Stefano Stabellini 2010-08-13 13:10 ` Stefano Stabellini 2010-08-13 18:57 ` [Qemu-devel] " Anthony Liguori 2010-08-13 18:57 ` Anthony Liguori 2010-08-13 19:37 ` [Qemu-devel] " Stefano Stabellini 2010-08-13 19:37 ` Stefano Stabellini 2010-08-13 20:51 ` [Qemu-devel] " Anthony Liguori 2010-08-13 20:51 ` Anthony Liguori 2010-08-16 11:10 ` [Qemu-devel] " Stefano Stabellini 2010-08-16 11:10 ` Stefano Stabellini 2010-08-13 19:09 ` [Qemu-devel] Re: [PATCH 00/15] RFC xen device model support Anthony Liguori 2010-08-13 19:09 ` Anthony Liguori 2010-08-13 19:35 ` [Qemu-devel] " Stefano Stabellini 2010-08-13 19:35 ` Stefano Stabellini 2010-08-13 20:48 ` [Qemu-devel] " Anthony Liguori 2010-08-13 20:48 ` Anthony Liguori 2010-08-23 9:49 [Qemu-devel] [PATCH 00/15] v2: " Stefano Stabellini 2010-08-23 9:50 ` [Qemu-devel] [PATCH 05/15] xen: add a 8259 Interrupt Controller stefano.stabellini
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1281622202-3453-5-git-send-email-stefano.stabellini@eu.citrix.com \ --to=stefano.stabellini@eu.citrix.com \ --cc=Anthony.Perard@citrix.com \ --cc=qemu-devel@nongnu.org \ --cc=xen-devel@lists.xensource.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.