Am 19.08.2013 07:55, schrieb Alexey Kardashevskiy: > The upcoming support of in-kernel XICS will redefine migration callbacks > for both ICS and ICP so classes and callback pointers are added. > > This adds a cpu_setup callback to the XICS device class (as XICS-KVM > will do it different) and xics_dispatch_cpu_setup(). This also moves > the place where xics_dispatch_cpu_setup() is called a bit further to > have VCPU initialized (required for XICS-KVM). > > Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru> > --- > Changes: > v3: > * fixed local variables names > --- > hw/intc/xics.c | 61 > +++++++++++++++++++++++++++++++++++++++++++++++---- > hw/ppc/spapr.c | 4 ++-- > include/hw/ppc/xics.h | 46 +++++++++++++++++++++++++++++++++++++- > 3 files changed, 104 insertions(+), 7 deletions(-) > > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index 6b3c071..e3a957d 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c [...] > @@ -674,10 +724,12 @@ static Property xics_properties[] = { > static void xics_class_init(ObjectClass *oc, void *data) > { > DeviceClass *dc = DEVICE_CLASS(oc); > + XICSStateClass *k = XICS_CLASS(oc); > > dc->realize = xics_realize; > dc->props = xics_properties; > dc->reset = xics_reset; > + k->cpu_setup = xics_cpu_setup; > > spapr_rtas_register("ibm,set-xive", rtas_set_xive); > spapr_rtas_register("ibm,get-xive", rtas_get_xive);
This hunk is fixed up in 4/8, please squash that bit here. Otherwise looks good. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg