diff mbox

[v2,2/2] tools: Do not expose all builds to unstable hypercall APIs by default

Message ID 1454515849-13886-2-git-send-email-ian.campbell@citrix.com
State New, archived
Headers show

Commit Message

Ian Campbell Feb. 3, 2016, 4:10 p.m. UTC
Currently __XEN_TOOLS__ is defined in the global CFLAGS used for tools
builds, exposing them all to the various unstable hypercall interfaces.

However there are places where we do not want this (in particular all
the stable libraries now under tools/libs), and there is a risk of
such uses slipping in unnoticed (currently there are none, but I
tripped over the mixed nature of the HVMOPs just now in some new code
I was putting together).

Instead only define __XEN_TOOLS__ for things which explicitly want the
unstable APIs. The vast majority of these are consumers of libxenctrl,
which have opted into unstable interfaces by using libxenctrl already,
so adding -D__XEN_TOOLS__ to CFLAGS_libxenctrl covers these without
needing to patch the dozen or so tools manually.

The libxc build itself, which doesn't use CFLAGS_libxenctrl, now needs
the define too. As does gdbsx's own low level hypercall binding
library xg.

hvmloader no longer needs to undefine the symbol.

The ocaml evtchn bindings don't actually need sysctl.h and therefore
don't actually need __XEN_TOOLS__ either.

qemu-xen-traditional doesn't use CFLAGS_libxenctrl and so we pass the
define there (via --extra-cflags) too.

Having removed __XEN_TOOLS__ replace it with
__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__ so that in
tree code is always using the latest APIs.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Define __XEN_INTERFACE_VERSION__ to be the latest for everyone.
---
 tools/Makefile                                | 2 +-
 tools/Rules.mk                                | 6 ++++--
 tools/debugger/gdbsx/xg/Makefile              | 1 +
 tools/firmware/hvmloader/Makefile             | 2 +-
 tools/libxc/Makefile                          | 1 +
 tools/ocaml/libs/eventchn/xeneventchn_stubs.c | 1 -
 6 files changed, 8 insertions(+), 5 deletions(-)

Comments

Ian Jackson Feb. 3, 2016, 4:13 p.m. UTC | #1
Ian Campbell writes ("[PATCH v2 2/2] tools: Do not expose all builds to unstable hypercall APIs by default"):
> Currently __XEN_TOOLS__ is defined in the global CFLAGS used for tools
> builds, exposing them all to the various unstable hypercall interfaces.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Andrew Cooper Feb. 3, 2016, 5:09 p.m. UTC | #2
On 03/02/16 16:10, Ian Campbell wrote:
> Currently __XEN_TOOLS__ is defined in the global CFLAGS used for tools
> builds, exposing them all to the various unstable hypercall interfaces.
>
> However there are places where we do not want this (in particular all
> the stable libraries now under tools/libs), and there is a risk of
> such uses slipping in unnoticed (currently there are none, but I
> tripped over the mixed nature of the HVMOPs just now in some new code
> I was putting together).
>
> Instead only define __XEN_TOOLS__ for things which explicitly want the
> unstable APIs. The vast majority of these are consumers of libxenctrl,
> which have opted into unstable interfaces by using libxenctrl already,
> so adding -D__XEN_TOOLS__ to CFLAGS_libxenctrl covers these without
> needing to patch the dozen or so tools manually.
>
> The libxc build itself, which doesn't use CFLAGS_libxenctrl, now needs
> the define too. As does gdbsx's own low level hypercall binding
> library xg.
>
> hvmloader no longer needs to undefine the symbol.
>
> The ocaml evtchn bindings don't actually need sysctl.h and therefore
> don't actually need __XEN_TOOLS__ either.
>
> qemu-xen-traditional doesn't use CFLAGS_libxenctrl and so we pass the
> define there (via --extra-cflags) too.
>
> Having removed __XEN_TOOLS__ replace it with
> __XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__ so that in
> tree code is always using the latest APIs.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> for the x86 bits.
diff mbox

Patch

diff --git a/tools/Makefile b/tools/Makefile
index 3d3fd60..cb8652c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -194,7 +194,7 @@  qemu-traditional-recurse = \
 subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
 	$(call qemu-traditional-recurse,\
 		$(QEMU_ROOT)/xen-setup \
-		--extra-cflags="$(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \
+		--extra-cflags="-D__XEN_TOOLS__ $(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \
 		$(IOEMU_EXTRA_LDFLAGS) \
 		--cpu=$(IOEMU_CPU_ARCH) \
 		$(IOEMU_CONFIGURE_CROSS); \
diff --git a/tools/Rules.mk b/tools/Rules.mk
index d47fa45..9ef0b47 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -108,7 +108,9 @@  CFLAGS_libxenforeignmemory = -I$(XEN_LIBXENFOREIGNMEMORY)/include $(CFLAGS_xenin
 LDLIBS_libxenforeignmemory = $(XEN_LIBXENFOREIGNMEMORY)/libxenforeignmemory$(libextension)
 SHLIB_libxenforeignmemory  = -Wl,-rpath-link=$(XEN_LIBXENFOREIGNMEMORY)
 
-CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog) $(CFLAGS_libxenforeignmemory) $(CFLAGS_xeninclude)
+# code which compiles against libxenctrl get __XEN_TOOLS__ and
+# therefore sees the unstable hypercall interfaces.
+CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog) $(CFLAGS_libxenforeignmemory) $(CFLAGS_xeninclude) -D__XEN_TOOLS__
 SHDEPS_libxenctrl = $(SHLIB_libxentoollog) $(SHLIB_libxenevtchn) $(SHLIB_libxengnttab) $(SHLIB_libxengntshr) $(SHLIB_libxencall) $(SHLIB_libxenforeignmemory)
 LDLIBS_libxenctrl = $(SHDEPS_libxenctrl) $(XEN_LIBXC)/libxenctrl$(libextension)
 SHLIB_libxenctrl  = $(SHDEPS_libxenctrl) -Wl,-rpath-link=$(XEN_LIBXC)
@@ -159,7 +161,7 @@  SHDEPS_libxenlight = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapc
 LDLIBS_libxenlight = $(SHDEPS_libxenlight) $(XEN_XENLIGHT)/libxenlight$(libextension)
 SHLIB_libxenlight  = $(SHDEPS_libxenlight) -Wl,-rpath-link=$(XEN_XENLIGHT)
 
-CFLAGS += -D__XEN_TOOLS__
+CFLAGS += -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__
 
 # Get gcc to generate the dependencies for us.
 CFLAGS += -MMD -MF .$(if $(filter-out .,$(@D)),$(subst /,@,$(@D))@)$(@F).d
diff --git a/tools/debugger/gdbsx/xg/Makefile b/tools/debugger/gdbsx/xg/Makefile
index 78b4021..6a8937b 100644
--- a/tools/debugger/gdbsx/xg/Makefile
+++ b/tools/debugger/gdbsx/xg/Makefile
@@ -4,6 +4,7 @@  include ../Rules.mk
 XG_HDRS := xg_public.h 
 XG_OBJS := xg_main.o 
 
+CFLAGS += -D__XEN_TOOLS__
 CFLAGS += $(CFLAGS_xeninclude)
 
 
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 0560a7b..f2f4791 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -31,7 +31,7 @@  SMBIOS_REL_DATE ?= $(shell date +%m/%d/%Y)
 CFLAGS += $(CFLAGS_xeninclude)
 
 # We mustn't use tools-only public interfaces.
-CFLAGS += -U__XEN_TOOLS__ -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__
+CFLAGS += -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__
 
 OBJS  = hvmloader.o mp_tables.o util.o smbios.o 
 OBJS += smp.o cacheattr.o xenbus.o vnuma.o
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index ca8bab7..0a8614c 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -105,6 +105,7 @@  endif
 
 CFLAGS   += -Werror -Wmissing-prototypes
 CFLAGS   += -I. -I./include $(CFLAGS_xeninclude)
+CFLAGS   += -D__XEN_TOOLS__
 
 # Needed for posix_fadvise64() in xc_linux.c
 CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE
diff --git a/tools/ocaml/libs/eventchn/xeneventchn_stubs.c b/tools/ocaml/libs/eventchn/xeneventchn_stubs.c
index c2d4737..9580396 100644
--- a/tools/ocaml/libs/eventchn/xeneventchn_stubs.c
+++ b/tools/ocaml/libs/eventchn/xeneventchn_stubs.c
@@ -21,7 +21,6 @@ 
 #include <errno.h>
 #include <stdint.h>
 #include <sys/ioctl.h>
-#include <xen/sysctl.h>
 #include <xen/xen.h>
 #include <xen/sys/evtchn.h>
 #include <xenevtchn.h>