| Message ID | 1474908249-22819-2-git-send-email-roger.pau@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
I will change lib to libs in subject line while committing On Mon, Sep 26, 2016 at 06:44:08PM +0200, Roger Pau Monne wrote: > Fix the definition of the xengnttab_grant_copy function so it's inline with in line with > the prototypes in xengnttab.h. > > This unbreaks the tools build on systems that don't have a gnttab device. > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> > --- > tools/libs/gnttab/gnttab_unimp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/libs/gnttab/gnttab_unimp.c b/tools/libs/gnttab/gnttab_unimp.c > index 829eced..26e4ee1 100644 > --- a/tools/libs/gnttab/gnttab_unimp.c > +++ b/tools/libs/gnttab/gnttab_unimp.c > @@ -78,9 +78,9 @@ int xengnttab_unmap(xengnttab_handle *xgt, void *start_address, uint32_t count) > abort(); > } > > -int xengnttab_copy_grant(xengnttab_handle *xgt, > +int xengnttab_grant_copy(xengnttab_handle *xgt, > uint32_t count, > - xengnttab_copy_grant_segment_t *segs) > + xengnttab_grant_copy_segment_t *segs) > { > abort(); > } > -- > 2.7.4 (Apple Git-66) >
diff --git a/tools/libs/gnttab/gnttab_unimp.c b/tools/libs/gnttab/gnttab_unimp.c index 829eced..26e4ee1 100644 --- a/tools/libs/gnttab/gnttab_unimp.c +++ b/tools/libs/gnttab/gnttab_unimp.c @@ -78,9 +78,9 @@ int xengnttab_unmap(xengnttab_handle *xgt, void *start_address, uint32_t count) abort(); } -int xengnttab_copy_grant(xengnttab_handle *xgt, +int xengnttab_grant_copy(xengnttab_handle *xgt, uint32_t count, - xengnttab_copy_grant_segment_t *segs) + xengnttab_grant_copy_segment_t *segs) { abort(); }
Fix the definition of the xengnttab_grant_copy function so it's inline with the prototypes in xengnttab.h. This unbreaks the tools build on systems that don't have a gnttab device. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> --- tools/libs/gnttab/gnttab_unimp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)