[PATCH] pvgrub: initialise p2m_size

[PATCH] pvgrub: initialise p2m_size

[Wei Liu]

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

Re: [PATCH] pvgrub: initialise p2m_size

[Ian Campbell]

On Sun, 2015-05-10 at 14:14 +0100, Wei Liu wrote:
> 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>

Acked + Applied , thanks.

Re: [PATCH] pvgrub: initialise p2m_size

[Samuel Thibault]

Wei Liu, le Sun 10 May 2015 14:14:51 +0100, a écrit :
> 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>

Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

> ---
>  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
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
> 

-- 
Samuel
`When you say "I wrote a program that crashed Windows", people just stare at
you blankly and say "Hey, I got those with the system, *for free*".'
(By Linus Torvalds)

Re: [PATCH] pvgrub: initialise p2m_size

[Wei Liu]

On Thu, May 14, 2015 at 01:51:18AM +0200, Samuel Thibault wrote:
> Wei Liu, le Sun 10 May 2015 14:14:51 +0100, a écrit :
> > 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>
> 
> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> 

Thanks for the ack! Ian already applied this one.

Sorry I forgot to CC you when I sent this patch. I will remember doing
so next time.

Wei.

Re: [PATCH] pvgrub: initialise p2m_size

[Ian Campbell]

On Thu, 2015-05-14 at 03:56 +0100, Wei Liu wrote:
> On Thu, May 14, 2015 at 01:51:18AM +0200, Samuel Thibault wrote:
> > Wei Liu, le Sun 10 May 2015 14:14:51 +0100, a écrit :
> > > 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>
> > 
> > Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> > 
> 
> Thanks for the ack! Ian already applied this one.
> 
> Sorry I forgot to CC you when I sent this patch. I will remember doing
> so next time.

Likewise, I should have waited too.

> 
> Wei.



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel