Use the standard format conversion macro PRIx64 to generate the appropriate format conversion for 64-bit integers. Fixes a compiler warning with -Wformat on i386.
Signed-off-by: Ted Logan <[email protected]> Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ --- Compiler warning fixed by patch: In file included from tools/testing/selftests/vfio/lib/include/libvfio.h:6: tools/testing/selftests/vfio/lib/include/libvfio/iommu.h:49:2: warning: format specifies type 'unsigned long' but the argument has type 'u64' (aka 'unsigned long long') [-Wformat] 49 | VFIO_ASSERT_EQ(__iommu_unmap(iommu, region, NULL), 0); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/testing/selftests/vfio/lib/include/libvfio/assert.h:32:37: note: expanded from macro 'VFIO_ASSERT_EQ' 32 | #define VFIO_ASSERT_EQ(_a, _b, ...) VFIO_ASSERT_OP(_a, _b, ==, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/testing/selftests/vfio/lib/include/libvfio/assert.h:27:22: note: expanded from macro 'VFIO_ASSERT_OP' 26 | fprintf(stderr, " Observed: %#lx %s %#lx\n", \ | ~~~~ 27 | (u64)__lhs, #_op, (u64)__rhs); \ | ^~~~~~~~~~ --- tools/testing/selftests/vfio/lib/include/libvfio/assert.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/vfio/lib/include/libvfio/assert.h b/tools/testing/selftests/vfio/lib/include/libvfio/assert.h index f4ebd122d9b6..a2d610e22acd 100644 --- a/tools/testing/selftests/vfio/lib/include/libvfio/assert.h +++ b/tools/testing/selftests/vfio/lib/include/libvfio/assert.h @@ -2,6 +2,7 @@ #ifndef SELFTESTS_VFIO_LIB_INCLUDE_LIBVFIO_ASSERT_H #define SELFTESTS_VFIO_LIB_INCLUDE_LIBVFIO_ASSERT_H +#include <inttypes.h> #include <stdio.h> #include <string.h> #include <sys/ioctl.h> @@ -23,7 +24,7 @@ \ fprintf(stderr, "%s:%u: Assertion Failure\n\n", __FILE__, __LINE__); \ fprintf(stderr, " Expression: " #_lhs " " #_op " " #_rhs "\n"); \ - fprintf(stderr, " Observed: %#lx %s %#lx\n", \ + fprintf(stderr, " Observed: %#" PRIx64 " %s %#" PRIx64 "\n", \ (u64)__lhs, #_op, (u64)__rhs); \ fprintf(stderr, " [errno: %d - %s]\n", errno, strerror(errno)); \ VFIO_LOG_AND_EXIT(__VA_ARGS__); \ -- 2.47.3
