Re: [Xen-devel] [PATCH v1 2/8]: PVH mmu changes

[Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>]

> @@ -24,9 +24,19 @@ int xen_create_contiguous_region(unsigned long vstart, 
> unsigned int order,
>  void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order);
>  
>  struct vm_area_struct;
> +struct xen_pvh_pfn_info;
>  int xen_remap_domain_mfn_range(struct vm_area_struct *vma,
>                              unsigned long addr,
>                              unsigned long mfn, int nr,
> -                            pgprot_t prot, unsigned domid);
> +                            pgprot_t prot, unsigned domid,
> +                            struct xen_pvh_pfn_info *pvhp);

This change during a git bisection (where we only applied patch #1
and patch #2) will cause a build breakage like this:

/home/konrad/ssd/linux/drivers/xen/privcmd.c: In function âmmap_mfn_rangeâ:
/home/konrad/ssd/linux/drivers/xen/privcmd.c:181: error: too few arguments to 
function âxen_remap_domain_mfn_rangeâ
/home/konrad/ssd/linux/drivers/xen/privcmd.c: In function âmmap_batch_fnâ:
/home/konrad/ssd/linux/drivers/xen/privcmd.c:270: error: too few arguments to 
function âxen_remap_domain_mfn_rangeâ
make[4]: *** [drivers/xen/privcmd.o] Error 1
make[3]: *** [drivers/xen] Error 2


Please squash this patch:

diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index ef63895..802720c 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -178,7 +178,7 @@ static int mmap_mfn_range(void *data, void *state)
                                        msg->va & PAGE_MASK,
                                        msg->mfn, msg->npages,
                                        vma->vm_page_prot,
-                                       st->domain);
+                                       st->domain, NULL);
        if (rc < 0)
                return rc;
 
@@ -267,7 +267,7 @@ static int mmap_batch_fn(void *data, void *state)
        int ret;
 
        ret = xen_remap_domain_mfn_range(st->vma, st->va & PAGE_MASK, *mfnp, 1,
-                                        st->vma->vm_page_prot, st->domain);
+                                        st->vma->vm_page_prot, st->domain, 
NULL);
 
        /* Store error code for second pass. */
        *(st->err++) = ret;

into this patch.

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