From: "Roger Pau Monné" <roger.pau@citrix.com>
To: Manuel Bouyer <bouyer@antioche.eu.org>
Cc: <xen-devel@lists.xenproject.org>,
Manuel Bouyer <bouyer@netbsd.org>,
Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>
Subject: Re: [PATCH] libs/call: fix build on NetBSD
Date: Mon, 18 Jan 2021 19:00:16 +0100 [thread overview]
Message-ID: <20210118180016.325pkeybul5dwcpo@Air-de-Roger> (raw)
In-Reply-To: <20210112181242.1570-9-bouyer@antioche.eu.org>
On Tue, Jan 12, 2021 at 07:12:29PM +0100, Manuel Bouyer wrote:
> From: Manuel Bouyer <bouyer@netbsd.org>
>
> Define PAGE_* if not already defined
> Catch up with osdep interface change.
>
> Signed-off-by: Manuel Bouyer <bouyer@netbsd.org>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Just one comment below, please keep the tag when resending with the
fixed comment.
> ---
> tools/libs/call/netbsd.c | 19 +++++++++++--------
> tools/libs/call/private.h | 6 ++++--
> 2 files changed, 15 insertions(+), 10 deletions(-)
>
> 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 <unistd.h>
> #include <fcntl.h>
> #include <malloc.h>
> +#include <errno.h>
> #include <sys/mman.h>
> +#include <sys/ioctl.h>
> +
> +#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 57e49356a1..2ca84d723b 100644
> --- a/tools/libs/call/private.h
> +++ b/tools/libs/call/private.h
> @@ -13,11 +13,13 @@
> #include <xen/sys/privcmd.h>
> #endif
>
> -#ifndef PAGE_SHIFT /* Mini-os, Yukk */
> +#ifndef PAGE_SHIFT
I would keep the comment somewhere that Mini-os already have all those
defined, and hence we can just straight define them.
Thanks, Roger.
next prev parent reply other threads:[~2021-01-18 18:00 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 18:12 [PATCH] Fix error: array subscript has type 'char' Manuel Bouyer
2021-01-12 18:12 ` [PATCH] NetBSD: Fix lock directory path Manuel Bouyer
2021-01-15 15:09 ` Roger Pau Monné
2021-01-15 15:13 ` Manuel Bouyer
2021-01-15 15:30 ` Andrew Cooper
2021-01-12 18:12 ` [PATCH] NetBSD hotplug: Introduce locking functions Manuel Bouyer
2021-01-27 15:57 ` Ian Jackson
2021-01-27 19:29 ` Manuel Bouyer
2021-01-28 14:05 ` Ian Jackson
2021-01-12 18:12 ` [PATCH] NetBSD hotplug: fix block unconfigure on destroy Manuel Bouyer
2021-01-15 15:27 ` Roger Pau Monné
2021-01-26 16:47 ` Manuel Bouyer
2021-01-27 9:40 ` Roger Pau Monné
2021-01-27 9:47 ` Manuel Bouyer
2021-01-12 18:12 ` [PATCH] NetBSD hotplug: handle case where vifname is not present Manuel Bouyer
2021-01-15 16:06 ` Roger Pau Monné
2021-01-26 16:49 ` Manuel Bouyer
2021-01-12 18:12 ` [PATCH] NetBSD: remove xenbackendd Manuel Bouyer
2021-01-15 15:31 ` Roger Pau Monné
2021-01-18 18:31 ` Andrew Cooper
2021-01-18 18:41 ` Manuel Bouyer
2021-01-12 18:12 ` [PATCH] NetBSD: use system-provided headers Manuel Bouyer
2021-01-15 16:01 ` Roger Pau Monné
2021-01-12 18:12 ` [PATCH] gdbsx: use right path for privcmd Manuel Bouyer
2021-01-18 18:03 ` Roger Pau Monné
2021-01-18 18:45 ` Andrew Cooper
2021-01-18 19:05 ` Manuel Bouyer
2021-01-12 18:12 ` [PATCH] libs/call: fix build on NetBSD Manuel Bouyer
2021-01-18 18:00 ` Roger Pau Monné [this message]
2021-01-12 18:12 ` [PATCH] libs/evtchn: " Manuel Bouyer
2021-01-18 18:01 ` Roger Pau Monné
2021-01-12 18:12 ` [PATCH] libs/foreignmemory: Implement " Manuel Bouyer
2021-01-18 17:49 ` Roger Pau Monné
2021-01-12 18:12 ` [PATCH] libs/gnttab: implement " Manuel Bouyer
2021-01-18 17:54 ` Roger Pau Monné
2021-01-26 17:05 ` Manuel Bouyer
2021-01-27 9:31 ` Roger Pau Monné
2021-01-12 18:12 ` [PATCH] libs/light: Switch NetBSD to QEMU_XEN Manuel Bouyer
2021-01-18 17:28 ` Roger Pau Monné
2021-01-12 18:12 ` [PATCH] libs/light: fix tv_sec printf format Manuel Bouyer
2021-01-18 18:19 ` Roger Pau Monné
2021-01-12 18:12 ` [PATCH] libs/light: fix uuid on NetBSD Manuel Bouyer
2021-01-15 17:27 ` Roger Pau Monné
2021-01-12 18:12 ` [PATCH] libs/light: make it build without setresuid() Manuel Bouyer
2021-01-18 18:16 ` Roger Pau Monné
2021-01-20 14:52 ` Ian Jackson
2021-01-20 15:13 ` Manuel Bouyer
2021-01-20 15:32 ` Ian Jackson
2021-01-20 16:56 ` Manuel Bouyer
2021-01-20 17:10 ` Ian Jackson
2021-01-20 17:20 ` Manuel Bouyer
2021-01-20 17:29 ` Ian Jackson
2021-01-27 16:03 ` Ian Jackson
2021-01-27 19:34 ` Manuel Bouyer
2021-01-28 11:39 ` Ian Jackson
2021-01-30 11:57 ` Manuel Bouyer
2021-01-12 18:12 ` [PATCH] libs/light: pass some infos to qemu Manuel Bouyer
2021-01-16 10:16 ` Roger Pau Monné
2021-01-16 11:25 ` Manuel Bouyer
2021-01-18 8:36 ` Roger Pau Monné
2021-01-18 8:52 ` Manuel Bouyer
2021-01-18 9:07 ` Roger Pau Monné
2021-01-18 9:24 ` Manuel Bouyer
2021-01-26 22:42 ` Manuel Bouyer
2021-01-27 9:06 ` Roger Pau Monné
2021-01-27 9:49 ` Manuel Bouyer
2021-01-12 18:12 ` [PATCH] libs/store: make build without PTHREAD_STACK_MIN Manuel Bouyer
2021-01-18 18:18 ` Roger Pau Monné
2021-01-18 18:56 ` Andrew Cooper
2021-01-18 19:05 ` Manuel Bouyer
2021-01-12 18:12 ` [PATCH] ocaml/libs/eventchn: drop unneeded evtchn.h Manuel Bouyer
2021-01-13 9:22 ` Christian Lindig
2021-01-13 9:40 ` Manuel Bouyer
2021-01-12 18:12 ` [PATCH] xenpaging.c: include errno.h Manuel Bouyer
2021-01-15 16:08 ` Roger Pau Monné
2021-01-12 18:12 ` [PATCH] xenpmd.c: use dynamic allocation Manuel Bouyer
2021-01-27 15:57 ` Ian Jackson
2021-01-12 18:12 ` [PATCH] xenstat_netbsd: remove usused code Manuel Bouyer
2021-01-18 18:06 ` Roger Pau Monné
2021-01-14 10:53 ` [PATCH] Fix error: array subscript has type 'char' Jan Beulich
2021-01-14 12:29 ` Manuel Bouyer
2021-01-14 13:25 ` Jan Beulich
2021-01-14 14:16 ` Manuel Bouyer
2021-01-26 17:44 ` Manuel Bouyer
2021-01-26 17:59 ` Ian Jackson
2021-01-27 8:31 ` Jan Beulich
2021-01-27 8:37 ` Jan Beulich
2021-01-27 13:53 ` [PATCH] Fix error: array subscript has type 'char' [and 1 more messages] Ian Jackson
2021-01-27 14:33 ` Jan Beulich
2021-01-27 16:21 ` Ian Jackson
2021-01-27 16:32 ` Jan Beulich
2021-01-27 16:52 ` George Dunlap
2021-01-27 17:00 ` Jan Beulich
2021-01-27 17:00 ` Ian Jackson
2021-01-18 19:08 ` NetBSD patches Andrew Cooper
2021-01-18 19:11 ` Manuel Bouyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210118180016.325pkeybul5dwcpo@Air-de-Roger \
--to=roger.pau@citrix.com \
--cc=bouyer@antioche.eu.org \
--cc=bouyer@netbsd.org \
--cc=iwj@xenproject.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).