| Message ID | 20221126152507.283271-5-sw@weilnetz.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add format attributes and fix format strings | expand |
On Sat, 26 Nov 2022 at 10:25, Stefan Weil <sw@weilnetz.de> wrote: > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Message-Id: <20220422070144.1043697-4-sw@weilnetz.de> > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > --- > subprojects/libvhost-user/libvhost-user.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) I would rather not merge something that can cause new build failures this late in the release cycle. If you respin, please make this a separate 8.0 patch. > diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c > index 80f9952e71..d6ee6e7d91 100644 > --- a/subprojects/libvhost-user/libvhost-user.c > +++ b/subprojects/libvhost-user/libvhost-user.c > @@ -45,6 +45,17 @@ > #include "libvhost-user.h" > > /* usually provided by GLib */ > +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) > +#if !defined(__clang__) && (__GNUC__ == 4 && __GNUC_MINOR__ == 4) > +#define G_GNUC_PRINTF(format_idx, arg_idx) \ > + __attribute__((__format__(gnu_printf, format_idx, arg_idx))) > +#else > +#define G_GNUC_PRINTF(format_idx, arg_idx) \ > + __attribute__((__format__(__printf__, format_idx, arg_idx))) > +#endif > +#else /* !__GNUC__ */ > +#define G_GNUC_PRINTF(format_idx, arg_idx) > +#endif /* !__GNUC__ */ > #ifndef MIN > #define MIN(x, y) ({ \ > typeof(x) _min1 = (x); \ > @@ -151,7 +162,7 @@ vu_request_to_string(unsigned int req) > } > } > > -static void > +static void G_GNUC_PRINTF(2, 3) > vu_panic(VuDev *dev, const char *msg, ...) > { > char *buf = NULL; > -- > 2.35.1 >
Am 27.11.22 um 19:14 schrieb Stefan Hajnoczi: > On Sat, 26 Nov 2022 at 10:25, Stefan Weil <sw@weilnetz.de> wrote: >> Signed-off-by: Stefan Weil <sw@weilnetz.de> >> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> Message-Id: <20220422070144.1043697-4-sw@weilnetz.de> >> Signed-off-by: Laurent Vivier <laurent@vivier.eu> >> --- >> subprojects/libvhost-user/libvhost-user.c | 13 ++++++++++++- >> 1 file changed, 12 insertions(+), 1 deletion(-) > I would rather not merge something that can cause new build failures > this late in the release cycle. > > If you respin, please make this a separate 8.0 patch. It would only cause a build failure if there remained more format bugs, but the last ones were fixed in patch 3. I tested a build for 32 bit ARM (which previously failed without patch 3), and it works now. But you are right, patch 4 is not release critical as it is not a bug fix (like the other ones), so not including it in 7.2 might be an option. Stefan
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c index 80f9952e71..d6ee6e7d91 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -45,6 +45,17 @@ #include "libvhost-user.h" /* usually provided by GLib */ +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +#if !defined(__clang__) && (__GNUC__ == 4 && __GNUC_MINOR__ == 4) +#define G_GNUC_PRINTF(format_idx, arg_idx) \ + __attribute__((__format__(gnu_printf, format_idx, arg_idx))) +#else +#define G_GNUC_PRINTF(format_idx, arg_idx) \ + __attribute__((__format__(__printf__, format_idx, arg_idx))) +#endif +#else /* !__GNUC__ */ +#define G_GNUC_PRINTF(format_idx, arg_idx) +#endif /* !__GNUC__ */ #ifndef MIN #define MIN(x, y) ({ \ typeof(x) _min1 = (x); \ @@ -151,7 +162,7 @@ vu_request_to_string(unsigned int req) } } -static void +static void G_GNUC_PRINTF(2, 3) vu_panic(VuDev *dev, const char *msg, ...) { char *buf = NULL;