David Gibson <da...@gibson.dropbear.id.au> writes: > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h >> index 9091054..452a978 100644 >> --- a/include/hw/ppc/xics.h >> +++ b/include/hw/ppc/xics.h >> @@ -32,20 +32,24 @@ >> #define TYPE_XICS_COMMON "xics-common" >> #define XICS_COMMON(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_COMMON) >> >> -#define TYPE_XICS "xics" >> -#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS) >> +/* >> + * Retain xics as the type name to be compatible for migration. Rest all the >> + * functions, class and variables are renamed as xics_spapr. >> + */ >> +#define TYPE_XICS_SPAPR "xics" >> +#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_SPAPR) > > This should change to XICS_SPAPR to match the TYPE macro.
Done. > >> >> -#define TYPE_KVM_XICS "xics-kvm" >> -#define KVM_XICS(obj) OBJECT_CHECK(KVMXICSState, (obj), TYPE_KVM_XICS) >> +#define TYPE_XICS_SPAPR_KVM "xics-spapr-kvm" >> +#define KVM_XICS(obj) OBJECT_CHECK(KVMXICSState, (obj), TYPE_XICS_SPAPR_KVM) > > Likewise XICS_SPAPR_KVM(). > Done. Regards Nikunj