From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 28 Apr 2016 13:08:54 +0000 (+0200)
Subject: x86/HVM: fix emulation re-issue check
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1212
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bb998efecb99752c0d159aa77a49f84d80bd0252;p=xen.git

x86/HVM: fix emulation re-issue check

?: has lower precedence than !=, hence parentheses are required here.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c
index cc0b84138b..1384a4234b 100644
--- a/xen/arch/x86/hvm/emulate.c
+++ b/xen/arch/x86/hvm/emulate.c
@@ -134,7 +134,7 @@ static int hvmemul_do_io(
         p = vio->io_req;
 
         /* Verify the emulation request has been correctly re-issued */
-        if ( (p.type != is_mmio ? IOREQ_TYPE_COPY : IOREQ_TYPE_PIO) ||
+        if ( (p.type != (is_mmio ? IOREQ_TYPE_COPY : IOREQ_TYPE_PIO)) ||
              (p.addr != addr) ||
              (p.size != size) ||
              (p.count != *reps) ||