From: Michael S. Tsirkin <mst@redhat.com>
Date: Mon, 20 Oct 2014 09:37:23 +0000 (+0300)
Subject: intel_iommu: fix VTD_SID_TO_BUS
X-Git-Tag: v2.2.0-rc0~10^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e06f131fd9a44dd4af223875660802fd2a3441f;p=thirdparty%2Fqemu.git

intel_iommu: fix VTD_SID_TO_BUS

(((sid) >> 8) && 0xff)  makes no sense
(((sid) >> 8) & 0xff) seems to be what was meant.

https://bugs.launchpad.net/qemu/+bug/1382477

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index f4701e1c60d..e321ee4fbce 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -37,7 +37,7 @@
 #define VTD_PCI_DEVFN_MAX           256
 #define VTD_PCI_SLOT(devfn)         (((devfn) >> 3) & 0x1f)
 #define VTD_PCI_FUNC(devfn)         ((devfn) & 0x07)
-#define VTD_SID_TO_BUS(sid)         (((sid) >> 8) && 0xff)
+#define VTD_SID_TO_BUS(sid)         (((sid) >> 8) & 0xff)
 #define VTD_SID_TO_DEVFN(sid)       ((sid) & 0xff)
 
 #define DMAR_REG_SIZE               0x230