From: Paolo Bonzini <pbonzini@redhat.com>
To: Li Qiang <liq3ea@163.com>, mtosatti@redhat.com
Cc: liq3ea@gmail.com, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] target-i386: kvm: 'kvm_get_supported_msrs' cleanup
Date: Thu, 25 Jul 2019 17:43:26 +0200 [thread overview]
Message-ID: <9ada2330-1f55-20f9-3d60-b888fb127bac@redhat.com> (raw)
In-Reply-To: <20190725151639.21693-1-liq3ea@163.com>
On 25/07/19 17:16, Li Qiang wrote:
> 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>
Queued, thanks.
Paolo
> ---
> target/i386/kvm.c | 185 +++++++++++++++++++++++-----------------------
> 1 file changed, 91 insertions(+), 94 deletions(-)
>
> diff --git a/target/i386/kvm.c b/target/i386/kvm.c
> index dbbb13772a..07c9250f45 100644
> --- a/target/i386/kvm.c
> +++ b/target/i386/kvm.c
> @@ -1837,108 +1837,105 @@ static int kvm_get_supported_feature_msrs(KVMState *s)
>
> static int kvm_get_supported_msrs(KVMState *s)
> {
> - static int kvm_supported_msrs;
> int ret = 0;
> + struct kvm_msr_list msr_list, *kvm_msr_list;
>
> - /* first time */
> - if (kvm_supported_msrs == 0) {
> - struct kvm_msr_list msr_list, *kvm_msr_list;
> + /*
> + * Obtain MSR list from KVM. These are the MSRs that we must
> + * 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
> - * 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_msr_list->nmsrs = msr_list.nmsrs;
> - ret = kvm_ioctl(s, KVM_GET_MSR_INDEX_LIST, kvm_msr_list);
> - if (ret >= 0) {
> - int i;
> -
> - for (i = 0; i < kvm_msr_list->nmsrs; i++) {
> - switch (kvm_msr_list->indices[i]) {
> - case MSR_STAR:
> - has_msr_star = true;
> - break;
> - case MSR_VM_HSAVE_PA:
> - has_msr_hsave_pa = true;
> - break;
> - case MSR_TSC_AUX:
> - has_msr_tsc_aux = true;
> - break;
> - case MSR_TSC_ADJUST:
> - has_msr_tsc_adjust = true;
> - break;
> - case MSR_IA32_TSCDEADLINE:
> - has_msr_tsc_deadline = true;
> - break;
> - case MSR_IA32_SMBASE:
> - has_msr_smbase = true;
> - break;
> - case MSR_SMI_COUNT:
> - has_msr_smi_count = true;
> - break;
> - case MSR_IA32_MISC_ENABLE:
> - has_msr_misc_enable = true;
> - break;
> - case MSR_IA32_BNDCFGS:
> - has_msr_bndcfgs = true;
> - break;
> - case MSR_IA32_XSS:
> - has_msr_xss = true;
> - break;
> - case HV_X64_MSR_CRASH_CTL:
> - has_msr_hv_crash = true;
> - break;
> - case HV_X64_MSR_RESET:
> - has_msr_hv_reset = true;
> - break;
> - case HV_X64_MSR_VP_INDEX:
> - has_msr_hv_vpindex = true;
> - break;
> - case HV_X64_MSR_VP_RUNTIME:
> - has_msr_hv_runtime = true;
> - break;
> - case HV_X64_MSR_SCONTROL:
> - has_msr_hv_synic = true;
> - break;
> - case HV_X64_MSR_STIMER0_CONFIG:
> - has_msr_hv_stimer = true;
> - 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;
> - }
> + for (i = 0; i < kvm_msr_list->nmsrs; i++) {
> + switch (kvm_msr_list->indices[i]) {
> + case MSR_STAR:
> + has_msr_star = true;
> + break;
> + case MSR_VM_HSAVE_PA:
> + has_msr_hsave_pa = true;
> + break;
> + case MSR_TSC_AUX:
> + has_msr_tsc_aux = true;
> + break;
> + case MSR_TSC_ADJUST:
> + has_msr_tsc_adjust = true;
> + break;
> + case MSR_IA32_TSCDEADLINE:
> + has_msr_tsc_deadline = true;
> + break;
> + case MSR_IA32_SMBASE:
> + has_msr_smbase = true;
> + break;
> + case MSR_SMI_COUNT:
> + has_msr_smi_count = true;
> + break;
> + case MSR_IA32_MISC_ENABLE:
> + has_msr_misc_enable = true;
> + break;
> + case MSR_IA32_BNDCFGS:
> + has_msr_bndcfgs = true;
> + break;
> + case MSR_IA32_XSS:
> + has_msr_xss = true;
> + break;
> + case HV_X64_MSR_CRASH_CTL:
> + has_msr_hv_crash = true;
> + break;
> + case HV_X64_MSR_RESET:
> + has_msr_hv_reset = true;
> + break;
> + case HV_X64_MSR_VP_INDEX:
> + has_msr_hv_vpindex = true;
> + break;
> + case HV_X64_MSR_VP_RUNTIME:
> + has_msr_hv_runtime = true;
> + break;
> + case HV_X64_MSR_SCONTROL:
> + has_msr_hv_synic = true;
> + break;
> + case HV_X64_MSR_STIMER0_CONFIG:
> + has_msr_hv_stimer = true;
> + 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;
> }
>
>
prev parent reply other threads:[~2019-07-25 15:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 15:16 [Qemu-devel] [PATCH] target-i386: kvm: 'kvm_get_supported_msrs' cleanup Li Qiang
2019-07-25 15:43 ` Paolo Bonzini [this message]
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=9ada2330-1f55-20f9-3d60-b888fb127bac@redhat.com \
--to=pbonzini@redhat.com \
--cc=liq3ea@163.com \
--cc=liq3ea@gmail.com \
--cc=mtosatti@redhat.com \
--cc=qemu-devel@nongnu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).