X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-abi.h;h=6a15e0dd346fa2e07e522e96d8627a5234b5f074;hb=ef9ff354212ff4b038e1a5b6a7ed0ffe1b949663;hp=8b8197731b10714543ca2948e386187f2bf36e70;hpb=345672b3fe38367d674f9d85b0bb4327f5a5c586;p=lttng-ust.git

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index 8b819773..6a15e0dd 100644
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -49,10 +49,6 @@ struct lttng_ust_channel {
 	unsigned int switch_timer_interval;	/* usecs */
 	unsigned int read_timer_interval;	/* usecs */
 	enum lttng_ust_output output;		/* output mode */
-	/* The following fields are used internally within UST. */
-	int shm_fd;
-	int wait_fd;
-	uint64_t memory_map_size;
 };
 
 /*
@@ -158,8 +154,22 @@ struct lttng_ust_object_data {
 
 struct lttng_ust_obj;
 
+union ust_args {
+	struct {
+		int *shm_fd;
+		int *wait_fd;
+		uint64_t *memory_map_size;
+	} channel;
+	struct {
+		int *shm_fd;
+		int *wait_fd;
+		uint64_t *memory_map_size;
+	} stream;
+};
+
 struct lttng_ust_objd_ops {
-	long (*cmd)(int objd, unsigned int cmd, unsigned long arg);
+	long (*cmd)(int objd, unsigned int cmd, unsigned long arg,
+		union ust_args *args);
 	int (*release)(int objd);
 };