On Thu, Mar 21, 2019 at 03:49:07PM +0100, Cédric Le Goater wrote: > Removing RTAS handlers will become necessary when the new pseries > machine supporting multiple interrupt mode is introduced. > > Signed-off-by: Cédric Le Goater <c...@kaod.org>
This makes sense independent of the rest, so I've applied it to ppc-for-4.1.
> ---
> include/hw/ppc/spapr.h | 4 ++++
> hw/ppc/spapr_rtas.c | 2 +-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index 2b4c05a2ec33..6a067db04351 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -671,6 +671,10 @@ typedef void (*spapr_rtas_fn)(PowerPCCPU *cpu,
> SpaprMachineState *sm,
> uint32_t nargs, target_ulong args,
> uint32_t nret, target_ulong rets);
> void spapr_rtas_register(int token, const char *name, spapr_rtas_fn fn);
> +static inline void spapr_rtas_unregister(int token)
> +{
> + spapr_rtas_register(token, NULL, NULL);
> +}
> target_ulong spapr_rtas_call(PowerPCCPU *cpu, SpaprMachineState *sm,
> uint32_t token, uint32_t nargs, target_ulong
> args,
> uint32_t nret, target_ulong rets);
> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
> index 24c45b12d46b..ee24212765be 100644
> --- a/hw/ppc/spapr_rtas.c
> +++ b/hw/ppc/spapr_rtas.c
> @@ -404,7 +404,7 @@ void spapr_rtas_register(int token, const char *name,
> spapr_rtas_fn fn)
>
> token -= RTAS_TOKEN_BASE;
>
> - assert(!rtas_table[token].name);
> + assert(!name || !rtas_table[token].name);
>
> rtas_table[token].name = name;
> rtas_table[token].fn = fn;
--
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
