[PATCH] pvgrub: initialise p2m_size

* [PATCH] pvgrub: initialise p2m_size
@ 2015-05-10 13:14 Wei Liu
  2015-05-11 10:48 ` Ian Campbell
  2015-05-13 23:51 ` Samuel Thibault
  0 siblings, 2 replies; 5+ messages in thread
From: Wei Liu @ 2015-05-10 13:14 UTC (permalink / raw)
  To: xen-devel; +Cc: Ian Jackson, Wei Liu, Ian Campbell

In 84083790 ("libxc: add p2m_size to xc_dom_image") a new field is
added. We should initialised this field in pvgrub as well, otherwise
xc_dom_build_image won't work properly.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 stubdom/grub/kexec.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/stubdom/grub/kexec.c b/stubdom/grub/kexec.c
index dc8db81..4c33b25 100644
--- a/stubdom/grub/kexec.c
+++ b/stubdom/grub/kexec.c
@@ -276,12 +276,13 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char
     dom->total_pages = start_info.nr_pages;
 
     /* equivalent of arch_setup_meminit */
+    dom->p2m_size = dom->total_pages;
 
     /* setup initial p2m */
-    dom->p2m_host = malloc(sizeof(*dom->p2m_host) * dom->total_pages);
+    dom->p2m_host = malloc(sizeof(*dom->p2m_host) * dom->p2m_size);
 
     /* Start with our current P2M */
-    for (i = 0; i < dom->total_pages; i++)
+    for (i = 0; i < dom->p2m_size; i++)
         dom->p2m_host[i] = pfn_to_mfn(i);
 
     if ( (rc = xc_dom_build_image(dom)) != 0 ) {
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread