From patchwork Tue Jan 26 22:47:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Manuel Bouyer X-Patchwork-Id: 12048577 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0002C433E0 for ; Tue, 26 Jan 2021 23:00:06 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 57DA72065E for ; Tue, 26 Jan 2021 23:00:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57DA72065E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=netbsd.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.75668.136305 (Exim 4.92) (envelope-from ) id 1l4XJX-00049d-7X; Tue, 26 Jan 2021 22:59:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 75668.136305; Tue, 26 Jan 2021 22:59:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l4XJX-00049S-0X; Tue, 26 Jan 2021 22:59:59 +0000 Received: by outflank-mailman (input) for mailman id 75668; Tue, 26 Jan 2021 22:59:57 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l4X9J-0001QY-On for xen-devel@lists.xenproject.org; Tue, 26 Jan 2021 22:49:25 +0000 Received: from isis.lip6.fr (unknown [2001:660:3302:283c::2]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 32455d2f-5efb-41df-84d5-dd1c72b63732; Tue, 26 Jan 2021 22:48:37 +0000 (UTC) Received: from asim.lip6.fr (asim.lip6.fr [132.227.86.2]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTP id 10QMmXcl003710; Tue, 26 Jan 2021 23:48:33 +0100 (CET) Received: from borneo.soc.lip6.fr (borneo [132.227.103.47]) by asim.lip6.fr (8.15.2/8.14.4) with ESMTP id 10QMmWnJ009929; Tue, 26 Jan 2021 23:48:33 +0100 (MET) Received: by borneo.soc.lip6.fr (Postfix, from userid 373) id E6B26AA8C1; Tue, 26 Jan 2021 23:48:32 +0100 (MET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 32455d2f-5efb-41df-84d5-dd1c72b63732 From: Manuel Bouyer To: xen-devel@lists.xenproject.org Cc: Manuel Bouyer , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Ian Jackson , Wei Liu Subject: [PATCH v2] libs/call: fix build on NetBSD Date: Tue, 26 Jan 2021 23:47:51 +0100 Message-Id: <20210126224800.1246-5-bouyer@netbsd.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210126224800.1246-1-bouyer@netbsd.org> References: <20210126224800.1246-1-bouyer@netbsd.org> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Tue, 26 Jan 2021 23:48:33 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 Define PAGE_* if not already defined Catch up with osdep interface change. Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- tools/libs/call/netbsd.c | 19 +++++++++++-------- tools/libs/call/private.h | 4 +++- 2 files changed, 14 insertions(+), 9 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 #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