git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From b3756eaa49a3de2f388bc269b2928a0233358fea Mon Sep 17 00:00:00 2001
   2 From: Michael Jeanson <mjeanson@efficios.com>
   3 Date: Tue, 7 Mar 2023 12:05:00 -0500
   4 Subject: [PATCH 2/4] fix: uuid: Decouple guid_t and uuid_le types and
   5  respective macros (v6.3)
   6
   7 See upstream commit :
   8
   9   commit 5e6a51787fef20b849682d8c49ec9c2beed5c373
  10   Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  11   Date:   Tue Jan 24 15:38:38 2023 +0200
  12
  13     uuid: Decouple guid_t and uuid_le types and respective macros
  14
  15     The guid_t type and respective macros are being used internally only.
  16     The uuid_le has its user outside the kernel. Decouple these types and
  17     macros, and make guid_t completely internal type to the kernel.
  18
  19 Upstream-Status: Backport
  20
  21 Change-Id: I8644fd139b0630e9cf18886b84e33bffab1e5abd
  22 Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
  23 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  24 ---
  25  include/lttng/events-internal.h | 5 +++--
  26  1 file changed, 3 insertions(+), 2 deletions(-)
  27
  28 diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h
  29 index e31e6abb..a91a659e 100644
  30 --- a/include/lttng/events-internal.h
  31 +++ b/include/lttng/events-internal.h
  32 @@ -9,6 +9,7 @@
  33  #define _LTTNG_EVENTS_INTERNAL_H
  34
  35  #include <wrapper/compiler_attributes.h>
  36 +#include <wrapper/uuid.h>
  37
  38  #include <lttng/events.h>
  39
  40 @@ -289,7 +290,7 @@ struct lttng_metadata_cache {
  41         atomic_t producing;             /* Metadata being produced (incomplete) */
  42         struct kref refcount;           /* Metadata cache usage */
  43         struct list_head metadata_stream;       /* Metadata stream list */
  44 -       uuid_le uuid;                   /* Trace session unique ID (copy) */
  45 +       guid_t uuid;                    /* Trace session unique ID (copy) */
  46         struct mutex lock;              /* Produce/consume lock */
  47         uint64_t version;               /* Current version of the metadata */
  48  };
  49 @@ -463,7 +464,7 @@ struct lttng_kernel_session_private {
  50         struct list_head events;                /* Event list head */
  51         struct list_head list;                  /* Session list */
  52         unsigned int free_chan_id;              /* Next chan ID to allocate */
  53 -       uuid_le uuid;                           /* Trace session unique ID */
  54 +       guid_t uuid;                            /* Trace session unique ID */
  55         struct lttng_metadata_cache *metadata_cache;
  56         unsigned int metadata_dumped:1,
  57                 tstate:1;                       /* Transient enable state */
  58 --
  59 2.34.1
  60