mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 02:24:58 -06:00
hw, target: Add ResetType argument to hold and exit phase methods
We pass a ResetType argument to the Resettable class enter phase method, but we don't pass it to hold and exit, even though the callsites have it readily available. This means that if a device cared about the ResetType it would need to record it in the enter phase method to use later on. Pass the type to all three of the phase methods to avoid having to do that. Commit created with for dir in hw target include; do \ spatch --macro-file scripts/cocci-macro-file.h \ --sp-file scripts/coccinelle/reset-type.cocci \ --keep-comments --smpl-spacing --in-place \ --include-headers --dir $dir; done and no manual edits. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Luc Michel <luc.michel@amd.com> Message-id: 20240412160809.1260625-5-peter.maydell@linaro.org
This commit is contained in:
parent
aadea887f4
commit
ad80e36744
94 changed files with 150 additions and 150 deletions
|
@ -272,7 +272,7 @@ static int pxa2xx_pic_post_load(void *opaque, int version_id)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void pxa2xx_pic_reset_hold(Object *obj)
|
||||
static void pxa2xx_pic_reset_hold(Object *obj, ResetType type)
|
||||
{
|
||||
PXA2xxPICState *s = PXA2XX_PIC(obj);
|
||||
|
||||
|
|
|
@ -682,7 +682,7 @@ static void smmu_base_realize(DeviceState *dev, Error **errp)
|
|||
}
|
||||
}
|
||||
|
||||
static void smmu_base_reset_hold(Object *obj)
|
||||
static void smmu_base_reset_hold(Object *obj, ResetType type)
|
||||
{
|
||||
SMMUState *s = ARM_SMMU(obj);
|
||||
|
||||
|
|
|
@ -1727,13 +1727,13 @@ static void smmu_init_irq(SMMUv3State *s, SysBusDevice *dev)
|
|||
}
|
||||
}
|
||||
|
||||
static void smmu_reset_hold(Object *obj)
|
||||
static void smmu_reset_hold(Object *obj, ResetType type)
|
||||
{
|
||||
SMMUv3State *s = ARM_SMMUV3(obj);
|
||||
SMMUv3Class *c = ARM_SMMUV3_GET_CLASS(s);
|
||||
|
||||
if (c->parent_phases.hold) {
|
||||
c->parent_phases.hold(obj);
|
||||
c->parent_phases.hold(obj, type);
|
||||
}
|
||||
|
||||
smmuv3_init_regs(s);
|
||||
|
|
|
@ -394,7 +394,7 @@ static void stellaris_sys_reset_enter(Object *obj, ResetType type)
|
|||
s->dcgc[0] = 1;
|
||||
}
|
||||
|
||||
static void stellaris_sys_reset_hold(Object *obj)
|
||||
static void stellaris_sys_reset_hold(Object *obj, ResetType type)
|
||||
{
|
||||
ssys_state *s = STELLARIS_SYS(obj);
|
||||
|
||||
|
@ -402,7 +402,7 @@ static void stellaris_sys_reset_hold(Object *obj)
|
|||
ssys_calculate_system_clock(s, true);
|
||||
}
|
||||
|
||||
static void stellaris_sys_reset_exit(Object *obj)
|
||||
static void stellaris_sys_reset_exit(Object *obj, ResetType type)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -618,7 +618,7 @@ static void stellaris_i2c_reset_enter(Object *obj, ResetType type)
|
|||
i2c_end_transfer(s->bus);
|
||||
}
|
||||
|
||||
static void stellaris_i2c_reset_hold(Object *obj)
|
||||
static void stellaris_i2c_reset_hold(Object *obj, ResetType type)
|
||||
{
|
||||
stellaris_i2c_state *s = STELLARIS_I2C(obj);
|
||||
|
||||
|
@ -631,7 +631,7 @@ static void stellaris_i2c_reset_hold(Object *obj)
|
|||
s->mcr = 0;
|
||||
}
|
||||
|
||||
static void stellaris_i2c_reset_exit(Object *obj)
|
||||
static void stellaris_i2c_reset_exit(Object *obj, ResetType type)
|
||||
{
|
||||
stellaris_i2c_state *s = STELLARIS_I2C(obj);
|
||||
|
||||
|
@ -787,7 +787,7 @@ static void stellaris_adc_trigger(void *opaque, int irq, int level)
|
|||
}
|
||||
}
|
||||
|
||||
static void stellaris_adc_reset_hold(Object *obj)
|
||||
static void stellaris_adc_reset_hold(Object *obj, ResetType type)
|
||||
{
|
||||
StellarisADCState *s = STELLARIS_ADC(obj);
|
||||
int n;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue