On Mon, Jun 17, 2019 at 03:46:41PM +0200, Greg Kurz wrote: > Switch to using the connect/disconnect terminology like we already do for > XIVE. > > Signed-off-by: Greg Kurz <gr...@kaod.org>
Applied, thanks.
> ---
> hw/intc/xics_kvm.c | 2 +-
> hw/ppc/spapr_irq.c | 2 +-
> include/hw/ppc/xics_spapr.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> index c7f8f5edd257..534515143ea8 100644
> --- a/hw/intc/xics_kvm.c
> +++ b/hw/intc/xics_kvm.c
> @@ -331,7 +331,7 @@ void ics_kvm_set_irq(ICSState *ics, int srcno, int val)
> }
> }
>
> -int xics_kvm_init(SpaprMachineState *spapr, Error **errp)
> +int xics_kvm_connect(SpaprMachineState *spapr, Error **errp)
> {
> int rc;
> CPUState *cs;
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 84b9b32fe40f..ff3df0bbd8cf 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -237,7 +237,7 @@ static const char
> *spapr_irq_get_nodename_xics(SpaprMachineState *spapr)
> static void spapr_irq_init_kvm_xics(SpaprMachineState *spapr, Error **errp)
> {
> if (kvm_enabled()) {
> - xics_kvm_init(spapr, errp);
> + xics_kvm_connect(spapr, errp);
> }
> }
>
> diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h
> index 330448126223..5dabc9a1388f 100644
> --- a/include/hw/ppc/xics_spapr.h
> +++ b/include/hw/ppc/xics_spapr.h
> @@ -33,7 +33,7 @@
>
> void spapr_dt_xics(SpaprMachineState *spapr, uint32_t nr_servers, void *fdt,
> uint32_t phandle);
> -int xics_kvm_init(SpaprMachineState *spapr, Error **errp);
> +int xics_kvm_connect(SpaprMachineState *spapr, Error **errp);
> void xics_kvm_disconnect(SpaprMachineState *spapr, Error **errp);
> bool xics_kvm_has_broken_disconnect(SpaprMachineState *spapr);
> void xics_spapr_init(SpaprMachineState *spapr);
>
--
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
signature.asc
Description: PGP signature
