From: Zhao Liu <zhao1.liu@intel.com>
To: Richard Henderson <richard.henderson@linaro.org>
Cc: qemu-devel@nongnu.org
Subject: Re: [PATCH v2 08/71] target/i386: Constify VMState in machine.c
Date: Fri, 22 Dec 2023 10:51:59 +0800 [thread overview]
Message-ID: <ZYT5z600GuyNEEpa@intel.com> (raw)
In-Reply-To: <20231221031652.119827-9-richard.henderson@linaro.org>
On Thu, Dec 21, 2023 at 02:15:49PM +1100, Richard Henderson wrote:
> Date: Thu, 21 Dec 2023 14:15:49 +1100
> From: Richard Henderson <richard.henderson@linaro.org>
> Subject: [PATCH v2 08/71] target/i386: Constify VMState in machine.c
> X-Mailer: git-send-email 2.34.1
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
> target/i386/machine.c | 128 +++++++++++++++++++++---------------------
> 1 file changed, 64 insertions(+), 64 deletions(-)
>
> diff --git a/target/i386/machine.c b/target/i386/machine.c
> index a1041ef828..c3ae320814 100644
> --- a/target/i386/machine.c
> +++ b/target/i386/machine.c
> @@ -18,7 +18,7 @@ static const VMStateDescription vmstate_segment = {
> .name = "segment",
> .version_id = 1,
> .minimum_version_id = 1,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT32(selector, SegmentCache),
> VMSTATE_UINTTL(base, SegmentCache),
> VMSTATE_UINT32(limit, SegmentCache),
> @@ -43,7 +43,7 @@ static const VMStateDescription vmstate_xmm_reg = {
> .name = "xmm_reg",
> .version_id = 1,
> .minimum_version_id = 1,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(ZMM_Q(0), ZMMReg),
> VMSTATE_UINT64(ZMM_Q(1), ZMMReg),
> VMSTATE_END_OF_LIST()
> @@ -59,7 +59,7 @@ static const VMStateDescription vmstate_ymmh_reg = {
> .name = "ymmh_reg",
> .version_id = 1,
> .minimum_version_id = 1,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(ZMM_Q(2), ZMMReg),
> VMSTATE_UINT64(ZMM_Q(3), ZMMReg),
> VMSTATE_END_OF_LIST()
> @@ -74,7 +74,7 @@ static const VMStateDescription vmstate_zmmh_reg = {
> .name = "zmmh_reg",
> .version_id = 1,
> .minimum_version_id = 1,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(ZMM_Q(4), ZMMReg),
> VMSTATE_UINT64(ZMM_Q(5), ZMMReg),
> VMSTATE_UINT64(ZMM_Q(6), ZMMReg),
> @@ -92,7 +92,7 @@ static const VMStateDescription vmstate_hi16_zmm_reg = {
> .name = "hi16_zmm_reg",
> .version_id = 1,
> .minimum_version_id = 1,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(ZMM_Q(0), ZMMReg),
> VMSTATE_UINT64(ZMM_Q(1), ZMMReg),
> VMSTATE_UINT64(ZMM_Q(2), ZMMReg),
> @@ -114,7 +114,7 @@ static const VMStateDescription vmstate_bnd_regs = {
> .name = "bnd_regs",
> .version_id = 1,
> .minimum_version_id = 1,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(lb, BNDReg),
> VMSTATE_UINT64(ub, BNDReg),
> VMSTATE_END_OF_LIST()
> @@ -128,7 +128,7 @@ static const VMStateDescription vmstate_mtrr_var = {
> .name = "mtrr_var",
> .version_id = 1,
> .minimum_version_id = 1,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(base, MTRRVar),
> VMSTATE_UINT64(mask, MTRRVar),
> VMSTATE_END_OF_LIST()
> @@ -142,7 +142,7 @@ static const VMStateDescription vmstate_lbr_records_var = {
> .name = "lbr_records_var",
> .version_id = 1,
> .minimum_version_id = 1,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(from, LBREntry),
> VMSTATE_UINT64(to, LBREntry),
> VMSTATE_UINT64(info, LBREntry),
> @@ -201,7 +201,7 @@ static const VMStateDescription vmstate_fpreg_tmp = {
> .name = "fpreg_tmp",
> .post_load = fpreg_post_load,
> .pre_save = fpreg_pre_save,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(tmp_mant, x86_FPReg_tmp),
> VMSTATE_UINT16(tmp_exp, x86_FPReg_tmp),
> VMSTATE_END_OF_LIST()
> @@ -210,7 +210,7 @@ static const VMStateDescription vmstate_fpreg_tmp = {
>
> static const VMStateDescription vmstate_fpreg = {
> .name = "fpreg",
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_WITH_TMP(FPReg, x86_FPReg_tmp, vmstate_fpreg_tmp),
> VMSTATE_END_OF_LIST()
> }
> @@ -453,7 +453,7 @@ static const VMStateDescription vmstate_exception_info = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = exception_info_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT8(env.exception_pending, X86CPU),
> VMSTATE_UINT8(env.exception_injected, X86CPU),
> VMSTATE_UINT8(env.exception_has_payload, X86CPU),
> @@ -475,7 +475,7 @@ static const VMStateDescription vmstate_steal_time_msr = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = steal_time_msr_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.steal_time_msr, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -486,7 +486,7 @@ static const VMStateDescription vmstate_async_pf_msr = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = async_pf_msr_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.async_pf_en_msr, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -497,7 +497,7 @@ static const VMStateDescription vmstate_async_pf_int_msr = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = async_pf_int_msr_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.async_pf_int_msr, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -508,7 +508,7 @@ static const VMStateDescription vmstate_pv_eoi_msr = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = pv_eoi_msr_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.pv_eoi_en_msr, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -519,7 +519,7 @@ static const VMStateDescription vmstate_poll_control_msr = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = poll_control_msr_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.poll_control_msr, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -538,7 +538,7 @@ static const VMStateDescription vmstate_fpop_ip_dp = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = fpop_ip_dp_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT16(env.fpop, X86CPU),
> VMSTATE_UINT64(env.fpip, X86CPU),
> VMSTATE_UINT64(env.fpdp, X86CPU),
> @@ -559,7 +559,7 @@ static const VMStateDescription vmstate_msr_tsc_adjust = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = tsc_adjust_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.tsc_adjust, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -578,7 +578,7 @@ static const VMStateDescription vmstate_msr_smi_count = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = msr_smi_count_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_smi_count, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -597,7 +597,7 @@ static const VMStateDescription vmstate_msr_tscdeadline = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = tscdeadline_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.tsc_deadline, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -624,7 +624,7 @@ static const VMStateDescription vmstate_msr_ia32_misc_enable = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = misc_enable_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_ia32_misc_enable, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -635,7 +635,7 @@ static const VMStateDescription vmstate_msr_ia32_feature_control = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = feature_control_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_ia32_feature_control, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -670,7 +670,7 @@ static const VMStateDescription vmstate_msr_architectural_pmu = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = pmu_enable_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_fixed_ctr_ctrl, X86CPU),
> VMSTATE_UINT64(env.msr_global_ctrl, X86CPU),
> VMSTATE_UINT64(env.msr_global_status, X86CPU),
> @@ -706,7 +706,7 @@ static const VMStateDescription vmstate_mpx = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = mpx_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_BND_REGS(env.bnd_regs, X86CPU, 4),
> VMSTATE_UINT64(env.bndcs_regs.cfgu, X86CPU),
> VMSTATE_UINT64(env.bndcs_regs.sts, X86CPU),
> @@ -728,7 +728,7 @@ static const VMStateDescription vmstate_msr_hyperv_hypercall = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = hyperv_hypercall_enable_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU),
> VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU),
> VMSTATE_END_OF_LIST()
> @@ -748,7 +748,7 @@ static const VMStateDescription vmstate_msr_hyperv_vapic = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = hyperv_vapic_enable_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_hv_vapic, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -767,7 +767,7 @@ static const VMStateDescription vmstate_msr_hyperv_time = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = hyperv_time_enable_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_hv_tsc, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -792,7 +792,7 @@ static const VMStateDescription vmstate_msr_hyperv_crash = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = hyperv_crash_enable_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64_ARRAY(env.msr_hv_crash_params, X86CPU, HV_CRASH_PARAMS),
> VMSTATE_END_OF_LIST()
> }
> @@ -815,7 +815,7 @@ static const VMStateDescription vmstate_msr_hyperv_runtime = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = hyperv_runtime_enable_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_hv_runtime, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -855,7 +855,7 @@ static const VMStateDescription vmstate_msr_hyperv_synic = {
> .minimum_version_id = 1,
> .needed = hyperv_synic_enable_needed,
> .post_load = hyperv_synic_post_load,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_hv_synic_control, X86CPU),
> VMSTATE_UINT64(env.msr_hv_synic_evt_page, X86CPU),
> VMSTATE_UINT64(env.msr_hv_synic_msg_page, X86CPU),
> @@ -883,7 +883,7 @@ static const VMStateDescription vmstate_msr_hyperv_stimer = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = hyperv_stimer_enable_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64_ARRAY(env.msr_hv_stimer_config, X86CPU,
> HV_STIMER_COUNT),
> VMSTATE_UINT64_ARRAY(env.msr_hv_stimer_count, X86CPU, HV_STIMER_COUNT),
> @@ -926,7 +926,7 @@ static const VMStateDescription vmstate_msr_hyperv_reenlightenment = {
> .minimum_version_id = 1,
> .needed = hyperv_reenlightenment_enable_needed,
> .post_load = hyperv_reenlightenment_post_load,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_hv_reenlightenment_control, X86CPU),
> VMSTATE_UINT64(env.msr_hv_tsc_emulation_control, X86CPU),
> VMSTATE_UINT64(env.msr_hv_tsc_emulation_status, X86CPU),
> @@ -970,7 +970,7 @@ static const VMStateDescription vmstate_avx512 = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = avx512_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64_ARRAY(env.opmask_regs, X86CPU, NB_OPMASK_REGS),
> VMSTATE_ZMMH_REGS_VARS(env.xmm_regs, X86CPU, 0),
> #ifdef TARGET_X86_64
> @@ -993,7 +993,7 @@ static const VMStateDescription vmstate_xss = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = xss_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.xss, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1012,7 +1012,7 @@ static const VMStateDescription vmstate_umwait = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = umwait_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT32(env.umwait, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1031,7 +1031,7 @@ static const VMStateDescription vmstate_pkru = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = pkru_needed,
> - .fields = (VMStateField[]){
> + .fields = (const VMStateField[]){
> VMSTATE_UINT32(env.pkru, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1050,7 +1050,7 @@ static const VMStateDescription vmstate_pkrs = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = pkrs_needed,
> - .fields = (VMStateField[]){
> + .fields = (const VMStateField[]){
> VMSTATE_UINT32(env.pkrs, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1070,7 +1070,7 @@ static const VMStateDescription vmstate_tsc_khz = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = tsc_khz_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_INT64(env.tsc_khz, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1090,7 +1090,7 @@ static const VMStateDescription vmstate_vmx_vmcs12 = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = vmx_vmcs12_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT8_ARRAY(data.vmx[0].vmcs12,
> struct kvm_nested_state,
> KVM_STATE_NESTED_VMX_VMCS_SIZE),
> @@ -1110,7 +1110,7 @@ static const VMStateDescription vmstate_vmx_shadow_vmcs12 = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = vmx_shadow_vmcs12_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT8_ARRAY(data.vmx[0].shadow_vmcs12,
> struct kvm_nested_state,
> KVM_STATE_NESTED_VMX_VMCS_SIZE),
> @@ -1131,13 +1131,13 @@ static const VMStateDescription vmstate_vmx_nested_state = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = vmx_nested_state_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_U64(hdr.vmx.vmxon_pa, struct kvm_nested_state),
> VMSTATE_U64(hdr.vmx.vmcs12_pa, struct kvm_nested_state),
> VMSTATE_U16(hdr.vmx.smm.flags, struct kvm_nested_state),
> VMSTATE_END_OF_LIST()
> },
> - .subsections = (const VMStateDescription*[]) {
> + .subsections = (const VMStateDescription * const []) {
> &vmstate_vmx_vmcs12,
> &vmstate_vmx_shadow_vmcs12,
> NULL,
> @@ -1162,7 +1162,7 @@ static const VMStateDescription vmstate_svm_nested_state = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = svm_nested_state_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_U64(hdr.svm.vmcb_pa, struct kvm_nested_state),
> VMSTATE_UINT8_ARRAY(data.svm[0].vmcb12,
> struct kvm_nested_state,
> @@ -1232,13 +1232,13 @@ static const VMStateDescription vmstate_kvm_nested_state = {
> .name = "cpu/kvm_nested_state",
> .version_id = 1,
> .minimum_version_id = 1,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_U16(flags, struct kvm_nested_state),
> VMSTATE_U16(format, struct kvm_nested_state),
> VMSTATE_U32(size, struct kvm_nested_state),
> VMSTATE_END_OF_LIST()
> },
> - .subsections = (const VMStateDescription*[]) {
> + .subsections = (const VMStateDescription * const []) {
> &vmstate_vmx_nested_state,
> &vmstate_svm_nested_state,
> NULL
> @@ -1251,7 +1251,7 @@ static const VMStateDescription vmstate_nested_state = {
> .minimum_version_id = 1,
> .needed = nested_state_needed,
> .post_load = nested_state_post_load,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_STRUCT_POINTER(env.nested_state, X86CPU,
> vmstate_kvm_nested_state,
> struct kvm_nested_state),
> @@ -1269,7 +1269,7 @@ static const VMStateDescription vmstate_xen_vcpu = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = xen_vcpu_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.xen_vcpu_info_gpa, X86CPU),
> VMSTATE_UINT64(env.xen_vcpu_info_default_gpa, X86CPU),
> VMSTATE_UINT64(env.xen_vcpu_time_info_gpa, X86CPU),
> @@ -1295,7 +1295,7 @@ static const VMStateDescription vmstate_mcg_ext_ctl = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = mcg_ext_ctl_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.mcg_ext_ctl, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1314,7 +1314,7 @@ static const VMStateDescription vmstate_spec_ctrl = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = spec_ctrl_needed,
> - .fields = (VMStateField[]){
> + .fields = (const VMStateField[]){
> VMSTATE_UINT64(env.spec_ctrl, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1334,7 +1334,7 @@ static const VMStateDescription amd_tsc_scale_msr_ctrl = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = amd_tsc_scale_msr_needed,
> - .fields = (VMStateField[]){
> + .fields = (const VMStateField[]){
> VMSTATE_UINT64(env.amd_tsc_scale_msr, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1367,7 +1367,7 @@ static const VMStateDescription vmstate_msr_intel_pt = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = intel_pt_enable_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_rtit_ctrl, X86CPU),
> VMSTATE_UINT64(env.msr_rtit_status, X86CPU),
> VMSTATE_UINT64(env.msr_rtit_output_base, X86CPU),
> @@ -1391,7 +1391,7 @@ static const VMStateDescription vmstate_msr_virt_ssbd = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = virt_ssbd_needed,
> - .fields = (VMStateField[]){
> + .fields = (const VMStateField[]){
> VMSTATE_UINT64(env.virt_ssbd, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1410,7 +1410,7 @@ static const VMStateDescription vmstate_svm_npt = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = svm_npt_needed,
> - .fields = (VMStateField[]){
> + .fields = (const VMStateField[]){
> VMSTATE_UINT64(env.nested_cr3, X86CPU),
> VMSTATE_UINT32(env.nested_pg_mode, X86CPU),
> VMSTATE_END_OF_LIST()
> @@ -1430,7 +1430,7 @@ static const VMStateDescription vmstate_svm_guest = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = svm_guest_needed,
> - .fields = (VMStateField[]){
> + .fields = (const VMStateField[]){
> VMSTATE_UINT32(env.int_ctl, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1450,7 +1450,7 @@ static const VMStateDescription vmstate_efer32 = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = intel_efer32_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.efer, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1470,7 +1470,7 @@ static const VMStateDescription vmstate_msr_tsx_ctrl = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = msr_tsx_ctrl_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT32(env.tsx_ctrl, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1489,7 +1489,7 @@ static const VMStateDescription vmstate_msr_intel_sgx = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = intel_sgx_msrs_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64_ARRAY(env.msr_ia32_sgxlepubkeyhash, X86CPU, 4),
> VMSTATE_END_OF_LIST()
> }
> @@ -1517,7 +1517,7 @@ static const VMStateDescription vmstate_pdptrs = {
> .minimum_version_id = 1,
> .needed = pdptrs_needed,
> .post_load = pdptrs_post_load,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64_ARRAY(env.pdptrs, X86CPU, 4),
> VMSTATE_END_OF_LIST()
> }
> @@ -1536,7 +1536,7 @@ static const VMStateDescription vmstate_msr_xfd = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = xfd_msrs_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_xfd, X86CPU),
> VMSTATE_UINT64(env.msr_xfd_err, X86CPU),
> VMSTATE_END_OF_LIST()
> @@ -1557,7 +1557,7 @@ static const VMStateDescription vmstate_amx_xtile = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = amx_xtile_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT8_ARRAY(env.xtilecfg, X86CPU, 64),
> VMSTATE_UINT8_ARRAY(env.xtiledata, X86CPU, 8192),
> VMSTATE_END_OF_LIST()
> @@ -1578,7 +1578,7 @@ static const VMStateDescription vmstate_arch_lbr = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = arch_lbr_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT64(env.msr_lbr_ctl, X86CPU),
> VMSTATE_UINT64(env.msr_lbr_depth, X86CPU),
> VMSTATE_LBR_VARS(env.lbr_records, X86CPU, ARCH_LBR_NR_ENTRIES, 1),
> @@ -1599,7 +1599,7 @@ static const VMStateDescription vmstate_triple_fault = {
> .version_id = 1,
> .minimum_version_id = 1,
> .needed = triple_fault_needed,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINT8(env.triple_fault_pending, X86CPU),
> VMSTATE_END_OF_LIST()
> }
> @@ -1611,7 +1611,7 @@ const VMStateDescription vmstate_x86_cpu = {
> .minimum_version_id = 11,
> .pre_save = cpu_pre_save,
> .post_load = cpu_post_load,
> - .fields = (VMStateField[]) {
> + .fields = (const VMStateField[]) {
> VMSTATE_UINTTL_ARRAY(env.regs, X86CPU, CPU_NB_REGS),
> VMSTATE_UINTTL(env.eip, X86CPU),
> VMSTATE_UINTTL(env.eflags, X86CPU),
> @@ -1699,7 +1699,7 @@ const VMStateDescription vmstate_x86_cpu = {
> VMSTATE_END_OF_LIST()
> /* The above list is not sorted /wrt version numbers, watch out! */
> },
> - .subsections = (const VMStateDescription*[]) {
> + .subsections = (const VMStateDescription * const []) {
> &vmstate_exception_info,
> &vmstate_async_pf_msr,
> &vmstate_async_pf_int_msr,
> --
> 2.34.1
>
>
next prev parent reply other threads:[~2023-12-22 2:40 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 3:15 [PATCH v2 00/71] *: Constify VMState Richard Henderson
2023-12-21 3:15 ` [PATCH v2 01/71] migration: Make VMStateDescription.subsections const Richard Henderson
2023-12-21 3:15 ` [PATCH v2 02/71] target/arm: Constify VMState in machine.c Richard Henderson
2023-12-21 3:15 ` [PATCH v2 03/71] target/arm: Constify hvf/hvf.c Richard Henderson
2023-12-21 3:15 ` [PATCH v2 04/71] target/alpha: Constify VMState in machine.c Richard Henderson
2023-12-21 3:15 ` [PATCH v2 05/71] target/avr: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 06/71] target/cris: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 07/71] target/hppa: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 08/71] target/i386: " Richard Henderson
2023-12-22 2:51 ` Zhao Liu [this message]
2023-12-21 3:15 ` [PATCH v2 09/71] target/loongarch: " Richard Henderson
2023-12-21 6:43 ` gaosong
2023-12-21 3:15 ` [PATCH v2 10/71] target/m68k: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 11/71] target/microblaze: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 12/71] target/mips: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 13/71] target/openrisc: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 14/71] target/ppc: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 15/71] target/riscv: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 16/71] target/s390x: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 17/71] target/sparc: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 18/71] hw/arm: Constify VMState Richard Henderson
2023-12-21 3:16 ` [PATCH v2 19/71] hw/core: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 20/71] hw/9pfs: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 21/71] hw/acpi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 22/71] hw/adc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 23/71] hw/audio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 24/71] hw/block: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 25/71] hw/char: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 26/71] hw/display: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 27/71] hw/dma: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 28/71] hw/gpio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 29/71] hw/hyperv: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 30/71] hw/i2c: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 31/71] hw/i386: " Richard Henderson
2023-12-22 2:54 ` Zhao Liu
2023-12-21 3:16 ` [PATCH v2 32/71] hw/ide: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 33/71] hw/input: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 34/71] hw/intc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 35/71] hw/ipack: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 36/71] hw/ipmi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 37/71] hw/isa: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 38/71] hw/loongarch: " Richard Henderson
2023-12-21 6:44 ` gaosong
2023-12-21 3:16 ` [PATCH v2 39/71] hw/m68k: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 40/71] hw/misc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 41/71] hw/net: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 42/71] hw/nvram: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 43/71] hw/openrisc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 44/71] hw/pci: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 45/71] hw/pci-bridge: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 46/71] hw/pci-host: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 47/71] hw/ppc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 48/71] hw/riscv: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 49/71] hw/rtc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 50/71] hw/s390x: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 51/71] hw/scsi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 52/71] hw/sd: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 53/71] hw/sensor: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 54/71] hw/sparc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 55/71] hw/ssi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 56/71] hw/timer: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 57/71] hw/tpm: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 58/71] hw/usb: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 59/71] hw/vfio: " Richard Henderson
2023-12-21 8:14 ` Cédric Le Goater
2023-12-21 3:16 ` [PATCH v2 60/71] hw/virtio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 61/71] hw/watchdog: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 62/71] hw/misc/macio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 63/71] audio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 64/71] backends: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 65/71] cpu-target: " Richard Henderson
2023-12-22 2:55 ` Zhao Liu
2023-12-21 3:16 ` [PATCH v2 66/71] migration: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 67/71] system: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 68/71] replay: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 69/71] util/fifo8: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 70/71] tests/unit/test-vmstate: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 71/71] docs: Constify VMstate in examples Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZYT5z600GuyNEEpa@intel.com \
--to=zhao1.liu@intel.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.