From: David Gibson <david@gibson.dropbear.id.au>
To: Greg Kurz <groug@kaod.org>
Cc: "Cédric Le Goater" <clg@kaod.org>,
qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 04/10] spapr/irq: Use the base ICP class for KVM
Date: Mon, 18 Feb 2019 10:35:14 +1100 [thread overview]
Message-ID: <20190217233513.GE2765@umbus.fritz.box> (raw)
In-Reply-To: <155023080638.1011724.792095453419098948.stgit@bahia.lan>
[-- Attachment #1: Type: text/plain, Size: 2323 bytes --]
On Fri, Feb 15, 2019 at 12:40:06PM +0100, Greg Kurz wrote:
> The base ICP class knows how to interact with KVM. Adapt sPAPR to use it
> instead of the ICP KVM class.
>
> Signed-off-by: Greg Kurz <groug@kaod.org>
Applied, thanks.
> ---
> hw/ppc/spapr_irq.c | 4 +---
> include/hw/ppc/spapr.h | 1 -
> 2 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 48d6b2daed6e..e6893df61e76 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -102,7 +102,6 @@ static void spapr_irq_init_xics(sPAPRMachineState *spapr, int nr_irqs,
> if (kvm_enabled()) {
> if (machine_kernel_irqchip_allowed(machine) &&
> !xics_kvm_init(spapr, &local_err)) {
> - spapr->icp_type = TYPE_KVM_ICP;
> spapr->ics = spapr_ics_create(spapr, TYPE_ICS_KVM, nr_irqs,
> &local_err);
> }
> @@ -117,7 +116,6 @@ static void spapr_irq_init_xics(sPAPRMachineState *spapr, int nr_irqs,
>
> if (!spapr->ics) {
> xics_spapr_init(spapr);
> - spapr->icp_type = TYPE_ICP;
> spapr->ics = spapr_ics_create(spapr, TYPE_ICS_SIMPLE, nr_irqs,
> &local_err);
> }
> @@ -199,7 +197,7 @@ static void spapr_irq_cpu_intc_create_xics(sPAPRMachineState *spapr,
> Object *obj;
> sPAPRCPUState *spapr_cpu = spapr_cpu_state(cpu);
>
> - obj = icp_create(OBJECT(cpu), spapr->icp_type, XICS_FABRIC(spapr),
> + obj = icp_create(OBJECT(cpu), TYPE_ICP, XICS_FABRIC(spapr),
> &local_err);
> if (local_err) {
> error_propagate(errp, local_err);
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index cbd276ed2b6a..631fc5103b7b 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -178,7 +178,6 @@ struct sPAPRMachineState {
> /*< public >*/
> char *kvm_type;
>
> - const char *icp_type;
> int32_t irq_map_nr;
> unsigned long *irq_map;
> sPAPRXive *xive;
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-02-18 0:23 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-15 11:39 [Qemu-devel] [PATCH 00/10] xics: Get rid of KVM specific classes Greg Kurz
2019-02-15 11:39 ` [Qemu-devel] [PATCH 01/10] xics: Explicitely call KVM ICP methods from the common code Greg Kurz
2019-02-15 12:49 ` Cédric Le Goater
2019-02-17 23:14 ` David Gibson
2019-02-18 20:10 ` Eric Blake
2019-02-19 5:36 ` David Gibson
2019-02-15 11:39 ` [Qemu-devel] [PATCH 02/10] xics: Handle KVM ICP reset " Greg Kurz
2019-02-15 12:50 ` Cédric Le Goater
2019-02-17 23:32 ` David Gibson
2019-02-15 11:40 ` [Qemu-devel] [PATCH 03/10] xics: Handle KVM ICP realize " Greg Kurz
2019-02-15 12:54 ` Cédric Le Goater
2019-02-15 13:03 ` Greg Kurz
2019-02-15 13:09 ` Cédric Le Goater
2019-02-15 13:27 ` Greg Kurz
2019-02-15 13:35 ` Cédric Le Goater
2019-02-17 23:33 ` David Gibson
2019-02-15 11:40 ` [Qemu-devel] [PATCH 04/10] spapr/irq: Use the base ICP class for KVM Greg Kurz
2019-02-15 12:54 ` Cédric Le Goater
2019-02-17 23:35 ` David Gibson [this message]
2019-02-15 11:40 ` [Qemu-devel] [PATCH 05/10] xics: Drop the KVM ICP class Greg Kurz
2019-02-15 12:55 ` Cédric Le Goater
2019-02-15 13:18 ` Greg Kurz
2019-02-15 13:35 ` Cédric Le Goater
2019-02-15 13:35 ` Greg Kurz
2019-02-17 23:37 ` David Gibson
2019-02-18 7:08 ` Cédric Le Goater
2019-02-15 11:40 ` [Qemu-devel] [PATCH 06/10] xics: Explicitely call KVM ICS methods from the common code Greg Kurz
2019-02-15 12:56 ` Cédric Le Goater
2019-02-17 23:39 ` David Gibson
2019-02-15 11:40 ` [Qemu-devel] [PATCH 07/10] xics: Handle KVM ICS reset from the "simple" ICS code Greg Kurz
2019-02-15 12:57 ` Cédric Le Goater
2019-02-17 23:41 ` David Gibson
2019-02-15 11:40 ` [Qemu-devel] [PATCH 08/10] xics: Handle KVM interrupt presentation from " Greg Kurz
2019-02-15 12:59 ` Cédric Le Goater
2019-02-15 13:25 ` Greg Kurz
2019-02-17 23:43 ` David Gibson
2019-02-15 11:40 ` [Qemu-devel] [PATCH 09/10] spapr/irq: Use the "simple" ICS class for KVM Greg Kurz
2019-02-15 13:02 ` Cédric Le Goater
2019-02-15 13:32 ` Greg Kurz
2019-02-15 13:37 ` Cédric Le Goater
2019-02-17 23:49 ` David Gibson
2019-02-17 23:51 ` David Gibson
2019-02-15 11:40 ` [Qemu-devel] [PATCH 10/10] xics: Drop the KVM ICS class Greg Kurz
2019-02-15 13:02 ` Cédric Le Goater
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=20190217233513.GE2765@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=groug@kaod.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).