Skip to contentSkip to conversation

tools/libxenguest: fix build in stubdom environment

PATCH In review Juergen Gross 4 participants 4 messages Jun 25, 2025 – Jun 27, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/libxenguest: fix build in stubdom environment

With introduction of the new byteswap infrastructure the build of libxenguest for stubdoms was broken. Fix that again.

Fixes 60dcff871e34 ("xen/decompressors: Remove use of *_to_cpup() helpers")
---
 tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c | 9 +++++++++
 tools/libs/guest/xg_dom_decompress_unsafe_xz.c    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c +9 -0
index ca2f37d915..356f228718 100644
@@ -25,6 +25,15 @@ static inline uint16_t be16_to_cpu(const uint16_t v)
 #endif
 }
 
+static inline uint32_t be32_to_cpu(const uint32_t v)
+{
+#if BYTE_ORDER == LITTLE_ENDIAN
+	return __builtin_bswap32(v);
+#else
+	return v;
+#endif
+}
+
 #include "../../xen/common/lzo.c"
 #include "../../xen/common/unlzo.c"
 
tools/libs/guest/xg_dom_decompress_unsafe_xz.c +1 -1
index 1f52875340..0501f7f693 100644
@@ -25,7 +25,7 @@ static inline uint32_t cpu_to_le32(const uint32_t v)
 #endif
 }
 
-static inline uint32_t le32_to_cpu(const uint32_t p)
+static inline uint32_t le32_to_cpu(const uint32_t v)
 {
 #if BYTE_ORDER == BIG_ENDIAN
 	return __builtin_bswap32(v);
Signature · 1 line
2.43.0
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Juergen Gross

With introduction of the new byteswap infrastructure the build of libxenguest for stubdoms was broken. Fix that again.

Fixes 60dcff871e34 ("xen/decompressors: Remove use of *_to_cpup() helpers")

Sorry for breaking this.  The decompressors are an intractable mess.