From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 2 Dec 2009 13:43:37 +0000 (+0000)
Subject: xend, vt-d: do not reserve vtd_mem if iommu is not enabled
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12980
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fe356defec5b50c1faab672bf488d68c9c996917;p=xen.git

xend, vt-d: do not reserve vtd_mem if iommu is not enabled

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 7cbf25ecc0..db744d7e1d 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -2758,10 +2758,13 @@ class XendDomainInfo:
             # set memory limit
             xc.domain_setmaxmem(self.domid, maxmem)
 
-            # Reserve 1 page per MiB of RAM for separate VT-d page table.
-            vtd_mem = 4 * (self.info['memory_static_max'] / 1024 / 1024)
-            # Round vtd_mem up to a multiple of a MiB.
-            vtd_mem = ((vtd_mem + 1023) / 1024) * 1024
+            vtd_mem = 0
+            info = xc.physinfo()
+            if 'hvm_directio' in info['virt_caps']:
+                # Reserve 1 page per MiB of RAM for separate VT-d page table.
+                vtd_mem = 4 * (self.info['memory_static_max'] / 1024 / 1024)
+                # Round vtd_mem up to a multiple of a MiB.
+                vtd_mem = ((vtd_mem + 1023) / 1024) * 1024
 
             self.guest_bitsize = self.image.getBitSize()
             # Make sure there's enough RAM available for the domain