From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Tue, 3 Apr 2018 06:05:20 +0000 (-0700)
Subject: libxl: Store e820 map in xc_dom_image
X-Git-Tag: 4.11.0-rc1~83
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3c201391cfbe2284e9da17ab16b85067bb03e2bd;p=xen.git

libxl: Store e820 map in xc_dom_image

We will later copy it to hvm_start_info.

(Also remove stale comment claming that xc_dom_image.start_info_seg is
only used for HVMlite guests)

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h
index 491cad8114..8a66889c68 100644
--- a/tools/libxc/include/xc_dom.h
+++ b/tools/libxc/include/xc_dom.h
@@ -99,7 +99,7 @@ struct xc_dom_image {
     struct xc_dom_seg p2m_seg;
     struct xc_dom_seg pgtables_seg;
     struct xc_dom_seg devicetree_seg;
-    struct xc_dom_seg start_info_seg; /* HVMlite only */
+    struct xc_dom_seg start_info_seg;
     xen_pfn_t start_info_pfn;
     xen_pfn_t console_pfn;
     xen_pfn_t xenstore_pfn;
@@ -224,6 +224,11 @@ struct xc_dom_image {
     /* Extra SMBIOS structures passed to HVMLOADER */
     struct xc_hvm_firmware_module smbios_module;
 
+#if defined(__i386__) || defined(__x86_64__)
+    struct e820entry *e820;
+    unsigned int e820_entries;
+#endif
+
     xen_pfn_t vuart_gfn;
 };
 
diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c
index a7c970492c..78affdd37a 100644
--- a/tools/libxl/libxl_x86.c
+++ b/tools/libxl/libxl_x86.c
@@ -578,6 +578,9 @@ static int domain_construct_memmap(libxl__gc *gc,
         goto out;
     }
 
+    dom->e820 = e820;
+    dom->e820_entries = e820_entries;
+
 out:
     return rc;
 }