On 25/11/2015 16:49, Eduardo Habkost wrote:
> Instead of silently clearing mcg_cap bits when the host doesn't
> support them, print a warning when doing that.
>
> Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
> ---
> target-i386/kvm.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index d63a85b..446bdfc 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -774,7 +774,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
> && (env->features[FEAT_1_EDX] & (CPUID_MCE | CPUID_MCA)) ==
> (CPUID_MCE | CPUID_MCA)
> && kvm_check_extension(cs->kvm_state, KVM_CAP_MCE) > 0) {
> - uint64_t mcg_cap;
> + uint64_t mcg_cap, unsupported_caps;
> int banks;
> int ret;
>
> @@ -790,6 +790,12 @@ int kvm_arch_init_vcpu(CPUState *cs)
> return -ENOTSUP;
> }
>
> + unsupported_caps = env->mcg_cap & ~(mcg_cap | MCG_CAP_BANKS_MASK);
> + if (unsupported_caps) {
> + error_report("warning: Unsupported MCG_CAP bits: 0x%" PRIx64 "\n",
\n should not be at end of error_report.
Fixed and applied.
Paolo
> + unsupported_caps);
> + }
> +
> env->mcg_cap &= mcg_cap | MCG_CAP_BANKS_MASK;
> ret = kvm_vcpu_ioctl(cs, KVM_X86_SETUP_MCE, &env->mcg_cap);
> if (ret < 0) {
>
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
