From 3c201391cfbe2284e9da17ab16b85067bb03e2bd Mon Sep 17 00:00:00 2001 From: Boris Ostrovsky Date: Mon, 2 Apr 2018 23:05:20 -0700 Subject: [PATCH] libxl: Store e820 map in xc_dom_image MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Roger Pau Monné Reviewed-by: Wei Liu --- tools/libxc/include/xc_dom.h | 7 ++++++- tools/libxl/libxl_x86.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) 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; } -- 2.39.5