| Message ID | 1311406305-24523-1-git-send-email-mikew@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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.
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;
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(-)