From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: Ross Lagerwall <ross.lagerwall@citrix.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Wei Liu <wei.liu2@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>
Subject: [PATCH 24/24] tools: xentoolcore_restrict_all: use domid_t
Date: Wed, 4 Oct 2017 16:57:30 +0100 [thread overview]
Message-ID: <1507132650-25376-25-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1507132650-25376-1-git-send-email-ian.jackson@eu.citrix.com>
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 <Ian.Jackson@eu.citrix.com>
---
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 d6ce73d..b256fce 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 ce3af74..b66d4f9 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 b48ecba..79b24d2 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 bc88110..5f761e5 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 f86f839..fe2e1d5 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 1252bed..70f215f 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 881ff11..be6c570 100644
--- a/tools/libs/toolcore/include/xentoolcore.h
+++ b/tools/libs/toolcore/include/xentoolcore.h
@@ -23,9 +23,10 @@
#define XENTOOLCORE_H
#include <stdint.h>
+#include <xen/xen.h>
/*
- * 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 7e96a48..dbdb1dd 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 ae4b878..23f3f09 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.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-10-04 15:57 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-04 15:57 [PATCH v2 00/24] Provide some actual restriction of qemu Ian Jackson
2017-10-04 15:57 ` [PATCH 01/24] xen: Provide XEN_DMOP_remote_shutdown Ian Jackson
2017-10-04 15:57 ` [PATCH 02/24] xen: x86 dm_op: add missing newline before XEN_DMOP_inject_msi Ian Jackson
2017-10-04 15:57 ` [PATCH 03/24] tools: libxendevicemodel: Provide xendevicemodel_shutdown Ian Jackson
2017-10-05 11:39 ` Wei Liu
2017-10-04 15:57 ` [PATCH 04/24] xentoolcore, _restrict_all: Introduce new library and implementation Ian Jackson
2017-10-06 17:41 ` Ross Lagerwall
2017-10-04 15:57 ` [PATCH 05/24] xentoolcore: Link into stubdoms Ian Jackson
2017-10-05 11:40 ` Wei Liu
2017-10-04 15:57 ` [PATCH 06/24] tools: qemu-xen build: prepare to link against xentoolcore Ian Jackson
2017-10-04 15:57 ` [PATCH 07/24] libxl: #include "xentoolcore_internal.h" Ian Jackson
2017-10-04 15:57 ` [PATCH 08/24] tools: move CONTAINER_OF to xentoolcore_internal.h Ian Jackson
2017-10-04 15:57 ` [PATCH 09/24] xentoolcore_restrict_all: Implement for libxendevicemodel Ian Jackson
2017-10-05 11:40 ` Wei Liu
2017-10-04 15:57 ` [PATCH 10/24] xentoolcore_restrict_all: "Implement" for libxencall Ian Jackson
2017-10-04 15:57 ` [PATCH 11/24] xentoolcore_restrict: Break out xentoolcore__restrict_by_dup2_null Ian Jackson
2017-10-04 15:57 ` [PATCH 12/24] xentoolcore_restrict_all: Implement for libxenforeignmemory Ian Jackson
2017-10-05 11:41 ` Wei Liu
2017-10-04 15:57 ` [PATCH 13/24] xentoolcore_restrict_all: Declare problems due to no evtchn support Ian Jackson
2017-10-04 15:57 ` [PATCH 14/24] xentoolcore_restrict_all: "Implement" for xengnttab Ian Jackson
2017-10-04 15:57 ` [PATCH 15/24] tools/xenstore: get_handle: use "goto err" error handling style Ian Jackson
2017-10-04 15:57 ` [PATCH 16/24] tools/xenstore: get_handle: Allocate struct before opening fd Ian Jackson
2017-10-04 15:57 ` [PATCH 17/24] xentoolcore_restrict_all: "Implement" for xenstore Ian Jackson
2017-10-04 15:57 ` [PATCH 18/24] xentoolcore, _restrict_all: Document implementation "complete" Ian Jackson
2017-10-05 11:41 ` Wei Liu
2017-10-04 15:57 ` [PATCH 19/24] xl, libxl: Provide dm_restrict Ian Jackson
2017-10-04 15:57 ` [PATCH 20/24] libxl: Rationalise calculation of user to run qemu as Ian Jackson
2017-10-05 11:49 ` Wei Liu
2017-10-04 15:57 ` [PATCH 21/24] libxl: libxl__dm_runas_helper: return pwd Ian Jackson
2017-10-04 15:57 ` [PATCH 22/24] libxl: userlookup_helper_getpwnam rename and turn into a macro Ian Jackson
2017-10-04 15:57 ` [PATCH 23/24] libxl: dm_restrict: Support uid range user Ian Jackson
2017-10-05 11:50 ` Wei Liu
2017-10-04 15:57 ` Ian Jackson [this message]
2017-10-05 11:50 ` [PATCH 24/24] tools: xentoolcore_restrict_all: use domid_t Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1507132650-25376-25-git-send-email-ian.jackson@eu.citrix.com \
--to=ian.jackson@eu.citrix.com \
--cc=ross.lagerwall@citrix.com \
--cc=sstabellini@kernel.org \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.