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 11/15] piix3: introduce register_set_irq and register_map_irq Date: Thu, 12 Aug 2010 15:09:58 +0100 [thread overview] Message-ID: <1281622202-3453-11-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> This patch introduces a generic function registration mechanism for set_irq and map_irq in piix3, so that the two calls can be overridden with platform specific functions whenever needed. The patch also implements and registers the Xen specific version of the functions. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- hw/pc.h | 3 +++ hw/piix_pci.c | 17 ++++++++++++++++- hw/xen_machine_fv.c | 14 ++++++++++++++ 3 files changed, 33 insertions(+), 1 deletions(-) diff --git a/hw/pc.h b/hw/pc.h index 63b0249..ee562cd 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -5,6 +5,7 @@ #include "ioport.h" #include "isa.h" #include "fdc.h" +#include "pci.h" /* PC-style peripherals (also used by other machines). */ @@ -138,6 +139,8 @@ int pcspk_audio_init(qemu_irq *pic); struct PCII440FXState; typedef struct PCII440FXState PCII440FXState; +void piix3_register_set_irq(pci_set_irq_fn set_irq); +void piix3_register_map_irq(pci_map_irq_fn map_irq); PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, qemu_irq *pic, ram_addr_t ram_size); void i440fx_init_memory_mappings(PCII440FXState *d); diff --git a/hw/piix_pci.c b/hw/piix_pci.c index f152a0f..56e3f61 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -55,6 +55,21 @@ struct PCII440FXState { #define I440FX_SMRAM 0x72 static void piix3_set_irq(void *opaque, int irq_num, int level); +static int pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num); + +static pci_set_irq_fn piix3_set_irq_handler = piix3_set_irq; +static pci_map_irq_fn piix3_map_irq_handler = pci_slot_get_pirq; + +/* Must be called before call i440fx_init() */ +void piix3_register_set_irq(pci_set_irq_fn set_irq) +{ + piix3_set_irq_handler = set_irq; +} + +void piix3_register_map_irq(pci_map_irq_fn map_irq) +{ + piix3_map_irq_handler = map_irq; +} /* return the global irq number corresponding to a given device irq pin. We could also use the bus number to have a more precise @@ -235,7 +250,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, qemu_irq * piix3 = DO_UPCAST(PIIX3State, dev, pci_create_simple_multifunction(b, -1, true, "PIIX3")); piix3->pic = pic; - pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3, 4); + pci_bus_irqs(b, piix3_set_irq_handler, piix3_map_irq_handler, piix3, 4); (*pi440fx_state)->piix3 = piix3; *piix3_devfn = piix3->dev.devfn; diff --git a/hw/xen_machine_fv.c b/hw/xen_machine_fv.c index 58237d6..5d553b6 100644 --- a/hw/xen_machine_fv.c +++ b/hw/xen_machine_fv.c @@ -50,6 +50,18 @@ static void xen_vm_change_state_handler(void *opaque, int running, int reason) xen_main_loop_prepare(); } +static int xen_piix3_map_irq(PCIDevice *pci_dev, int irq_num) +{ + return irq_num + ((pci_dev->devfn >> 3) << 2); +} + +static void xen_piix3_set_irq(void *opaque, int irq_num, int level) +{ + xc_hvm_set_pci_intx_level(xen_xc, xen_domid, 0, 0, irq_num >> 2, + irq_num & 3, level); +} + + static void xen_init_fv(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, @@ -126,6 +138,8 @@ static void xen_init_fv(ram_addr_t ram_size, isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24); + piix3_register_set_irq(xen_piix3_set_irq); + piix3_register_map_irq(xen_piix3_map_irq); pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, isa_irq, ram_size); isa_bus_irqs(isa_irq); -- 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 11/15] piix3: introduce register_set_irq and register_map_irq Date: Thu, 12 Aug 2010 15:09:58 +0100 [thread overview] Message-ID: <1281622202-3453-11-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> This patch introduces a generic function registration mechanism for set_irq and map_irq in piix3, so that the two calls can be overridden with platform specific functions whenever needed. The patch also implements and registers the Xen specific version of the functions. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- hw/pc.h | 3 +++ hw/piix_pci.c | 17 ++++++++++++++++- hw/xen_machine_fv.c | 14 ++++++++++++++ 3 files changed, 33 insertions(+), 1 deletions(-) diff --git a/hw/pc.h b/hw/pc.h index 63b0249..ee562cd 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -5,6 +5,7 @@ #include "ioport.h" #include "isa.h" #include "fdc.h" +#include "pci.h" /* PC-style peripherals (also used by other machines). */ @@ -138,6 +139,8 @@ int pcspk_audio_init(qemu_irq *pic); struct PCII440FXState; typedef struct PCII440FXState PCII440FXState; +void piix3_register_set_irq(pci_set_irq_fn set_irq); +void piix3_register_map_irq(pci_map_irq_fn map_irq); PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, qemu_irq *pic, ram_addr_t ram_size); void i440fx_init_memory_mappings(PCII440FXState *d); diff --git a/hw/piix_pci.c b/hw/piix_pci.c index f152a0f..56e3f61 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -55,6 +55,21 @@ struct PCII440FXState { #define I440FX_SMRAM 0x72 static void piix3_set_irq(void *opaque, int irq_num, int level); +static int pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num); + +static pci_set_irq_fn piix3_set_irq_handler = piix3_set_irq; +static pci_map_irq_fn piix3_map_irq_handler = pci_slot_get_pirq; + +/* Must be called before call i440fx_init() */ +void piix3_register_set_irq(pci_set_irq_fn set_irq) +{ + piix3_set_irq_handler = set_irq; +} + +void piix3_register_map_irq(pci_map_irq_fn map_irq) +{ + piix3_map_irq_handler = map_irq; +} /* return the global irq number corresponding to a given device irq pin. We could also use the bus number to have a more precise @@ -235,7 +250,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, qemu_irq * piix3 = DO_UPCAST(PIIX3State, dev, pci_create_simple_multifunction(b, -1, true, "PIIX3")); piix3->pic = pic; - pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3, 4); + pci_bus_irqs(b, piix3_set_irq_handler, piix3_map_irq_handler, piix3, 4); (*pi440fx_state)->piix3 = piix3; *piix3_devfn = piix3->dev.devfn; diff --git a/hw/xen_machine_fv.c b/hw/xen_machine_fv.c index 58237d6..5d553b6 100644 --- a/hw/xen_machine_fv.c +++ b/hw/xen_machine_fv.c @@ -50,6 +50,18 @@ static void xen_vm_change_state_handler(void *opaque, int running, int reason) xen_main_loop_prepare(); } +static int xen_piix3_map_irq(PCIDevice *pci_dev, int irq_num) +{ + return irq_num + ((pci_dev->devfn >> 3) << 2); +} + +static void xen_piix3_set_irq(void *opaque, int irq_num, int level) +{ + xc_hvm_set_pci_intx_level(xen_xc, xen_domid, 0, 0, irq_num >> 2, + irq_num & 3, level); +} + + static void xen_init_fv(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, @@ -126,6 +138,8 @@ static void xen_init_fv(ram_addr_t ram_size, isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24); + piix3_register_set_irq(xen_piix3_set_irq); + piix3_register_map_irq(xen_piix3_map_irq); pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, isa_irq, ram_size); isa_bus_irqs(isa_irq); -- 1.7.0.4
next prev parent reply other threads:[~2010-08-12 14:12 UTC|newest] Thread overview: 106+ 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 ` [Qemu-devel] [PATCH 05/15] xen: add a 8259 Interrupt Controller stefano.stabellini 2010-08-12 14:09 ` 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 ` stefano.stabellini [this message] 2010-08-12 14:09 ` [PATCH 11/15] piix3: introduce register_set_irq and register_map_irq 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
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-11-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.