motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 20:33:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hpet: do not overwrite properties on post_load

Browse source 
Migration relies on having the same device configuration on the source
and destination.  Therefore, there is no need to modify flags,
timer capabilities and the fw_cfg HPET block id on migration;
it was set to exactly the same values by realize.

Reviewed-by: Zhao Liu <zhao1.liu@intel.com> (hpet_post_load only)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-12-05 21:25:39 +01:00
parent 36324c6774
commit 1433e38cc8
1 changed files with 10 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

38
hw/timer/hpet.c
View file

@ -77,6 +77,7 @@ struct HPETState {
uint8_t rtc_irq_level; uint8_t rtc_irq_level;
qemu_irq pit_enabled; qemu_irq pit_enabled;
uint8_t num_timers; uint8_t num_timers;
uint8_t num_timers_save;
uint32_t intcap; uint32_t intcap;
HPETTimer timer[HPET_MAX_TIMERS]; HPETTimer timer[HPET_MAX_TIMERS];
@ -237,15 +238,12 @@ static int hpet_pre_save(void *opaque)
s->hpet_counter = hpet_get_ticks(s); s->hpet_counter = hpet_get_ticks(s);
} }
return 0; /*
} * The number of timers must match on source and destination, but it was
* also added to the migration stream. Check that it matches the value
static int hpet_pre_load(void *opaque) * that was configured.
{ */
HPETState *s = opaque; s->num_timers_save = s->num_timers;
/* version 1 only supports 3, later versions will load the actual value */
s->num_timers = HPET_MIN_TIMERS;
return 0; return 0;
} }
@ -253,12 +251,7 @@ static bool hpet_validate_num_timers(void *opaque, int version_id)
{ {
HPETState *s = opaque; HPETState *s = opaque;
if (s->num_timers < HPET_MIN_TIMERS) { return s->num_timers == s->num_timers_save;
return false;
} else if (s->num_timers > HPET_MAX_TIMERS) {
return false;
}
return true;
} }
static int hpet_post_load(void *opaque, int version_id) static int hpet_post_load(void *opaque, int version_id)
@ -277,16 +270,6 @@ static int hpet_post_load(void *opaque, int version_id)
- qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
} }
/* Push number of timers into capability returned via HPET_ID */
s->capability &= ~HPET_ID_NUM_TIM_MASK;
s->capability |= (s->num_timers - 1) << HPET_ID_NUM_TIM_SHIFT;
hpet_fw_cfg.hpet[s->hpet_id].event_timer_block_id = (uint32_t)s->capability;
/* Derive HPET_MSI_SUPPORT from the capability of the first timer. */
s->flags &= ~(1 << HPET_MSI_SUPPORT);
if (s->timer[0].config & HPET_TN_FSB_CAP) {
s->flags |= 1 << HPET_MSI_SUPPORT;
}
return 0; return 0;
} }
@ -347,14 +330,13 @@ static const VMStateDescription vmstate_hpet = {
.version_id = 2, .version_id = 2,
.minimum_version_id = 1, .minimum_version_id = 1,
.pre_save = hpet_pre_save, .pre_save = hpet_pre_save,
.pre_load = hpet_pre_load,
.post_load = hpet_post_load, .post_load = hpet_post_load,
.fields = (const VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT64(config, HPETState), VMSTATE_UINT64(config, HPETState),
VMSTATE_UINT64(isr, HPETState), VMSTATE_UINT64(isr, HPETState),
VMSTATE_UINT64(hpet_counter, HPETState), VMSTATE_UINT64(hpet_counter, HPETState),
VMSTATE_UINT8_V(num_timers, HPETState, 2), VMSTATE_UINT8_V(num_timers_save, HPETState, 2),
VMSTATE_VALIDATE("num_timers in range", hpet_validate_num_timers), VMSTATE_VALIDATE("num_timers must match", hpet_validate_num_timers),
VMSTATE_STRUCT_VARRAY_UINT8(timer, HPETState, num_timers, 0, VMSTATE_STRUCT_VARRAY_UINT8(timer, HPETState, num_timers, 0,
vmstate_hpet_timer, HPETTimer), vmstate_hpet_timer, HPETTimer),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()