Home » Mailing list archives » linux-kernel » 2010 » November » 30

[PATCH 6/6] KVM: SVM: Use get_host_vmcb function in svm_get_msr for TSC

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Joerg Roedel
Subject: [PATCH 6/6] KVM: SVM: Use get_host_vmcb function in svm_get_msr for TSC
Date: Tuesday, November 30, 2010 - 10:04 am

This patch replaces the open-coded vmcb-selection for the
TSC calculation with the new get_host_vmcb helper function
introduced in this patchset.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 arch/x86/kvm/svm.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

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:
-- 
1.7.1


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/6] KVM: SVM: Wrap access to intercept masks into ..., Joerg Roedel, (Tue Nov 30, 10:03 am)
[PATCH 3/6] KVM: SVM: Add manipulation functions for DRx i ..., Joerg Roedel, (Tue Nov 30, 10:03 am)
[PATCH 5/6] KVM: SVM: Add manipulation functions for misc ..., Joerg Roedel, (Tue Nov 30, 10:04 am)
[PATCH 6/6] KVM: SVM: Use get_host_vmcb function in svm_ge ..., Joerg Roedel, (Tue Nov 30, 10:04 am)
Re: [PATCH 0/6] KVM: SVM: Wrap access to intercept masks i ..., Avi Kivity, (Tue Nov 30, 10:42 am)
Re: [PATCH 0/6] KVM: SVM: Wrap access to intercept masks i ..., Roedel, Joerg, (Wed Dec 1, 3:34 am)
Re: [PATCH 0/6] KVM: SVM: Wrap access to intercept masks i ..., Marcelo Tosatti, (Fri Dec 3, 1:23 pm)