[Xen-changelog] [xen-unstable] svm: Fix stupid typo in svm_set_interrupt_shadow().

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1203930444 0
# Node ID 5adc98ae6861fc8b165ad75ce898c4ab3e149f3d
# Parent  200787660b5fb3ae288e88ac028055d5397b6c2d
svm: Fix stupid typo in svm_set_interrupt_shadow().
Signed-off-by: Christoph Egger <christoph.egger@xxxxxxx>

svm: Also return STI *and* MOV-SS blocking from
svm_get_interrupt_shadow().
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/svm/svm.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff -r 200787660b5f -r 5adc98ae6861 xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c        Fri Feb 22 18:32:41 2008 +0000
+++ b/xen/arch/x86/hvm/svm/svm.c        Mon Feb 25 09:07:24 2008 +0000
@@ -369,14 +369,15 @@ static unsigned int svm_get_interrupt_sh
 static unsigned int svm_get_interrupt_shadow(struct vcpu *v)
 {
     struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb;
-    return (vmcb->interrupt_shadow ? HVM_INTR_SHADOW_MOV_SS : 0);
+    return (vmcb->interrupt_shadow ?
+            (HVM_INTR_SHADOW_MOV_SS|HVM_INTR_SHADOW_STI) : 0);
 }
 
 static void svm_set_interrupt_shadow(struct vcpu *v, unsigned int intr_shadow)
 {
     struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb;
-    vmcb->interrupt_shadow = !!(vmcb->interrupt_shadow &
-                                (HVM_INTR_SHADOW_MOV_SS|HVM_INTR_SHADOW_STI));
+    vmcb->interrupt_shadow =
+        !!(intr_shadow & (HVM_INTR_SHADOW_MOV_SS|HVM_INTR_SHADOW_STI));
 }
 
 static int svm_guest_x86_mode(struct vcpu *v)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog