File 19493-hvm-io-intercept-count.patch of Package xen

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1238599230 -3600
# Node ID b5e7c26835c9fc2e9c26e27478a938e36f98d645
# Parent  e89f7c2b9e0d695645f86816da5fd05b340fa36e
x86: hvm_*io_intercept() should only update p->count if X86EMUL_OKAY.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

--- a/xen/arch/x86/hvm/intercept.c
+++ b/xen/arch/x86/hvm/intercept.c
@@ -98,8 +98,11 @@ static int hvm_mmio_access(struct vcpu *
         }
     }
 
-    if ( (p->count = i) != 0 )
+    if ( i != 0 )
+    {
+        p->count = i;
         rc = X86EMUL_OKAY;
+    }
 
     return rc;
 }
@@ -163,8 +166,11 @@ static int process_portio_intercept(port
         }
     }
 
-    if ( (p->count = i) != 0 )
+    if ( i != 0 )
+    {
+        p->count = i;
         rc = X86EMUL_OKAY;
+    }
 
     return rc;
 }