From: Juergen Gross <juergen.gross@ts.fujitsu.com>
Date: Thu, 22 Aug 2013 09:24:00 +0000 (+0200)
Subject: Correct X2-APIC HVM emulation
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6482
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=69962e19ed432570f6cdcfdb5f6f22d6e3c54e6c;p=xen.git

Correct X2-APIC HVM emulation

commit 6859874b61d5ddaf5289e72ed2b2157739b72ca5 ("x86/HVM: fix x2APIC
APIC_ID read emulation") introduced an error for the hvm emulation of
x2apic. Any try to write to APIC_ICR MSR will result in a GP fault.

Signed-off-by: Juergen Gross <juergen.gross@ts.fujitsu.com>
---

diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index 7b10ab6274..5c33d3a407 100644
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -868,6 +868,7 @@ int hvm_x2apic_msr_write(struct vcpu *v, unsigned int msr, uint64_t msr_content)
         rc = vlapic_reg_write(v, APIC_ICR2, (uint32_t)(msr_content >> 32));
         if ( rc )
             return rc;
+        break;
 
     case APIC_ICR2:
         return X86EMUL_UNHANDLEABLE;