From patchwork Tue Nov 30 17:04:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 367431 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAUH6N6f003811 for ; Tue, 30 Nov 2010 17:06:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754958Ab0K3RFM (ORCPT ); Tue, 30 Nov 2010 12:05:12 -0500 Received: from va3ehsobe006.messaging.microsoft.com ([216.32.180.16]:28522 "EHLO VA3EHSOBE009.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754943Ab0K3RFH (ORCPT ); Tue, 30 Nov 2010 12:05:07 -0500 Received: from mail73-va3-R.bigfish.com (10.7.14.240) by VA3EHSOBE009.bigfish.com (10.7.40.29) with Microsoft SMTP Server id 14.1.225.8; Tue, 30 Nov 2010 17:05:07 +0000 Received: from mail73-va3 (localhost.localdomain [127.0.0.1]) by mail73-va3-R.bigfish.com (Postfix) with ESMTP id EB755C884E8; Tue, 30 Nov 2010 17:05:06 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zzbb2cKzz1202hzz8275bhz32i691h668h67dh62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:ausb3twp01.amd.com; RD:none; EFVD:NLI Received: from mail73-va3 (localhost.localdomain [127.0.0.1]) by mail73-va3 (MessageSwitch) id 1291136682992707_14947; Tue, 30 Nov 2010 17:04:42 +0000 (UTC) Received: from VA3EHSMHS018.bigfish.com (unknown [10.7.14.237]) by mail73-va3.bigfish.com (Postfix) with ESMTP id 161F5A3816F; Tue, 30 Nov 2010 17:04:22 +0000 (UTC) Received: from ausb3twp01.amd.com (163.181.249.108) by VA3EHSMHS018.bigfish.com (10.7.99.28) with Microsoft SMTP Server id 14.1.225.8; Tue, 30 Nov 2010 17:04:14 +0000 X-WSS-ID: 0LCPJEX-01-0WY-02 X-M-MSG: Received: from sausexedgep01.amd.com (sausexedgep01-ext.amd.com [163.181.249.72]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 296C4102897A; Tue, 30 Nov 2010 11:04:09 -0600 (CST) Received: from sausexhtp02.amd.com (163.181.3.152) by sausexedgep01.amd.com (163.181.36.54) with Microsoft SMTP Server (TLS) id 8.3.106.1; Tue, 30 Nov 2010 11:05:41 -0600 Received: from storexhtp01.amd.com (172.24.4.3) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 30 Nov 2010 11:04:12 -0600 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp01.amd.com (172.24.4.3) with Microsoft SMTP Server id 8.3.83.0; Tue, 30 Nov 2010 12:04:12 -0500 Received: from lemmy.osrc.amd.com (lemmy.osrc.amd.com [165.204.15.93]) by gwo.osrc.amd.com (Postfix) with ESMTP id 2128A49C2A6; Tue, 30 Nov 2010 17:04:11 +0000 (GMT) Received: by lemmy.osrc.amd.com (Postfix, from userid 1000) id C664F1013F4; Tue, 30 Nov 2010 18:04:14 +0100 (CET) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: , , Joerg Roedel Subject: [PATCH 6/6] KVM: SVM: Use get_host_vmcb function in svm_get_msr for TSC Date: Tue, 30 Nov 2010 18:04:01 +0100 Message-ID: <1291136641-4874-7-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1291136641-4874-1-git-send-email-joerg.roedel@amd.com> References: <1291136641-4874-1-git-send-email-joerg.roedel@amd.com> MIME-Version: 1.0 X-OriginatorOrg: amd.com 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 (demeter1.kernel.org [140.211.167.41]); Tue, 30 Nov 2010 17:06:23 +0000 (UTC) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 6b51d31..0803795 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2628,14 +2628,9 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data) switch (ecx) { case MSR_IA32_TSC: { - u64 tsc_offset; + struct vmcb *vmcb = get_host_vmcb(svm); - if (is_guest_mode(vcpu)) - tsc_offset = svm->nested.hsave->control.tsc_offset; - else - tsc_offset = svm->vmcb->control.tsc_offset; - - *data = tsc_offset + native_read_tsc(); + *data = vmcb->control.tsc_offset + native_read_tsc(); break; } case MSR_STAR: