[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH v2] NetBSD: use system-provided headers
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 <bouyer@xxxxxxxxxx> > > --- > > 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 <xen/version.h> > > #include <xen/domctl.h> > > +#ifdef __NetBSD__ > > +#include <xen/xenio.h> > > +#else > > #include <xen/sys/privcmd.h> > > +#endif > > #include <xen/foreign/x86_32.h> > > #include <xen/foreign/x86_64.h> > > > > 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 <bouyer@xxxxxxxxxxxxxxx> NetBSD: 26 ans d'experience feront toujours la difference --
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |