|
 |
4a2fec |
From d9e6ce9628a29f7992dd381a54aae14d45078bf8 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Ladi Prosek <lprosek@redhat.com>
|
|
|
4a2fec |
Date: Tue, 10 Oct 2017 14:02:50 +0200
|
|
|
4a2fec |
Subject: [PATCH 12/69] i386/kvm: introduce tsc_is_stable_and_known()
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Ladi Prosek <lprosek@redhat.com>
|
|
|
4a2fec |
Message-id: <20171010140251.23801-4-lprosek@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77062
|
|
|
4a2fec |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 3/4] i386/kvm: introduce tsc_is_stable_and_known()
|
|
|
4a2fec |
Bugzilla: 1500347
|
|
|
4a2fec |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Move the "is TSC stable and known" condition to a reusable helper.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Ladi Prosek <lprosek@redhat.com>
|
|
|
4a2fec |
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
|
4a2fec |
Message-Id: <20170807085703.32267-4-lprosek@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 4bb95b82df7ea4a1c7de15649dd16a70a19e6bab)
|
|
|
4a2fec |
Signed-off-by: Ladi Prosek <lprosek@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
target/i386/kvm.c | 13 ++++++++++---
|
|
|
4a2fec |
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
|
|
|
4a2fec |
index 15d56ae..2dc01c9 100644
|
|
|
4a2fec |
--- a/target/i386/kvm.c
|
|
|
4a2fec |
+++ b/target/i386/kvm.c
|
|
|
4a2fec |
@@ -611,6 +611,15 @@ static int kvm_arch_set_tsc_khz(CPUState *cs)
|
|
|
4a2fec |
return 0;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+static bool tsc_is_stable_and_known(CPUX86State *env)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+ if (!env->tsc_khz) {
|
|
|
4a2fec |
+ return false;
|
|
|
4a2fec |
+ }
|
|
|
4a2fec |
+ return (env->features[FEAT_8000_0007_EDX] & CPUID_APM_INVTSC)
|
|
|
4a2fec |
+ || env->user_tsc_khz;
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
+
|
|
|
4a2fec |
static int hyperv_handle_properties(CPUState *cs)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
X86CPU *cpu = X86_CPU(cs);
|
|
|
4a2fec |
@@ -986,9 +995,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
|
|
4a2fec |
&& cpu->expose_kvm
|
|
|
4a2fec |
&& kvm_base == KVM_CPUID_SIGNATURE
|
|
|
4a2fec |
/* TSC clock must be stable and known for this feature. */
|
|
|
4a2fec |
- && ((env->features[FEAT_8000_0007_EDX] & CPUID_APM_INVTSC)
|
|
|
4a2fec |
- || env->user_tsc_khz != 0)
|
|
|
4a2fec |
- && env->tsc_khz != 0) {
|
|
|
4a2fec |
+ && tsc_is_stable_and_known(env)) {
|
|
|
4a2fec |
|
|
|
4a2fec |
c = &cpuid_data.entries[cpuid_i++];
|
|
|
4a2fec |
c->function = KVM_CPUID_SIGNATURE | 0x10;
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|