david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target-i386: kvm: 'kvm_get_supported_msrs' cleanup

Browse Source 
Function 'kvm_get_supported_msrs' is only called once
now, get rid of the static variable 'kvm_supported_msrs'.

Signed-off-by: Li Qiang <liq3ea@163.com>
Message-Id: <20190725151639.21693-1-liq3ea@163.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Li Qiang 2019-07-25 08:16:39 -07:00 committed by Paolo Bonzini
parent 98387d5802
commit de428cead6
1 changed files with 91 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
target/i386/kvm.c
View File

@ -1842,108 +1842,105 @@ static int kvm_get_supported_feature_msrs(KVMState *s)
static int kvm_get_supported_msrs(KVMState *s) static int kvm_get_supported_msrs(KVMState *s)
{ {
static int kvm_supported_msrs;
int ret = 0; int ret = 0;
struct kvm_msr_list msr_list, *kvm_msr_list;
/* first time */ /*
if (kvm_supported_msrs == 0) { * Obtain MSR list from KVM. These are the MSRs that we must
struct kvm_msr_list msr_list, *kvm_msr_list; * save/restore.
*/
msr_list.nmsrs = 0;
ret = kvm_ioctl(s, KVM_GET_MSR_INDEX_LIST, &msr_list);
if (ret < 0 && ret != -E2BIG) {
return ret;
}
/*
* Old kernel modules had a bug and could write beyond the provided
* memory. Allocate at least a safe amount of 1K.
*/
kvm_msr_list = g_malloc0(MAX(1024, sizeof(msr_list) +
msr_list.nmsrs *
sizeof(msr_list.indices[0])));
kvm_supported_msrs = -1; kvm_msr_list->nmsrs = msr_list.nmsrs;
ret = kvm_ioctl(s, KVM_GET_MSR_INDEX_LIST, kvm_msr_list);
if (ret >= 0) {
int i;
/* Obtain MSR list from KVM. These are the MSRs that we must for (i = 0; i < kvm_msr_list->nmsrs; i++) {
* save/restore */ switch (kvm_msr_list->indices[i]) {
msr_list.nmsrs = 0; case MSR_STAR:
ret = kvm_ioctl(s, KVM_GET_MSR_INDEX_LIST, &msr_list); has_msr_star = true;
if (ret < 0 && ret != -E2BIG) { break;
return ret; case MSR_VM_HSAVE_PA:
} has_msr_hsave_pa = true;
/* Old kernel modules had a bug and could write beyond the provided break;
memory. Allocate at least a safe amount of 1K. */ case MSR_TSC_AUX:
kvm_msr_list = g_malloc0(MAX(1024, sizeof(msr_list) + has_msr_tsc_aux = true;
msr_list.nmsrs * break;
sizeof(msr_list.indices[0]))); case MSR_TSC_ADJUST:
has_msr_tsc_adjust = true;
kvm_msr_list->nmsrs = msr_list.nmsrs; break;
ret = kvm_ioctl(s, KVM_GET_MSR_INDEX_LIST, kvm_msr_list); case MSR_IA32_TSCDEADLINE:
if (ret >= 0) { has_msr_tsc_deadline = true;
int i; break;
case MSR_IA32_SMBASE:
for (i = 0; i < kvm_msr_list->nmsrs; i++) { has_msr_smbase = true;
switch (kvm_msr_list->indices[i]) { break;
case MSR_STAR: case MSR_SMI_COUNT:
has_msr_star = true; has_msr_smi_count = true;
break; break;
case MSR_VM_HSAVE_PA: case MSR_IA32_MISC_ENABLE:
has_msr_hsave_pa = true; has_msr_misc_enable = true;
break; break;
case MSR_TSC_AUX: case MSR_IA32_BNDCFGS:
has_msr_tsc_aux = true; has_msr_bndcfgs = true;
break; break;
case MSR_TSC_ADJUST: case MSR_IA32_XSS:
has_msr_tsc_adjust = true; has_msr_xss = true;
break; break;
case MSR_IA32_TSCDEADLINE: case HV_X64_MSR_CRASH_CTL:
has_msr_tsc_deadline = true; has_msr_hv_crash = true;
break; break;
case MSR_IA32_SMBASE: case HV_X64_MSR_RESET:
has_msr_smbase = true; has_msr_hv_reset = true;
break; break;
case MSR_SMI_COUNT: case HV_X64_MSR_VP_INDEX:
has_msr_smi_count = true; has_msr_hv_vpindex = true;
break; break;
case MSR_IA32_MISC_ENABLE: case HV_X64_MSR_VP_RUNTIME:
has_msr_misc_enable = true; has_msr_hv_runtime = true;
break; break;
case MSR_IA32_BNDCFGS: case HV_X64_MSR_SCONTROL:
has_msr_bndcfgs = true; has_msr_hv_synic = true;
break; break;
case MSR_IA32_XSS: case HV_X64_MSR_STIMER0_CONFIG:
has_msr_xss = true; has_msr_hv_stimer = true;
break; break;
case HV_X64_MSR_CRASH_CTL: case HV_X64_MSR_TSC_FREQUENCY:
has_msr_hv_crash = true; has_msr_hv_frequencies = true;
break; break;
case HV_X64_MSR_RESET: case HV_X64_MSR_REENLIGHTENMENT_CONTROL:
has_msr_hv_reset = true; has_msr_hv_reenlightenment = true;
break; break;
case HV_X64_MSR_VP_INDEX: case MSR_IA32_SPEC_CTRL:
has_msr_hv_vpindex = true; has_msr_spec_ctrl = true;
break; break;
case HV_X64_MSR_VP_RUNTIME: case MSR_VIRT_SSBD:
has_msr_hv_runtime = true; has_msr_virt_ssbd = true;
break; break;
case HV_X64_MSR_SCONTROL: case MSR_IA32_ARCH_CAPABILITIES:
has_msr_hv_synic = true; has_msr_arch_capabs = true;
break; break;
case HV_X64_MSR_STIMER0_CONFIG: case MSR_IA32_CORE_CAPABILITY:
has_msr_hv_stimer = true; has_msr_core_capabs = true;
break; break;
case HV_X64_MSR_TSC_FREQUENCY:
has_msr_hv_frequencies = true;
break;
case HV_X64_MSR_REENLIGHTENMENT_CONTROL:
has_msr_hv_reenlightenment = true;
break;
case MSR_IA32_SPEC_CTRL:
has_msr_spec_ctrl = true;
break;
case MSR_VIRT_SSBD:
has_msr_virt_ssbd = true;
break;
case MSR_IA32_ARCH_CAPABILITIES:
has_msr_arch_capabs = true;
break;
case MSR_IA32_CORE_CAPABILITY:
has_msr_core_capabs = true;
break;
}
} }
} }
g_free(kvm_msr_list);
} }
g_free(kvm_msr_list);
return ret; return ret;
} }