diff mbox series

babeltrace2: Update patch to upstreamed version of patch

Message ID 20250514214227.647247-1-raj.khem@gmail.com
State New
Headers show
Series babeltrace2: Update patch to upstreamed version of patch | expand

Commit Message

Khem Raj May 14, 2025, 9:42 p.m. UTC 
Update to the version of patch that landed upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...ob_get_length-return-size_t-instead-.patch | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch
index d923437a2ab..4dffa7bfa5b 100644
--- a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch
@@ -1,8 +1,8 @@ 
-From 1b514ab2e878216426acc493eeab96088576faf9 Mon Sep 17 00:00:00 2001
+From a73cef80a0d4129f74ab2e160a15693235aad4d1 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 20 Mar 2025 18:10:08 -0700
-Subject: [PATCH] Make bt_field_blob_get_length return size_t instead of
- uint64_t
+Subject: [PATCH] Cast result of bt_field_blob_get_length to size_t in
+ constructor of bt2s::span
 
 Fixes errors e.g.
 | ../../git/src/cpp-common/bt2/field.hpp:1139:82: error: non-constant-expression cannot be narrowed from type 'std::uint64_t' (aka 'unsigned long long') to 'size_type' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
@@ -16,22 +16,23 @@  Fixes errors e.g.
 |       |                                                                                  ^~~~~~~~~~~~~~
 |       |                                                                                  static_cast<size_type>( )
 
-Upstream-Status: Submitted [https://github.com/efficios/babeltrace/pull/120]
+Upstream-Status: Backport [https://github.com/efficios/babeltrace/commit/1e6b34e411c61135ad256047a985a9bad927eae0]
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  src/cpp-common/bt2/field.hpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/cpp-common/bt2/field.hpp b/src/cpp-common/bt2/field.hpp
-index 8b291f7a1..cbfff84f0 100644
+index 8b291f7a..3a7d30a4 100644
 --- a/src/cpp-common/bt2/field.hpp
 +++ b/src/cpp-common/bt2/field.hpp
-@@ -1139,7 +1139,7 @@ public:
-         return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()};
-     }
+@@ -1136,7 +1136,7 @@ public:
  
--    std::uint64_t length() const noexcept
-+    std::size_t length() const noexcept
+     bt2s::span<typename internal::CommonBlobFieldSpec<LibObjT>::Data> data() const noexcept
      {
-         return bt_field_blob_get_length(this->libObjPtr());
+-        return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()};
++        return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), static_cast<std::size_t>(this->length())};
      }
+ 
+     std::uint64_t length() const noexcept