[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/35] mips: bump migration version to 4
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 20/35] mips: bump migration version to 4 |
Date: |
Fri, 4 May 2012 12:54:47 +0200 |
bcond state was stored as int32, but it is target_ulong. Change migration state
to reflect that.
Signed-off-by: Juan Quintela <address@hidden>
---
target-mips/cpu.h | 2 +-
target-mips/machine.c | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index aea2c5b..c77d270 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -502,7 +502,7 @@ void mips_cpu_list (FILE *f, fprintf_function cpu_fprintf);
#define cpu_signal_handler cpu_mips_signal_handler
#define cpu_list mips_cpu_list
-#define CPU_SAVE_VERSION 3
+#define CPU_SAVE_VERSION 4
/* MMU modes definitions. We carefully match the indices with our
hflags layout. */
diff --git a/target-mips/machine.c b/target-mips/machine.c
index 4a1d2d8..8b9c0fb 100644
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@@ -84,8 +84,7 @@ void cpu_save(QEMUFile *f, void *opaque)
qemu_put_sbe32s(f, &env->error_code);
qemu_put_be32s(f, &env->hflags);
qemu_put_betls(f, &env->btarget);
- i = env->bcond;
- qemu_put_sbe32s(f, &i);
+ qemu_put_betls(f, &env->bcond);
/* Save remaining CP1 registers */
qemu_put_sbe32s(f, &env->CP0_Index);
@@ -193,9 +192,9 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
CPUMIPSState *env = opaque;
int i;
- if (version_id != 3)
+ if (version_id != 4) {
return -EINVAL;
-
+ }
/* Load active TC */
load_tc(f, &env->active_tc);
@@ -236,8 +235,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
qemu_get_sbe32s(f, &env->error_code);
qemu_get_be32s(f, &env->hflags);
qemu_get_betls(f, &env->btarget);
- qemu_get_sbe32s(f, &i);
- env->bcond = i;
+ qemu_get_betls(f, &env->bcond);
/* Load remaining CP1 registers */
qemu_get_sbe32s(f, &env->CP0_Index);
--
1.7.7.6
- Re: [Qemu-devel] [PATCH 16/35] vmstate: make incompatible change for sparc, (continued)
- [Qemu-devel] [PATCH 17/35] mips_fulong2e: cpu vmstate already registered in cpu_exec_init, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 15/35] vmstate: port sparc cpu, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 22/35] arm: save always 32 fpu registers, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 09/35] vmstate: introduce float64 arrays, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 19/35] mips: make tlb an embedded struct instead of a pointer, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 20/35] mips: bump migration version to 4,
Juan Quintela <=
- [Qemu-devel] [PATCH 18/35] mips: make mvp an embedded struct instead of a pointer, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 26/35] vmstate: remove unneeded includes from target-*/machine.c, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 24/35] vmstate: all cpus converted, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 29/35] vmstate: Add copyright info for lm32 processor, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 21/35] vmstate: port mips cpu, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 23/35] vmstate: port arm cpu, Juan Quintela, 2012/05/04
- [Qemu-devel] [PATCH 30/35] vmstate: Add copyright info for cris processor, Juan Quintela, 2012/05/04