diff mbox series

lasi: fix RTC

Message ID 20230330120319.36069-1-pbonzini@redhat.com
State New
Headers show
Series lasi: fix RTC | expand

Commit Message

Paolo Bonzini March 30, 2023, 12:03 p.m. UTC 
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 <pbonzini@redhat.com>
---
 hw/misc/lasi.c         | 2 +-
 include/hw/misc/lasi.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Comments

Peter Maydell March 30, 2023, 12:05 p.m. UTC | #1 
On Thu, 30 Mar 2023 at 13:03, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> 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 <pbonzini@redhat.com>
> ---
>  hw/misc/lasi.c         | 2 +-
>  include/hw/misc/lasi.h | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/hw/misc/lasi.c b/hw/misc/lasi.c
> index 23a7634a8c3a..5d07bc801a84 100644
> --- a/hw/misc/lasi.c
> +++ b/hw/misc/lasi.c
> @@ -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).

>  };

thanks
-- PMM
diff mbox series

Patch

diff --git a/hw/misc/lasi.c b/hw/misc/lasi.c
index 23a7634a8c3a..5d07bc801a84 100644
--- a/hw/misc/lasi.c
+++ b/hw/misc/lasi.c
@@ -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;
 }
 
diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h
index ecc7065ce858..0a8c7352be21 100644
--- a/include/hw/misc/lasi.h
+++ b/include/hw/misc/lasi.h
@@ -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;
 };