From ede2a1ce84ff77f79bdd810c9e7f7decceb64853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Mon, 9 Feb 2026 10:02:18 +0100 Subject: [PATCH] venus: Fix error log on PPC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On the ppc64le architecture error log fail to compile with error: ../src/virtio/vulkan/vn_renderer_virtgpu.c: In function ‘virtgpu_ioctl_map’: ../src/virtio/vulkan/vn_renderer_virtgpu.c:751:66: error: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 6 has type ‘__u64’ {aka ‘long unsigned int’} [-Werror=format=] 751 | "mmap failed: gpu_fd=%d, handle=%u, size=%zu, offset=%llu, err=%s", | ~~~^ | | | long long unsigned int | %lu 752 | gpu->fd, gem_handle, size, args.offset, strerror(errno)); | ~~~~~~~~~~~ | | | __u64 {aka long unsigned int} cc1: some warnings being treated as errors Parse the parameters to fix the failure. Fixes: a49b7adad883 ("venus: add error log coverage for virtgpu backend") (cherry picked from commit dd3fe2d671776334b95ecea1ea909d67d9a82c3a) Part-of: --- .pick_status.json | 2 +- src/virtio/vulkan/vn_renderer_virtgpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c7e373535c3..cbb8e4411c6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -794,7 +794,7 @@ "description": "venus: Fix error log on PPC", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a49b7adad883148f07308fd4d8c1e57796302857", "notes": null diff --git a/src/virtio/vulkan/vn_renderer_virtgpu.c b/src/virtio/vulkan/vn_renderer_virtgpu.c index 575ab9cc4fe..9e233b560d3 100644 --- a/src/virtio/vulkan/vn_renderer_virtgpu.c +++ b/src/virtio/vulkan/vn_renderer_virtgpu.c @@ -749,7 +749,7 @@ virtgpu_ioctl_map(struct virtgpu *gpu, vn_log( gpu->instance, "mmap failed: gpu_fd=%d, handle=%u, size=%zu, offset=%llu, err=%s", - gpu->fd, gem_handle, size, args.offset, strerror(errno)); + gpu->fd, gem_handle, size, (long long)args.offset, strerror(errno)); return NULL; }