From 129f55fe36c8b60eb5156792a2c670a4a1fa9ae7 Mon Sep 17 00:00:00 2001
From: Wojtek Porczyk <woju@invisiblethingslab.com>
Date: Mon, 13 Jun 2016 23:20:39 +0200
Subject: [PATCH] Handle host e820 memory map feature

This is port of marmarek's "core: add pci_e820_host property"

QubesOS/qubes-issues#2019
---
 templates/libvirt/xen.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/templates/libvirt/xen.xml b/templates/libvirt/xen.xml
index 218530f4..fb0e1898 100644
--- a/templates/libvirt/xen.xml
+++ b/templates/libvirt/xen.xml
@@ -19,14 +19,22 @@
     {% endif %}
     </os>
 
-    {% if vm.hvm %}
-        <features>
+    <features>
+        {% if vm.hvm %}
             <pae/>
             <acpi/>
             <apic/>
             <viridian/>
-        </features>
+        {% endif %}
 
+        {% if vm.devices['pci'] and vm.features.get('pci-e820-host', True) %}
+            <xen>
+                <e820_host state="on"/>
+            </xen>
+        {% endif %}
+    </features>
+
+    {% if vm.hvm %}
         {% set timezone = vm.features.check_with_template('timezone', 'localtime').lower() %}
         {% if timezone == 'localtime' %}
             <clock offset="variable" adjustment="0" basis="localtime" />