On Tue, Dec 01, 2015 at 12:01:36PM +1100, David Gibson wrote:
> On Fri, Nov 20, 2015 at 06:24:35PM +0530, Bharata B Rao wrote:
> > XICS is setup for each CPU during initialization. Provide a routine
> > to undo the same when CPU is unplugged.
> >
> > This allows reboot of a VM that has undergone CPU hotplug and unplug
> > to work correctly.
> >
> > Signed-off-by: Bharata B Rao <bhar...@linux.vnet.ibm.com>
> > Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> > ---
> > hw/intc/xics.c | 12 ++++++++++++
> > hw/intc/xics_kvm.c | 13 +++++++++++--
> > include/hw/ppc/xics.h | 2 ++
> > 3 files changed, 25 insertions(+), 2 deletions(-)
> >
> > diff --git a/hw/intc/xics.c b/hw/intc/xics.c
> > index 9ff5796..e1161b2 100644
> > --- a/hw/intc/xics.c
> > +++ b/hw/intc/xics.c
> > @@ -44,6 +44,18 @@ static int get_cpu_index_by_dt_id(int cpu_dt_id)
> > return -1;
> > }
> >
> > +void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu)
> > +{
> > + CPUState *cs = CPU(cpu);
> > + XICSStateClass *info = XICS_COMMON_GET_CLASS(icp);
> > +
> > + assert(cs->cpu_index < icp->nr_servers);
> > +
> > + if (info->cpu_destroy) {
> > + info->cpu_destroy(icp, cpu);
> > + }
> > +}
> > +
> > void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu)
> > {
> > CPUState *cs = CPU(cpu);
> > diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> > index d58729c..cb96f69 100644
> > --- a/hw/intc/xics_kvm.c
> > +++ b/hw/intc/xics_kvm.c
> > @@ -331,6 +331,8 @@ static void xics_kvm_cpu_setup(XICSState *icp,
> > PowerPCCPU *cpu)
> > abort();
> > }
> >
> > + ss->cs = cs;
> > +
>
> Actually, it probably makes more sense to move the management of
> ss->cs to the base xics code. There's nothing really kvm specific
> about it.
Right, let me try changing this in next iteration.
Regards,
Bharata.
