From: Manuel Bouyer Date: Tue, 26 Jan 2021 22:47:51 +0000 (+0100) Subject: libs/call: fix build on NetBSD X-Git-Tag: 4.15.0-rc1~120 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=51efa5f87bb4cb08d3886b3a555d67acfa40f517;p=xen.git libs/call: fix build on NetBSD Define PAGE_* if not already defined Catch up with osdep interface change. Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- diff --git a/tools/libs/call/netbsd.c b/tools/libs/call/netbsd.c index a5502da377..4dcc2919ba 100644 --- a/tools/libs/call/netbsd.c +++ b/tools/libs/call/netbsd.c @@ -19,12 +19,15 @@ * Split from xc_netbsd.c */ -#include "xc_private.h" #include #include #include +#include #include +#include + +#include "private.h" int osdep_xencall_open(xencall_handle *xcall) { @@ -69,12 +72,13 @@ int osdep_xencall_close(xencall_handle *xcall) return close(fd); } -void *osdep_alloc_hypercall_buffer(xencall_handle *xcall, size_t npages) +void *osdep_alloc_pages(xencall_handle *xcall, size_t npages) { - size_t size = npages * XC_PAGE_SIZE; + size_t size = npages * PAGE_SIZE; void *p; + int ret; - ret = posix_memalign(&p, XC_PAGE_SIZE, size); + ret = posix_memalign(&p, PAGE_SIZE, size); if ( ret != 0 || !p ) return NULL; @@ -86,14 +90,13 @@ void *osdep_alloc_hypercall_buffer(xencall_handle *xcall, size_t npages) return p; } -void osdep_free_hypercall_buffer(xencall_handle *xcall, void *ptr, - size_t npages) +void osdep_free_pages(xencall_handle *xcall, void *ptr, size_t npages) { - (void) munlock(ptr, npages * XC_PAGE_SIZE); + munlock(ptr, npages * PAGE_SIZE); free(ptr); } -int do_xen_hypercall(xencall_handle *xcall, privcmd_hypercall_t *hypercall) +int osdep_hypercall(xencall_handle *xcall, privcmd_hypercall_t *hypercall) { int fd = xcall->fd; int error = ioctl(fd, IOCTL_PRIVCMD_HYPERCALL, hypercall); diff --git a/tools/libs/call/private.h b/tools/libs/call/private.h index 21f992b37e..7944ac5baf 100644 --- a/tools/libs/call/private.h +++ b/tools/libs/call/private.h @@ -12,8 +12,10 @@ #ifndef PAGE_SHIFT /* Mini-os, Yukk */ #define PAGE_SHIFT 12 #endif -#ifndef __MINIOS__ /* Yukk */ +#ifndef PAGE_SIZE #define PAGE_SIZE (1UL << PAGE_SHIFT) +#endif +#ifndef PAGE_MASK #define PAGE_MASK (~(PAGE_SIZE-1)) #endif