From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Habkost Subject: [PATCH 1/4] kvm: Simplify invtsc check Date: Tue, 27 Dec 2016 17:21:17 -0200 Message-ID: <1482866480-26208-2-git-send-email-ehabkost@redhat.com> References: <1482866480-26208-1-git-send-email-ehabkost@redhat.com> Cc: Paolo Bonzini , Marcelo Tosatti , kvm@vger.kernel.org, Haozhong Zhang To: qemu-devel@nongnu.org Return-path: In-Reply-To: <1482866480-26208-1-git-send-email-ehabkost@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: "Qemu-devel" List-Id: kvm.vger.kernel.org Instead of searching the table we have just built, we can check the env->features field directly. 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 10a9cd8..a26290f 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -962,8 +962,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.7.4