From 52dd77ed9361ec32f96c4ccd86dbc29985522250 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 14 Sep 2017 18:12:57 +0100 Subject: [PATCH] tools: xentoolcore_restrict_all: use domid_t This necessitates adding $(CFLAGS_xeninclude) to all the depending libraries (which can be done via Rules.mk), so that the definition of domid_t (in xen.h) can be found. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/libs/call/core.c | 2 +- tools/libs/devicemodel/core.c | 2 +- tools/libs/foreignmemory/core.c | 2 +- tools/libs/gnttab/gnttab_core.c | 2 +- tools/libs/toolcore/Makefile | 1 + tools/libs/toolcore/handlereg.c | 2 +- tools/libs/toolcore/include/xentoolcore.h | 5 +++-- tools/libs/toolcore/include/xentoolcore_internal.h | 2 +- tools/xenstore/xs.c | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/libs/call/core.c b/tools/libs/call/core.c index d6ce73db34..b256fce98c 100644 --- a/tools/libs/call/core.c +++ b/tools/libs/call/core.c @@ -17,7 +17,7 @@ #include "private.h" -static int all_restrict_cb(Xentoolcore__Active_Handle *ah, uint32_t domid) { +static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { xencall_handle *xcall = CONTAINER_OF(ah, *xcall, tc_ah); return xentoolcore__restrict_by_dup2_null(xcall->fd); } diff --git a/tools/libs/devicemodel/core.c b/tools/libs/devicemodel/core.c index ce3af749bd..b66d4f9294 100644 --- a/tools/libs/devicemodel/core.c +++ b/tools/libs/devicemodel/core.c @@ -21,7 +21,7 @@ #include "private.h" -static int all_restrict_cb(Xentoolcore__Active_Handle *ah, uint32_t domid) { +static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { xendevicemodel_handle *dmod = CONTAINER_OF(ah, *dmod, tc_ah); if (dmod->fd < 0) diff --git a/tools/libs/foreignmemory/core.c b/tools/libs/foreignmemory/core.c index b48ecba8de..79b24d273b 100644 --- a/tools/libs/foreignmemory/core.c +++ b/tools/libs/foreignmemory/core.c @@ -19,7 +19,7 @@ #include "private.h" -static int all_restrict_cb(Xentoolcore__Active_Handle *ah, uint32_t domid) { +static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { xenforeignmemory_handle *fmem = CONTAINER_OF(ah, *fmem, tc_ah); if (fmem->fd < 0) diff --git a/tools/libs/gnttab/gnttab_core.c b/tools/libs/gnttab/gnttab_core.c index bc8811060a..5f761e5469 100644 --- a/tools/libs/gnttab/gnttab_core.c +++ b/tools/libs/gnttab/gnttab_core.c @@ -22,7 +22,7 @@ #include "private.h" -static int all_restrict_cb(Xentoolcore__Active_Handle *ah, uint32_t domid) { +static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { xengnttab_handle *xgt = CONTAINER_OF(ah, *xgt, tc_ah); return xentoolcore__restrict_by_dup2_null(xgt->fd); } diff --git a/tools/libs/toolcore/Makefile b/tools/libs/toolcore/Makefile index 73db0bdef1..8b1d48b7c2 100644 --- a/tools/libs/toolcore/Makefile +++ b/tools/libs/toolcore/Makefile @@ -7,6 +7,7 @@ SHLIB_LDFLAGS += -Wl,--version-script=libxentoolcore.map CFLAGS += -Werror -Wmissing-prototypes CFLAGS += -I./include +CFLAGS += $(CFLAGS_xeninclude) SRCS-y += handlereg.c diff --git a/tools/libs/toolcore/handlereg.c b/tools/libs/toolcore/handlereg.c index 8bd9062b10..baec55e2a4 100644 --- a/tools/libs/toolcore/handlereg.c +++ b/tools/libs/toolcore/handlereg.c @@ -55,7 +55,7 @@ void xentoolcore__deregister_active_handle(Xentoolcore__Active_Handle *ah) { unlock(); } -int xentoolcore_restrict_all(uint32_t domid) { +int xentoolcore_restrict_all(domid_t domid) { int r; Xentoolcore__Active_Handle *ah; diff --git a/tools/libs/toolcore/include/xentoolcore.h b/tools/libs/toolcore/include/xentoolcore.h index 881ff110ca..be6c570815 100644 --- a/tools/libs/toolcore/include/xentoolcore.h +++ b/tools/libs/toolcore/include/xentoolcore.h @@ -23,9 +23,10 @@ #define XENTOOLCORE_H #include +#include /* - * int xentoolcore_restrict_all(uint32_t domid); + * int xentoolcore_restrict_all(domid_t domid); * * Arranges that Xen library handles (fds etc.) which are currently held * by Xen libraries, can no longer be used other than to affect domid. @@ -65,7 +66,7 @@ * xen_some[other]library_open|close or xentoolcore_restrict_all * */ -int xentoolcore_restrict_all(uint32_t domid); +int xentoolcore_restrict_all(domid_t domid); #endif /* XENTOOLCORE_H */ diff --git a/tools/libs/toolcore/include/xentoolcore_internal.h b/tools/libs/toolcore/include/xentoolcore_internal.h index 7e96a48810..dbdb1dd287 100644 --- a/tools/libs/toolcore/include/xentoolcore_internal.h +++ b/tools/libs/toolcore/include/xentoolcore_internal.h @@ -81,7 +81,7 @@ typedef struct Xentoolcore__Active_Handle Xentoolcore__Active_Handle; typedef int Xentoolcore__Restrict_Callback(Xentoolcore__Active_Handle*, - uint32_t domid); + domid_t domid); struct Xentoolcore__Active_Handle { Xentoolcore__Restrict_Callback *restrict_callback; diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c index ae4b878294..23f3f09c8c 100644 --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c @@ -223,7 +223,7 @@ static int get_dev(const char *connect_to) return open(connect_to, O_RDWR); } -static int all_restrict_cb(Xentoolcore__Active_Handle *ah, uint32_t domid) { +static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { struct xs_handle *h = CONTAINER_OF(ah, *h, tc_ah); return xentoolcore__restrict_by_dup2_null(h->fd); } -- 2.30.2