|
@@ -37,7 +37,7 @@ DECLARE_OBJ_CHECKERS(GICv3ITSState, KVMARMITSClass,
|
|
|
|
|
|
struct KVMARMITSClass {
|
|
struct KVMARMITSClass {
|
|
GICv3ITSCommonClass parent_class;
|
|
GICv3ITSCommonClass parent_class;
|
|
- void (*parent_reset)(DeviceState *dev);
|
|
|
|
|
|
+ ResettablePhases parent_phases;
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
@@ -197,13 +197,15 @@ static void kvm_arm_its_post_load(GICv3ITSState *s)
|
|
GITS_CTLR, &s->ctlr, true, &error_abort);
|
|
GITS_CTLR, &s->ctlr, true, &error_abort);
|
|
}
|
|
}
|
|
|
|
|
|
-static void kvm_arm_its_reset(DeviceState *dev)
|
|
|
|
|
|
+static void kvm_arm_its_reset_hold(Object *obj)
|
|
{
|
|
{
|
|
- GICv3ITSState *s = ARM_GICV3_ITS_COMMON(dev);
|
|
|
|
|
|
+ GICv3ITSState *s = ARM_GICV3_ITS_COMMON(obj);
|
|
KVMARMITSClass *c = KVM_ARM_ITS_GET_CLASS(s);
|
|
KVMARMITSClass *c = KVM_ARM_ITS_GET_CLASS(s);
|
|
int i;
|
|
int i;
|
|
|
|
|
|
- c->parent_reset(dev);
|
|
|
|
|
|
+ if (c->parent_phases.hold) {
|
|
|
|
+ c->parent_phases.hold(obj);
|
|
|
|
+ }
|
|
|
|
|
|
if (kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
|
if (kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
|
KVM_DEV_ARM_ITS_CTRL_RESET)) {
|
|
KVM_DEV_ARM_ITS_CTRL_RESET)) {
|
|
@@ -241,12 +243,14 @@ static Property kvm_arm_its_props[] = {
|
|
static void kvm_arm_its_class_init(ObjectClass *klass, void *data)
|
|
static void kvm_arm_its_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
+ ResettableClass *rc = RESETTABLE_CLASS(klass);
|
|
GICv3ITSCommonClass *icc = ARM_GICV3_ITS_COMMON_CLASS(klass);
|
|
GICv3ITSCommonClass *icc = ARM_GICV3_ITS_COMMON_CLASS(klass);
|
|
KVMARMITSClass *ic = KVM_ARM_ITS_CLASS(klass);
|
|
KVMARMITSClass *ic = KVM_ARM_ITS_CLASS(klass);
|
|
|
|
|
|
dc->realize = kvm_arm_its_realize;
|
|
dc->realize = kvm_arm_its_realize;
|
|
device_class_set_props(dc, kvm_arm_its_props);
|
|
device_class_set_props(dc, kvm_arm_its_props);
|
|
- device_class_set_parent_reset(dc, kvm_arm_its_reset, &ic->parent_reset);
|
|
|
|
|
|
+ resettable_class_set_parent_phases(rc, NULL, kvm_arm_its_reset_hold, NULL,
|
|
|
|
+ &ic->parent_phases);
|
|
icc->send_msi = kvm_its_send_msi;
|
|
icc->send_msi = kvm_its_send_msi;
|
|
icc->pre_save = kvm_arm_its_pre_save;
|
|
icc->pre_save = kvm_arm_its_pre_save;
|
|
icc->post_load = kvm_arm_its_post_load;
|
|
icc->post_load = kvm_arm_its_post_load;
|