mirrors/meta-openembedded
1
0 Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-10-20 19:58:34 +00:00
Code Issues Projects Releases Wiki Activity

tcmu-runner: Fix build on 32-bit targets with clang

Browse Source 
tcmu_lba_to_byte() returns uint64_t while size_t is 32-bit on ILP32
targets, so the type-checking min() macro fails with
-Werror,-Wcompare-distinct-pointer-types. Compare in 64 bits; the
result never exceeds length, so it still fits in size_t.

Build-tested for qemuriscv32 (musl, clang).

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Khem Raj committed 2026-10-18 12:39:53 -07:00
1 parent 4b2e478a90
commit 0d157ff168
2 files changed
+35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

meta-filesystems/recipes-utils/tcmu-runner/tcmu-runner/0004-tcmur_cmd_handler-fix-min-type-mismatch-on-32-bit.patch
+34
View File
@@ -0,0 +1,34 @@
From: Khem Raj <khem.raj@oss.qualcomm.com>
Date: Sat, 17 Oct 2026 00:00:00 -0700
Subject: [PATCH] tcmur_cmd_handler: Fix min() type mismatch on 32-bit targets
tcmu_lba_to_byte() returns uint64_t while length is size_t, which is
32-bit on ILP32 targets. The type-checking min() macro then compares
pointers to distinct types and clang errors out with
error: comparison of distinct pointer types ('typeof (length) *'
(aka 'unsigned int *') and 'typeof (tcmu_lba_to_byte(dev, lba_cnt)) *'
(aka 'unsigned long long *')) [-Werror,-Wcompare-distinct-pointer-types]
Do the comparison in 64 bits; the result never exceeds length, so it
still fits in size_t.
Upstream-Status: Pending
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
tcmur_cmd_handler.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tcmur_cmd_handler.c b/tcmur_cmd_handler.c
index 01d6a10..c676e84 100644
--- a/tcmur_cmd_handler.c
+++ b/tcmur_cmd_handler.c
@@ -768,7 +768,7 @@ static int handle_writesame(struct tcmu_device *dev, struct tcmulib_cmd *cmd)
max_xfer_length = tcmu_dev_get_max_xfer_len(dev) * block_size;
length = round_up(length, max_xfer_length);
- length = min(length, tcmu_lba_to_byte(dev, lba_cnt));
+ length = min((uint64_t)length, tcmu_lba_to_byte(dev, lba_cnt));
if (tcmur_cmd_state_init(tcmur_cmd, sizeof(*write_same), length)) {
tcmu_dev_err(dev, "Failed to calloc write_same data!\n");
meta-filesystems/recipes-utils/tcmu-runner/tcmu-runner_1.6.2.bb
+1
View File
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/open-iscsi/tcmu-runner.git;protocol=https;branch=mai
file://0001-CMakeLists-generate-gdbus-code-with-a-relative-path.patch \
file://0002-qcow-fix-cache-count-reset-loops.patch \
file://0003-target-alua-initialize-list_for_each-iterator-variables.patch \
file://0004-tcmur_cmd_handler-fix-min-type-mismatch-on-32-bit.patch \
"
inherit cmake pkgconfig systemd