lasi: fix RTC
PATCH 1/1 lasi: fix RTC
Migrate rtc_ref (which only needs to be 32-bit because it is summed to a 32-bit register) and drop the write-only field rtc from LasiState.
Signed-off-by Paolo Bonzini <[email protected]>
--- hw/misc/lasi.c | 2 +- include/hw/misc/lasi.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
hw/misc/lasi.c +1 -1
@@ -204,6 +204,7 @@ static const VMStateDescription vmstate_lasi = {VMSTATE_UINT32 (iar, LasiState),VMSTATE_UINT32 (errlog, LasiState),VMSTATE_UINT32 (amr, LasiState), +VMSTATE_UINT32 (rtc_ref, LasiState), VMSTATE_END_OF_LIST() } };
@@ -233,7 +234,6 @@ static void lasi_reset(DeviceState *dev) s->iar =0xFFFB0000 +3 ;/* CPU_HPA + 3 */ /* Real time clock (RTC), it's only one 32-bit counter @9000 */ - s->rtc =time (NULL ); s->rtc_ref =0 ; }
include/hw/misc/lasi.h +1 -2
@@ -69,8 +69,7 @@ struct LasiState {uint32_t errlog;uint32_t amr; -uint32_t rtc; -time_t rtc_ref; +uint32_t rtc_ref;MemoryRegion this_mem; };
Signature · 1 line
2.39.2
Quoted 15 lines · Paolo Bonzini
Migrate
rtc_ref(which only needs to be 32-bit because it is summed to a 32-bit register) and drop the write-only field rtc from LasiState.Signed-off-by Paolo Bonzini <[email protected]>--- hw/misc/lasi.c | 2 +- include/hw/misc/lasi.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)hw/misc/lasi.c +0
-0
hw/misc/lasi.c static const VMStateDescription vmstate_lasi = { · line 209
Quoted 6 lines
hw/misc/lasi.c +1
-0@@ -204,6 +204,7 @@ static const VMStateDescription vmstate_lasi = {VMSTATE_UINT32 (iar, LasiState),VMSTATE_UINT32 (errlog, LasiState),VMSTATE_UINT32 (amr, LasiState), +VMSTATE_UINT32 (rtc_ref, LasiState), VMSTATE_END_OF_LIST() }
This is a migration compat break -- the commit message should explain why this is OK to do (and the version number should probably be bumped too).
hw/misc/lasi.c static const VMStateDescription vmstate_lasi = { · line 210
Quoted 1 line
hw/misc/lasi.c +0
-0};
thanks
-- PMM