From: Xiaoyao Li <xiaoyao.li@intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>,
Eduardo Habkost <ehabkost@redhat.com>
Cc: Xiaoyao Li <xiaoyao.li@intel.com>, qemu-devel@nongnu.org
Subject: [PATCH 2/2] i386/cpu: Mask off unsupported XSAVE components
Date: Thu, 16 Jul 2020 16:20:19 +0800 [thread overview]
Message-ID: <20200716082019.215316-3-xiaoyao.li@intel.com> (raw)
In-Reply-To: <20200716082019.215316-1-xiaoyao.li@intel.com>
When setting up XSAVE components, it needs to mask off those unsupported
by KVM.
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
---
target/i386/cpu.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index f5f11603e805..efc92334b7b1 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6274,8 +6274,10 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu)
}
}
- env->features[FEAT_XSAVE_COMP_LO] = mask;
- env->features[FEAT_XSAVE_COMP_HI] = mask >> 32;
+ env->features[FEAT_XSAVE_COMP_LO] = mask &
+ x86_cpu_get_supported_feature_word(FEAT_XSAVE_COMP_LO, cpu->migratable);
+ env->features[FEAT_XSAVE_COMP_HI] = (mask >> 32) &
+ x86_cpu_get_supported_feature_word(FEAT_XSAVE_COMP_HI, cpu->migratable);
}
/***** Steps involved on loading and filtering CPUID data
--
2.18.4
next prev parent reply other threads:[~2020-07-16 8:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 8:20 [PATCH 0/2] Two Fixes for xsave compoent features Xiaoyao Li
2020-07-16 8:20 ` [PATCH 1/2] i386/cpu: Clear FEAT_XSAVE_COMP_{LO, HI} when XSAVE is not available Xiaoyao Li
2020-07-16 15:15 ` [PATCH 1/2] i386/cpu: Clear FEAT_XSAVE_COMP_{LO,HI} " Eduardo Habkost
2020-07-16 15:22 ` [PATCH 1/2] i386/cpu: Clear FEAT_XSAVE_COMP_{LO, HI} " Xiaoyao Li
2020-08-18 7:45 ` Paolo Bonzini
2020-07-16 8:20 ` Xiaoyao Li [this message]
2020-07-16 15:14 ` [PATCH 2/2] i386/cpu: Mask off unsupported XSAVE components Eduardo Habkost
2020-07-16 15:28 ` Xiaoyao Li
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=20200716082019.215316-3-xiaoyao.li@intel.com \
--to=xiaoyao.li@intel.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).