Reorder functions in xc_misc.c to avoid weak symbol problem
PATCH 1/1 Reorder functions in xc_misc.c to avoid weak symbol problem
Using a function, and then declaring it weak later, has undefined
behaviour:
cc1: warnings being treated as errors
xc_misc.c:388: error: weak declaration of 'xc_map_foreign_bulk' after first use results in unspecified behavior
So swap the functions xc_map_foreign_pages and xc_map_foreign_bulk.
Signed-off-by Ian Jackson <[email protected]>
tools/libxc/xc_misc.c +31 -31
@@ -349,37 +349,6 @@ } -void *xc_map_foreign_pages (int xc_handle,uint32_t dom,int prot, -const xen_pfn_t *arr,int num) -{ -void *res; -int i, *err; - -if (num <0 ) { - errno = -EINVAL ; -return NULL ; - } - - err =malloc (num *sizeof (*err)); -if (!err) -return NULL ; - - res =xc_map_foreign_bulk (xc_handle, dom, prot, arr, err, num); -if (res) { -for (i =0 ; i < num; i++) { -if (err[i]) { - errno = -err[i]; -munmap (res, num *PAGE_SIZE ); - res =NULL ; -break ; - } - } - } - -free (err); -return res; -} -/* stub for all not yet converted OSes */ void * #ifdef __GNUC__
@@ -424,6 +393,37 @@return ret; } +void *xc_map_foreign_pages (int xc_handle,uint32_t dom,int prot, +const xen_pfn_t *arr,int num) +{ +void *res; +int i, *err; + +if (num <0 ) { + errno = -EINVAL ; +return NULL ; + } + + err =malloc (num *sizeof (*err)); +if (!err) +return NULL ; + + res =xc_map_foreign_bulk (xc_handle, dom, prot, arr, err, num); +if (res) { +for (i =0 ; i < num; i++) { +if (err[i]) { + errno = -err[i]; +munmap (res, num *PAGE_SIZE ); + res =NULL ; +break ; + } + } + } + +free (err); +return res; +} +/* * Local variables: * mode: C