On 19.08.2013, at 07:55, Alexey Kardashevskiy wrote:
> 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
> @@ -153,11 +153,35 @@ static void icp_irq(XICSState *icp, int server, int nr,
> uint8_t priority)
> }
> }
>
> +static void icp_dispatch_pre_save(void *opaque)
> +{
> + ICPState *ss = opaque;
> + ICPStateClass *info = ICP_GET_CLASS(ss);
> +
> + if (info->pre_save) {
> + info->pre_save(ss);
> + }
> +}
> +
> +static int icp_dispatch_post_load(void *opaque, int version_id)
> +{
> + ICPState *ss = opaque;
> + ICPStateClass *info = ICP_GET_CLASS(ss);
> +
> + if (info->post_load) {
> + return info->post_load(ss, version_id);
> + }
> +
> + return 0;
> +}
> +
> static const VMStateDescription vmstate_icp_server = {
> .name = "icp/server",
> .version_id = 1,
> .minimum_version_id = 1,
> .minimum_version_id_old = 1,
> + .pre_save = icp_dispatch_pre_save,
> + .post_load = icp_dispatch_post_load,
> .fields = (VMStateField []) {
> /* Sanity check */
> VMSTATE_UINT32(xirr, ICPState),
> @@ -192,6 +216,7 @@ static TypeInfo icp_info = {
> .parent = TYPE_DEVICE,
> .instance_size = sizeof(ICPState),
> .class_init = icp_class_init,
> + .class_size = sizeof(ICPStateClass),
> };
>
> /*
> @@ -353,10 +378,9 @@ static void ics_reset(DeviceState *dev)
> }
> }
>
> -static int ics_post_load(void *opaque, int version_id)
> +static int ics_post_load(ICSState *ics, int version_id)
> {
> int i;
> - ICSState *ics = opaque;
>
> for (i = 0; i < ics->icp->nr_servers; i++) {
> icp_resend(ics->icp, i);
> @@ -365,6 +389,28 @@ static int ics_post_load(void *opaque, int version_id)
> return 0;
> }
>
> +static void ics_dispatch_pre_save(void *opaque)
> +{
> + ICSState *ics = opaque;
> + ICSStateClass *info = ICS_GET_CLASS(ics);
> +
> + if (info->pre_save) {
> + info->pre_save(ics);
> + }
> +}
> +
> +static int ics_dispatch_post_load(void *opaque, int version_id)
> +{
> + ICSState *ics = opaque;
> + ICSStateClass *info = ICS_GET_CLASS(ics);
> +
> + if (info->post_load) {
> + return info->post_load(ics, version_id);
> + }
> +
> + return 0;
> +}
> +
> static const VMStateDescription vmstate_ics_irq = {
> .name = "ics/irq",
> .version_id = 1,
> @@ -384,7 +430,8 @@ static const VMStateDescription vmstate_ics = {
> .version_id = 1,
> .minimum_version_id = 1,
> .minimum_version_id_old = 1,
> - .post_load = ics_post_load,
> + .pre_save = ics_dispatch_pre_save,
> + .post_load = ics_dispatch_post_load,
> .fields = (VMStateField []) {
> /* Sanity check */
> VMSTATE_UINT32_EQUAL(nr_irqs, ICSState),
> @@ -409,10 +456,12 @@ static int ics_realize(DeviceState *dev)
> static void ics_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> + ICSStateClass *isc = ICS_CLASS(klass);
>
> dc->init = ics_realize;
> dc->vmsd = &vmstate_ics;
> dc->reset = ics_reset;
> + isc->post_load = ics_post_load;
> }
>
> static TypeInfo ics_info = {
> @@ -420,6 +469,7 @@ static TypeInfo ics_info = {
> .parent = TYPE_DEVICE,
> .instance_size = sizeof(ICSState),
> .class_init = ics_class_init,
> + .class_size = sizeof(ICSStateClass),
> };
>
> /*
> @@ -612,7 +662,7 @@ static void xics_reset(DeviceState *d)
> device_reset(DEVICE(icp->ics));
> }
>
> -void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu)
> +static void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu)
> {
> CPUState *cs = CPU(cpu);
> CPUPPCState *env = &cpu->env;
> @@ -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);
> @@ -694,6 +746,7 @@ static const TypeInfo xics_info = {
> .name = TYPE_XICS,
> .parent = TYPE_SYS_BUS_DEVICE,
> .instance_size = sizeof(XICSState),
> + .class_size = sizeof(XICSStateClass),
> .class_init = xics_class_init,
> .instance_init = xics_initfn,
> };
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 16bfab9..432f0d2 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1155,8 +1155,6 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
> }
> env = &cpu->env;
>
> - xics_cpu_setup(spapr->icp, cpu);
> -
> /* Set time-base frequency to 512 MHz */
> cpu_ppc_tb_init(env, TIMEBASE_FREQ);
>
> @@ -1170,6 +1168,8 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
> kvmppc_set_papr(cpu);
> }
>
> + xics_dispatch_cpu_setup(spapr->icp, cpu);
Please move the code movement to a later patch where you actually introduce kvm
xics. This patch should only do the rename.
Alex
