[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/28] vmstate: make incompatible change for sparc
|
From: |
Juan Quintela |
|
Subject: |
[Qemu-devel] [PATCH 17/28] vmstate: make incompatible change for sparc |
|
Date: |
Wed, 26 Oct 2011 22:16:31 +0200 |
With this change, we sent arrays as arrays, making state description
much simpler. The change is incompatible, but as far as I know, sparc
don't care about migration compatibility beteween versions.
Signed-off-by: Juan Quintela <address@hidden>
---
target-sparc/machine.c | 172 +++---------------------------------------------
1 files changed, 9 insertions(+), 163 deletions(-)
diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index 5ba098e..e3e57b5 100644
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -74,9 +74,9 @@ static int cpu_post_load(void *opaque, int version_id)
const VMStateDescription vmstate_cpu = {
.name = "cpu",
- .version_id = 7,
- .minimum_version_id = 7,
- .minimum_version_id_old = 7,
+ .version_id = 8,
+ .minimum_version_id = 8,
+ .minimum_version_id_old = 8,
.pre_save = cpu_pre_save,
.post_load = cpu_post_load,
.fields = (VMStateField[]) {
@@ -106,166 +106,12 @@ const VMStateDescription vmstate_cpu = {
VMSTATE_UINT64_ARRAY(mmubpregs, CPUState, 4),
#else
VMSTATE_UINT64(lsu, CPUState),
- VMSTATE_UINT64(immuregs[0], CPUState),
- VMSTATE_UINT64(dmmuregs[0], CPUState),
- VMSTATE_UINT64(immuregs[1], CPUState),
- VMSTATE_UINT64(dmmuregs[1], CPUState),
- VMSTATE_UINT64(immuregs[2], CPUState),
- VMSTATE_UINT64(dmmuregs[2], CPUState),
- VMSTATE_UINT64(immuregs[3], CPUState),
- VMSTATE_UINT64(dmmuregs[3], CPUState),
- VMSTATE_UINT64(immuregs[4], CPUState),
- VMSTATE_UINT64(dmmuregs[4], CPUState),
- VMSTATE_UINT64(immuregs[5], CPUState),
- VMSTATE_UINT64(dmmuregs[5], CPUState),
- VMSTATE_UINT64(immuregs[6], CPUState),
- VMSTATE_UINT64(dmmuregs[6], CPUState),
- VMSTATE_UINT64(immuregs[7], CPUState),
- VMSTATE_UINT64(dmmuregs[7], CPUState),
- VMSTATE_UINT64(immuregs[8], CPUState),
- VMSTATE_UINT64(dmmuregs[8], CPUState),
- VMSTATE_UINT64(immuregs[9], CPUState),
- VMSTATE_UINT64(dmmuregs[9], CPUState),
- VMSTATE_UINT64(immuregs[10], CPUState),
- VMSTATE_UINT64(dmmuregs[10], CPUState),
- VMSTATE_UINT64(immuregs[11], CPUState),
- VMSTATE_UINT64(dmmuregs[11], CPUState),
- VMSTATE_UINT64(immuregs[12], CPUState),
- VMSTATE_UINT64(dmmuregs[12], CPUState),
- VMSTATE_UINT64(immuregs[13], CPUState),
- VMSTATE_UINT64(dmmuregs[13], CPUState),
- VMSTATE_UINT64(immuregs[14], CPUState),
- VMSTATE_UINT64(dmmuregs[14], CPUState),
- VMSTATE_UINT64(immuregs[15], CPUState),
- VMSTATE_UINT64(dmmuregs[15], CPUState),
- VMSTATE_STRUCT(itlb[0], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[0], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(itlb[1], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[1], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(itlb[2], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[2], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(itlb[3], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[3], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(itlb[4], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[4], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(itlb[5], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[5], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(itlb[6], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[6], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(itlb[7], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[7], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(itlb[8], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[8], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(itlb[9], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[9], CPUState, 0, vmstate_tlb_entry, SparcTLBEntry),
- VMSTATE_STRUCT(itlb[10], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[10], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[11], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[11], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[12], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[12], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[13], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[13], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[14], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[14], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[15], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[15], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[16], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[16], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[17], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[17], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[18], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[18], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[19], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[19], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[20], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[20], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[21], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[21], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[22], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[22], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[23], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[23], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[24], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[24], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[25], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[25], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[26], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[26], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[27], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[27], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[28], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[28], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[29], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[29], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[30], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[30], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[31], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[31], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[32], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[32], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[33], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[33], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[34], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[34], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[35], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[35], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[36], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[36], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[37], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[37], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[38], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[38], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[39], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[39], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[40], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[40], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[41], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[41], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[42], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[42], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[43], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[43], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[44], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[44], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[45], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[45], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[46], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[46], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[47], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[47], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[48], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[48], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[49], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[49], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[50], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[50], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[51], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[51], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[52], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[52], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[53], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[53], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[54], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[54], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[55], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[55], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[56], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[56], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[57], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[57], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[58], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[58], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[59], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[59], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[60], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[60], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[61], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[61], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[62], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[62], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(itlb[63], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
- VMSTATE_STRUCT(dtlb[63], CPUState, 0, vmstate_tlb_entry,
SparcTLBEntry),
+ VMSTATE_UINT64_ARRAY(immuregs, CPUState, 16),
+ VMSTATE_UINT64_ARRAY(dmmuregs, CPUState, 16),
+ VMSTATE_STRUCT_ARRAY(itlb, CPUState, 64, 0,
+ vmstate_tlb_entry, SparcTLBEntry),
+ VMSTATE_STRUCT_ARRAY(dtlb, CPUState, 64, 0,
+ vmstate_tlb_entry, SparcTLBEntry),
VMSTATE_UINT32(mmu_version, CPUState),
VMSTATE_STRUCT_ARRAY(ts, CPUState, MAXTL_MAX, 0,
vmstate_trap_state, trap_state),
--
1.7.6.4
- [Qemu-devel] [PATCH 19/28] mips: make mvp an embedded struct instead of pointer, (continued)
- [Qemu-devel] [PATCH 19/28] mips: make mvp an embedded struct instead of pointer, Juan Quintela, 2011/10/26
- [Qemu-devel] [PATCH 20/28] mips: make tlb an embedded struct instead of a pointer, Juan Quintela, 2011/10/26
- [Qemu-devel] [PATCH 21/28] mips: bump migration version to 4, Juan Quintela, 2011/10/26
- [Qemu-devel] [PATCH 22/28] vmstate: port mips cpu, Juan Quintela, 2011/10/26
- [Qemu-devel] [PATCH 23/28] arm: save always 32 fpu registers, Juan Quintela, 2011/10/26
- [Qemu-devel] [PATCH 24/28] vmstate: port arm cpu, Juan Quintela, 2011/10/26
- [Qemu-devel] [PATCH 25/28] vmstate: all cpus converted, Juan Quintela, 2011/10/26
- [Qemu-devel] [PATCH 26/28] vmstate: fix vmstate formating for i386, Juan Quintela, 2011/10/26
- [Qemu-devel] [PATCH 27/28] vmstate: remove unneeded includes from target-*/machine.c, Juan Quintela, 2011/10/26
- [Qemu-devel] [PATCH 28/28] vmstate: rename machine.c to vmstate.c, Juan Quintela, 2011/10/26
- [Qemu-devel] [PATCH 17/28] vmstate: make incompatible change for sparc,
Juan Quintela <=