Fix: correctly version kvm events to build against v3.0 kernel

[lttng-modules.git] / lttng-events.h

diff --git a/lttng-events.h b/lttng-events.h
index 46d80bcdb0edcd1a6d3599e7f630f240ecb28b0f..cf31b2e1017f97579446071d4e5816fc8b67ab0c 100644 (file)
--- a/lttng-events.h
+++ b/lttng-events.h
@@ -169,7 +169,8 @@ struct lttng_ctx {
 };
 
 struct lttng_event_desc {
-       const char *name;
+       const char *name;               /* lttng-modules name */
+       const char *kname;              /* Linux kernel name (tracepoints) */
        void *probe_callback;
        const struct lttng_event_ctx *ctx;      /* context */
        const struct lttng_event_field *fields; /* event payload */
@@ -278,10 +279,12 @@ struct lttng_channel {
 struct lttng_metadata_stream {
        void *priv;                     /* Ring buffer private data */
        struct lttng_metadata_cache *metadata_cache;
-       unsigned int metadata_cache_read; /* Bytes read from the cache */
+       unsigned int metadata_in;       /* Bytes read from the cache */
+       unsigned int metadata_out;      /* Bytes consumed from stream */
        int finalized;                  /* Has channel been finalized */
        wait_queue_head_t read_wait;    /* Reader buffer-level wait queue */
        struct list_head list;          /* Stream list */
+       struct lttng_transport *transport;
 };
 
 struct lttng_session {
@@ -355,8 +358,8 @@ void lttng_event_put(const struct lttng_event_desc *desc);
 int lttng_probes_init(void);
 void lttng_probes_exit(void);
 
-int lttng_metadata_output_channel(struct lttng_channel *chan,
-               struct lttng_metadata_stream *stream);
+int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
+               struct channel *chan);
 
 #if defined(CONFIG_HAVE_SYSCALL_TRACEPOINTS)
 int lttng_syscalls_register(struct lttng_channel *chan, void *filter);