From 4249e5ea7627fbed40c7e99b4706193c635f3e97 Mon Sep 17 00:00:00 2001 From: Mike Waychison Date: Thu, 21 Jul 2011 15:38:10 -0700 Subject: [PATCH] --- yaml --- r: 271477 b: refs/heads/master c: 14fa67ee95d4f7313fbf149fe37faccb903857c8 h: refs/heads/master i: 271475: 80cd9d6263d4769fa1d74a31bfebf68ffaadfc59 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/x86.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2c2735efb642..beead03c291e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b3c246a682c50f5415c71fc5387a114a6f0d643 +refs/heads/master: 14fa67ee95d4f7313fbf149fe37faccb903857c8 diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c index 41dfebea6218..e80f0d7c2c0d 100644 --- a/trunk/arch/x86/kvm/x86.c +++ b/trunk/arch/x86/kvm/x86.c @@ -1825,6 +1825,8 @@ static int get_msr_hyperv(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) return kvm_hv_vapic_msr_read(vcpu, APIC_ICR, 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; default: pr_unimpl(vcpu, "Hyper-V unhandled rdmsr: 0x%x\n", msr); return 1;