From d74460ec1bfaad740eee79bf7cb111b1125ffdef Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Sun, 8 Jan 2017 15:32:33 -0200 Subject: [PATCH] kvm: Simplify invtsc check Instead of searching the table we have just built, we can check the env->features field directly. Reviewed-by: Marcelo Tosatti Signed-off-by: Eduardo Habkost Message-Id: <20170108173234.25721-2-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- target/i386/kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index e6c4f754ab..9744552b8a 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -963,8 +963,8 @@ int kvm_arch_init_vcpu(CPUState *cs) has_msr_mcg_ext_ctl = has_msr_feature_control = true; } - c = cpuid_find_entry(&cpuid_data.cpuid, 0x80000007, 0); - if (c && (c->edx & 1<<8) && invtsc_mig_blocker == NULL) { + if ((env->features[FEAT_8000_0007_EDX] & CPUID_APM_INVTSC) && + invtsc_mig_blocker == NULL) { /* for migration */ error_setg(&invtsc_mig_blocker, "State blocked by non-migratable CPU device" -- 2.39.5