target/ppc: Constify VMState in machine.c
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20231221031652.119827-15-richard.henderson@linaro.org>
This commit is contained in:
parent
c9e763b010
commit
caae239633
@ -351,7 +351,7 @@ static const VMStateDescription vmstate_fpu = {
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = fpu_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_FPR_ARRAY(env.vsr, PowerPCCPU, 32),
|
||||
VMSTATE_UINTTL(env.fpscr, PowerPCCPU),
|
||||
VMSTATE_END_OF_LIST()
|
||||
@ -392,7 +392,7 @@ static const VMStateDescription vmstate_altivec = {
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = altivec_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_AVR_ARRAY(env.vsr, PowerPCCPU, 32),
|
||||
/*
|
||||
* Save the architecture value of the vscr, not the internally
|
||||
@ -425,7 +425,7 @@ static const VMStateDescription vmstate_vsx = {
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = vsx_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_VSR_ARRAY(env.vsr, PowerPCCPU, 32),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
@ -445,7 +445,7 @@ static const VMStateDescription vmstate_tm = {
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = tm_needed,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (const VMStateField []) {
|
||||
VMSTATE_UINTTL_ARRAY(env.tm_gpr, PowerPCCPU, 32),
|
||||
VMSTATE_AVR_ARRAY(env.tm_vsr, PowerPCCPU, 64),
|
||||
VMSTATE_UINT64(env.tm_cr, PowerPCCPU),
|
||||
@ -479,7 +479,7 @@ static const VMStateDescription vmstate_sr = {
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = sr_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINTTL_ARRAY(env.sr, PowerPCCPU, 32),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
@ -553,7 +553,7 @@ static const VMStateDescription vmstate_slb = {
|
||||
.minimum_version_id = 1,
|
||||
.needed = slb_needed,
|
||||
.post_load = slb_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_INT32_TEST(mig_slb_nr, PowerPCCPU, cpu_pre_3_0_migration),
|
||||
VMSTATE_SLB_ARRAY(env.slb, PowerPCCPU, MAX_SLB_ENTRIES),
|
||||
VMSTATE_END_OF_LIST()
|
||||
@ -565,7 +565,7 @@ static const VMStateDescription vmstate_tlb6xx_entry = {
|
||||
.name = "cpu/tlb6xx_entry",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINTTL(pte0, ppc6xx_tlb_t),
|
||||
VMSTATE_UINTTL(pte1, ppc6xx_tlb_t),
|
||||
VMSTATE_UINTTL(EPN, ppc6xx_tlb_t),
|
||||
@ -586,7 +586,7 @@ static const VMStateDescription vmstate_tlb6xx = {
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = tlb6xx_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU, NULL),
|
||||
VMSTATE_STRUCT_VARRAY_POINTER_INT32(env.tlb.tlb6, PowerPCCPU,
|
||||
env.nb_tlb,
|
||||
@ -601,7 +601,7 @@ static const VMStateDescription vmstate_tlbemb_entry = {
|
||||
.name = "cpu/tlbemb_entry",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT64(RPN, ppcemb_tlb_t),
|
||||
VMSTATE_UINTTL(EPN, ppcemb_tlb_t),
|
||||
VMSTATE_UINTTL(PID, ppcemb_tlb_t),
|
||||
@ -625,7 +625,7 @@ static const VMStateDescription vmstate_tlbemb = {
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = tlbemb_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU, NULL),
|
||||
VMSTATE_STRUCT_VARRAY_POINTER_INT32(env.tlb.tlbe, PowerPCCPU,
|
||||
env.nb_tlb,
|
||||
@ -639,7 +639,7 @@ static const VMStateDescription vmstate_tlbmas_entry = {
|
||||
.name = "cpu/tlbmas_entry",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(mas8, ppcmas_tlb_t),
|
||||
VMSTATE_UINT32(mas1, ppcmas_tlb_t),
|
||||
VMSTATE_UINT64(mas2, ppcmas_tlb_t),
|
||||
@ -661,7 +661,7 @@ static const VMStateDescription vmstate_tlbmas = {
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = tlbmas_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU, NULL),
|
||||
VMSTATE_STRUCT_VARRAY_POINTER_INT32(env.tlb.tlbm, PowerPCCPU,
|
||||
env.nb_tlb,
|
||||
@ -684,7 +684,7 @@ static const VMStateDescription vmstate_compat = {
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = compat_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(compat_pvr, PowerPCCPU),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
@ -700,7 +700,7 @@ static const VMStateDescription vmstate_reservation = {
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = reservation_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINTTL(env.reserve_addr, PowerPCCPU),
|
||||
VMSTATE_UINTTL(env.reserve_length, PowerPCCPU),
|
||||
VMSTATE_UINTTL(env.reserve_val, PowerPCCPU),
|
||||
@ -717,7 +717,7 @@ const VMStateDescription vmstate_ppc_cpu = {
|
||||
.minimum_version_id = 5,
|
||||
.pre_save = cpu_pre_save,
|
||||
.post_load = cpu_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UNUSED(sizeof(target_ulong)), /* was _EQUAL(env.spr[SPR_PVR]) */
|
||||
|
||||
/* User mode architected state */
|
||||
@ -748,7 +748,7 @@ const VMStateDescription vmstate_ppc_cpu = {
|
||||
VMSTATE_UINT32_TEST(mig_nb_BATs, PowerPCCPU, cpu_pre_2_8_migration),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
.subsections = (const VMStateDescription*[]) {
|
||||
.subsections = (const VMStateDescription * const []) {
|
||||
&vmstate_fpu,
|
||||
&vmstate_altivec,
|
||||
&vmstate_vsx,
|
||||
|
Loading…
Reference in New Issue
Block a user