|
@@ -450,9 +450,9 @@ static void arm_gicv3_finalize(Object *obj)
|
|
g_free(s->redist_region_count);
|
|
g_free(s->redist_region_count);
|
|
}
|
|
}
|
|
|
|
|
|
-static void arm_gicv3_common_reset(DeviceState *dev)
|
|
|
|
|
|
+static void arm_gicv3_common_reset_hold(Object *obj)
|
|
{
|
|
{
|
|
- GICv3State *s = ARM_GICV3_COMMON(dev);
|
|
|
|
|
|
+ GICv3State *s = ARM_GICV3_COMMON(obj);
|
|
int i;
|
|
int i;
|
|
|
|
|
|
for (i = 0; i < s->num_cpu; i++) {
|
|
for (i = 0; i < s->num_cpu; i++) {
|
|
@@ -578,9 +578,10 @@ static Property arm_gicv3_common_properties[] = {
|
|
static void arm_gicv3_common_class_init(ObjectClass *klass, void *data)
|
|
static void arm_gicv3_common_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
+ ResettableClass *rc = RESETTABLE_CLASS(klass);
|
|
ARMLinuxBootIfClass *albifc = ARM_LINUX_BOOT_IF_CLASS(klass);
|
|
ARMLinuxBootIfClass *albifc = ARM_LINUX_BOOT_IF_CLASS(klass);
|
|
|
|
|
|
- dc->reset = arm_gicv3_common_reset;
|
|
|
|
|
|
+ rc->phases.hold = arm_gicv3_common_reset_hold;
|
|
dc->realize = arm_gicv3_common_realize;
|
|
dc->realize = arm_gicv3_common_realize;
|
|
device_class_set_props(dc, arm_gicv3_common_properties);
|
|
device_class_set_props(dc, arm_gicv3_common_properties);
|
|
dc->vmsd = &vmstate_gicv3;
|
|
dc->vmsd = &vmstate_gicv3;
|