[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/25] lasi: fix RTC migration
From: |
Paolo Bonzini |
Subject: |
[PULL 09/25] lasi: fix RTC migration |
Date: |
Fri, 21 Apr 2023 11:33:00 +0200 |
Migrate rtc_ref (which only needs to be 32-bit because it is summed to
a 32-bit register), which requires bumping the migration version.
The HPPA machine does not have versioned machine types so it is okay
to block migration to old versions of QEMU.
While at it, drop the write-only field rtc from LasiState.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/misc/lasi.c | 4 ++--
include/hw/misc/lasi.h | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/misc/lasi.c b/hw/misc/lasi.c
index 23a7634a8c3a..ff9dc893ae65 100644
--- a/hw/misc/lasi.c
+++ b/hw/misc/lasi.c
@@ -194,7 +194,7 @@ static const MemoryRegionOps lasi_chip_ops = {
static const VMStateDescription vmstate_lasi = {
.name = "Lasi",
- .version_id = 1,
+ .version_id = 2,
.minimum_version_id = 1,
.fields = (VMStateField[]) {
VMSTATE_UINT32(irr, LasiState),
@@ -204,6 +204,7 @@ static const VMStateDescription vmstate_lasi = {
VMSTATE_UINT32(iar, LasiState),
VMSTATE_UINT32(errlog, LasiState),
VMSTATE_UINT32(amr, LasiState),
+ VMSTATE_UINT32_V(rtc_ref, LasiState, 2),
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;
};
--
2.40.0
- [PULL 00/25] First batch of misc patches for QEMU 8.1, Paolo Bonzini, 2023/04/21
- [PULL 01/25] mtest2make.py: teach suite name that are just "PROJECT", Paolo Bonzini, 2023/04/21
- [PULL 02/25] build-sys: prevent meson from downloading wrapped subprojects, Paolo Bonzini, 2023/04/21
- [PULL 03/25] build-sys: add slirp.wrap, Paolo Bonzini, 2023/04/21
- [PULL 05/25] vnc: avoid underflow when accessing user-provided address, Paolo Bonzini, 2023/04/21
- [PULL 04/25] nvme: remove constant argument to tracepoint, Paolo Bonzini, 2023/04/21
- [PULL 06/25] tests: bios-tables-test: replace memset with initializer, Paolo Bonzini, 2023/04/21
- [PULL 07/25] configure: Avoid -Werror=maybe-uninitialized, Paolo Bonzini, 2023/04/21
- [PULL 09/25] lasi: fix RTC migration,
Paolo Bonzini <=
- [PULL 08/25] target/i386: Avoid unreachable variable declaration in mmu_translate(), Paolo Bonzini, 2023/04/21
- [PULL 11/25] target/mips: tcg: detect out-of-bounds accesses to cpu_gpr and cpu_gpr_hi, Paolo Bonzini, 2023/04/21
- [PULL 10/25] coverity: update COMPONENTS.md, Paolo Bonzini, 2023/04/21
- [PULL 13/25] io: mark mixed functions that can suspend, Paolo Bonzini, 2023/04/21
- [PULL 12/25] qapi-gen: mark coroutine QMP command functions as coroutine_fn, Paolo Bonzini, 2023/04/21
- [PULL 18/25] postcopy-ram: do not use qatomic_mb_read, Paolo Bonzini, 2023/04/21
- [PULL 14/25] migration: mark mixed functions that can suspend, Paolo Bonzini, 2023/04/21
- [PULL 15/25] monitor: mark mixed functions that can suspend, Paolo Bonzini, 2023/04/21
- [PULL 16/25] target/i386: Change wrong XFRM value in SGX CPUID leaf, Paolo Bonzini, 2023/04/21
- [PULL 17/25] block-backend: remove qatomic_mb_read(), Paolo Bonzini, 2023/04/21