On 11/29/18 5:12 AM, David Gibson wrote: > On Fri, Nov 16, 2018 at 11:57:25AM +0100, Cédric Le Goater wrote: >> Removing RTAS handlers will become necessary when the new pseries >> machine supporting multiple interrupt mode is introduced. > > I'd prefer this to be done as a separate spapr_rtas_unregister() > helper, just to improve greppability.
ok. I should propose an inline : static inline void spapr_rtas_unregister(int token) { spapr_rtas_register(token, NULL, NULL); } > >> >> Signed-off-by: Cédric Le Goater <c...@kaod.org> >> --- >> hw/ppc/spapr_rtas.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c >> index d6a0952154ac..e005d5d08151 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; >