2023-08-28 11:12:07

by Maciej Wieczor-Retman

[permalink] [raw]
Subject: [PATCH 6/6] selftests/kvm: Replace attribute with macro

The __printf() macro is used in many tools in the linux kernel to
validate the format specifiers in functions that use printf. Some
selftests use it without putting it in a macro definition and some tests
import the kselftests.h header.

Use __printf() attribute instead of the full attribute since the macro
is inside kselftests.h and the header is already imported.

Signed-off-by: Wieczor-Retman, Maciej <[email protected]>
---
tools/testing/selftests/kvm/include/test_util.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testing/selftests/kvm/include/test_util.h
index a6e9f215ce70..710a8a78e8ce 100644
--- a/tools/testing/selftests/kvm/include/test_util.h
+++ b/tools/testing/selftests/kvm/include/test_util.h
@@ -33,7 +33,7 @@ static inline int _no_printf(const char *format, ...) { return 0; }
#define pr_info(...) _no_printf(__VA_ARGS__)
#endif

-void print_skip(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
+void __printf(1, 2) print_skip(const char *fmt, ...);
#define __TEST_REQUIRE(f, fmt, ...) \
do { \
if (!(f)) \
--
2.42.0



2023-08-31 00:17:53

by Maciej Wieczor-Retman

[permalink] [raw]
Subject: Re: [PATCH 6/6] selftests/kvm: Replace attribute with macro

On 2023-08-30 at 15:22:57 +0300, Ilpo J?rvinen wrote:
>On Mon, 28 Aug 2023, Wieczor-Retman, Maciej wrote:
>
>> The __printf() macro is used in many tools in the linux kernel to
>> validate the format specifiers in functions that use printf. Some
>> selftests use it without putting it in a macro definition and some tests
>> import the kselftests.h header.
>
>"Some" and yet this only converts one? Please be more precise in the
>wording.

Okay, I'll mention them by subsystem.

>> Use __printf() attribute instead of the full attribute since the macro
>> is inside kselftests.h and the header is already imported.
>
>IMO, this would be enough:
>
>Use __printf() from kselftests.h instead of the full attribute.

Fair enough, I'll change the paragraph to that.

>Was there a reason why you didn't convert mm/pkey-helpers.h one?

Sorry, must have just missed it somehow. Thank you for pointing it out.

--
Kind regards
Maciej Wiecz?r-Retman

2023-09-05 19:45:43

by Andrew Jones

[permalink] [raw]
Subject: Re: [PATCH 6/6] selftests/kvm: Replace attribute with macro

On Wed, Aug 30, 2023 at 03:40:10PM +0200, Maciej Wiecz?r-Retman wrote:
> On 2023-08-30 at 15:22:57 +0300, Ilpo J?rvinen wrote:
> >On Mon, 28 Aug 2023, Wieczor-Retman, Maciej wrote:
> >
> >> The __printf() macro is used in many tools in the linux kernel to
> >> validate the format specifiers in functions that use printf. Some
> >> selftests use it without putting it in a macro definition and some tests
> >> import the kselftests.h header.
> >
> >"Some" and yet this only converts one? Please be more precise in the
> >wording.
>
> Okay, I'll mention them by subsystem.
>
> >> Use __printf() attribute instead of the full attribute since the macro
> >> is inside kselftests.h and the header is already imported.
> >
> >IMO, this would be enough:
> >
> >Use __printf() from kselftests.h instead of the full attribute.
>
> Fair enough, I'll change the paragraph to that.

There are two in kvm selftests. test_assert(), a few lines down, also uses
the attribute.

Thanks,
drew

>
> >Was there a reason why you didn't convert mm/pkey-helpers.h one?
>
> Sorry, must have just missed it somehow. Thank you for pointing it out.
>
> --
> Kind regards
> Maciej Wiecz?r-Retman