public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] kvm: Really fix HV_X64_MSR_APIC_ASSIST_PAGE
@ 2011-07-23  7:31 Mike Waychison
  2011-07-27 11:41 ` Avi Kivity
  0 siblings, 1 reply; 2+ messages in thread
From: Mike Waychison @ 2011-07-23  7:31 UTC (permalink / raw)
  To: Avi Kivity, Marcelo Tosatti; +Cc: x86, kvm, linux-kernel, Mike Waychison

Commit 0945d4b228 tried to fix the get_msr path for the
HV_X64_MSR_APIC_ASSIST_PAGE msr, but was poorly tested.  We should be
returning 0 if the read succeeded, and passing the value back to the
caller via the pdata out argument, not returning the value directly.

Signed-off-by: Mike Waychison <mikew@google.com>
---
 arch/x86/kvm/x86.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 15148ef..6960efe 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1749,7 +1749,8 @@ static int get_msr_hyperv(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
 	case HV_X64_MSR_TPR:
 		return kvm_hv_vapic_msr_read(vcpu, APIC_TASKPRI, pdata);
 	case HV_X64_MSR_APIC_ASSIST_PAGE:
-		return vcpu->arch.hv_vapic;
+		data = vcpu->arch.hv_vapic;
+		break;
 	default:
 		pr_unimpl(vcpu, "Hyper-V unhandled rdmsr: 0x%x\n", msr);
 		return 1;
-- 
1.7.3.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] kvm: Really fix HV_X64_MSR_APIC_ASSIST_PAGE
  2011-07-23  7:31 [PATCH] kvm: Really fix HV_X64_MSR_APIC_ASSIST_PAGE Mike Waychison
@ 2011-07-27 11:41 ` Avi Kivity
  0 siblings, 0 replies; 2+ messages in thread
From: Avi Kivity @ 2011-07-27 11:41 UTC (permalink / raw)
  To: Mike Waychison; +Cc: Marcelo Tosatti, x86, kvm, linux-kernel

On 07/23/2011 10:31 AM, Mike Waychison wrote:
> Commit 0945d4b228 tried to fix the get_msr path for the
> HV_X64_MSR_APIC_ASSIST_PAGE msr, but was poorly tested.  We should be
> returning 0 if the read succeeded, and passing the value back to the
> caller via the pdata out argument, not returning the value directly.

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-07-27 11:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-23  7:31 [PATCH] kvm: Really fix HV_X64_MSR_APIC_ASSIST_PAGE Mike Waychison
2011-07-27 11:41 ` Avi Kivity

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox