From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.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 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 6EBB2C433E0 for ; Fri, 29 Jan 2021 10:58:11 +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 E463164EDF for ; Fri, 29 Jan 2021 10:58:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E463164EDF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=antioche.eu.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.78000.141680 (Exim 4.92) (envelope-from ) id 1l5RTX-0002Fj-HM; Fri, 29 Jan 2021 10:58:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 78000.141680; Fri, 29 Jan 2021 10:58:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l5RTX-0002Fc-Dh; Fri, 29 Jan 2021 10:58:03 +0000 Received: by outflank-mailman (input) for mailman id 78000; Fri, 29 Jan 2021 10:58:02 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l5RTW-0002FG-1J for xen-devel@lists.xenproject.org; Fri, 29 Jan 2021 10:58:02 +0000 Received: from chassiron.antioche.eu.org (unknown [2001:41d0:fe9d:1101::1]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 399be38c-6426-4f81-96d2-f94d7a513063; Fri, 29 Jan 2021 10:58:00 +0000 (UTC) Received: from rochebonne.antioche.eu.org (rochebonne [IPv6:2001:41d0:fe9d:1100:221:70ff:fe0c:9885]) by chassiron.antioche.eu.org (8.15.2/8.15.2) with ESMTP id 10TAvtaC025799; Fri, 29 Jan 2021 11:57:55 +0100 (MET) Received: by rochebonne.antioche.eu.org (Postfix, from userid 1210) id A51E0281D; Fri, 29 Jan 2021 11:57:55 +0100 (CET) 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: 399be38c-6426-4f81-96d2-f94d7a513063 Date: Fri, 29 Jan 2021 11:57:55 +0100 From: Manuel Bouyer To: Roger Pau =?iso-8859-1?Q?Monn=E9?= Cc: xen-devel@lists.xenproject.org, Elena Ufimtseva , Ian Jackson , Wei Liu Subject: Re: [PATCH v2] NetBSD: use system-provided headers Message-ID: <20210129105755.GI2015@antioche.eu.org> References: <20210126224800.1246-1-bouyer@netbsd.org> <20210126224800.1246-4-bouyer@netbsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (chassiron.antioche.eu.org [IPv6:2001:41d0:fe9d:1100:a00:20ff:fe1c:276e]); Fri, 29 Jan 2021 11:57:56 +0100 (MET) On Thu, Jan 28, 2021 at 12:21:33PM +0100, Roger Pau Monné wrote: > On Tue, Jan 26, 2021 at 11:47:50PM +0100, Manuel Bouyer wrote: > > On NetBSD use the system-provided headers for ioctl and related definitions, > > they are up to date and have more chances to match the kernel's idea of > > the ioctls and structures. > > Remove now-unused NetBSD/evtchn.h and NetBSD/privcmd.h. > > Don't fail install if xen/sys/*.h are not present. > > > > Signed-off-by: Manuel Bouyer > > --- > > tools/debugger/gdbsx/xg/xg_main.c | 4 + > > tools/include/Makefile | 2 + > > tools/include/xen-sys/NetBSD/evtchn.h | 86 -------------------- > > tools/include/xen-sys/NetBSD/privcmd.h | 106 ------------------------- > > tools/libs/call/private.h | 4 + > > tools/libs/ctrl/xc_private.h | 4 + > > tools/libs/foreignmemory/private.h | 6 ++ > > 7 files changed, 20 insertions(+), 192 deletions(-) > > delete mode 100644 tools/include/xen-sys/NetBSD/evtchn.h > > delete mode 100644 tools/include/xen-sys/NetBSD/privcmd.h > > > > diff --git a/tools/debugger/gdbsx/xg/xg_main.c b/tools/debugger/gdbsx/xg/xg_main.c > > index 4576c762af..903d60baed 100644 > > --- a/tools/debugger/gdbsx/xg/xg_main.c > > +++ b/tools/debugger/gdbsx/xg/xg_main.c > > @@ -49,7 +49,11 @@ > > #include "xg_public.h" > > #include > > #include > > +#ifdef __NetBSD__ > > +#include > > +#else > > #include > > +#endif > > #include > > #include > > > > diff --git a/tools/include/Makefile b/tools/include/Makefile > > index 4d4ec5f974..04902397b7 100644 > > --- a/tools/include/Makefile > > +++ b/tools/include/Makefile > > @@ -68,7 +68,9 @@ install: all > > $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(includedir)/xen/foreign > > $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(includedir)/xen/hvm > > $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(includedir)/xen/io > > +ifeq ($(wildcard xen/sys/.),) > > Maybe I'm confused, but doesn't this need to be ifneq? So that if > wildcard returns any output the command is executed? > > I would also use $(wildcard xen/sys/*.h) because that matches exactly > the pattern used below. You're right. It's strange that I didn't get an error at install time. Will send a fixed version -- Manuel Bouyer NetBSD: 26 ans d'experience feront toujours la difference --