From patchwork Wed May 5 21:27:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 97212 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o45LUjJj027392 for ; Wed, 5 May 2010 21:30:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758612Ab0EEVaB (ORCPT ); Wed, 5 May 2010 17:30:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13834 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758655Ab0EEV3m (ORCPT ); Wed, 5 May 2010 17:29:42 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o45LTfLO001340 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 May 2010 17:29:41 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o45LTVio028433; Wed, 5 May 2010 17:29:40 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, avi@redhat.com, zamsden@redhat.com Subject: [PATCH v3 8/8] Tell the guest we'll warn it about tsc stability Date: Wed, 5 May 2010 17:27:19 -0400 Message-Id: <1273094839-18655-9-git-send-email-glommer@redhat.com> In-Reply-To: <1273094839-18655-8-git-send-email-glommer@redhat.com> References: <1273094839-18655-1-git-send-email-glommer@redhat.com> <1273094839-18655-2-git-send-email-glommer@redhat.com> <1273094839-18655-3-git-send-email-glommer@redhat.com> <1273094839-18655-4-git-send-email-glommer@redhat.com> <1273094839-18655-5-git-send-email-glommer@redhat.com> <1273094839-18655-6-git-send-email-glommer@redhat.com> <1273094839-18655-7-git-send-email-glommer@redhat.com> <1273094839-18655-8-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 05 May 2010 21:30:46 +0000 (UTC) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 9295198..ddf997e 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -855,6 +855,8 @@ static void kvm_write_guest_time(struct kvm_vcpu *v) vcpu->hv_clock.system_time = ts.tv_nsec + (NSEC_PER_SEC * (u64)ts.tv_sec) + v->kvm->arch.kvmclock_offset; + vcpu->hv_clock.flags = 0; + /* * The interface expects us to write an even number signaling that the * update is finished. Since the guest won't see the intermediate @@ -1983,7 +1985,8 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, case KVM_CPUID_FEATURES: entry->eax = (1 << KVM_FEATURE_CLOCKSOURCE) | (1 << KVM_FEATURE_NOP_IO_DELAY) | - (1 << KVM_FEATURE_CLOCKSOURCE2); + (1 << KVM_FEATURE_CLOCKSOURCE2) | + (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT); entry->ebx = 0; entry->ecx = 0; entry->edx = 0;