OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ppc/xics: rework the ICS classes inheritance tree 

With the previous changes, we can now let the ICS_KVM class inherit
directly from ICS_BASE class and not from the intermediate ICS_SIMPLE.
It makes the class hierarchy much cleaner.

What is left in the top classes is the low level interface to access
the KVM XICS device in ICS_KVM and the XICS emulating handlers in
ICS_SIMPLE.

This should not break migration compatibility.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Cédric Le Goater 2018-06-25 11:17:18 +02:00 committed by David Gibson
parent c8b1846f23
commit abe82ebb20
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/intc/xics_kvm.c
View File

@ -359,12 +359,10 @@ static void ics_kvm_class_init(ObjectClass *klass, void *data)
ICSStateClass *icsc = ICS_BASE_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass);
/*
* Use device_class_set_parent_realize() when ics-kvm inherits
* directly from ics-base and not from ics-simple anymore.
*/
dc->realize = ics_kvm_realize;
dc->reset = ics_kvm_reset;
device_class_set_parent_realize(dc, ics_kvm_realize,
&icsc->parent_realize);
device_class_set_parent_reset(dc, ics_kvm_reset,
&icsc->parent_reset);
icsc->pre_save = ics_get_kvm_state;
icsc->post_load = ics_set_kvm_state;
@ -373,7 +371,7 @@ static void ics_kvm_class_init(ObjectClass *klass, void *data)
static const TypeInfo ics_kvm_info = {
.name = TYPE_ICS_KVM,
.parent = TYPE_ICS_SIMPLE,
.parent = TYPE_ICS_BASE,
.instance_size = sizeof(ICSState),
.class_init = ics_kvm_class_init,
};

2
hw/ppc/spapr.c
View File

@ -137,7 +137,7 @@ static ICSState *spapr_ics_create(sPAPRMachineState *spapr,
goto error;
}
return ICS_SIMPLE(obj);
return ICS_BASE(obj);
error:
error_propagate(errp, local_err);