OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Replace GCC_FMT_ATTR with G_GNUC_PRINTF 

One less qemu-specific macro. It also helps to make some headers/units
only depend on glib, and thus moved in standalone projects eventually.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-02-20 20:39:25 +04:00
parent e7b7942822
commit 9edc6313da
58 changed files with 130 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/alsaaudio.c
View File

@ -72,7 +72,7 @@ struct alsa_params_obt {
snd_pcm_uframes_t samples; snd_pcm_uframes_t samples;
}; };
static void GCC_FMT_ATTR (2, 3) alsa_logerr (int err, const char *fmt, ...) static void G_GNUC_PRINTF (2, 3) alsa_logerr (int err, const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -83,7 +83,7 @@ static void GCC_FMT_ATTR (2, 3) alsa_logerr (int err, const char *fmt, ...)
AUD_log (AUDIO_CAP, "Reason: %s\n", snd_strerror (err)); AUD_log (AUDIO_CAP, "Reason: %s\n", snd_strerror (err));
} }
static void GCC_FMT_ATTR (3, 4) alsa_logerr2 ( static void G_GNUC_PRINTF (3, 4) alsa_logerr2 (
int err, int err,
const char *typ, const char *typ,
const char *fmt, const char *fmt,

4
audio/audio.h
View File

@ -91,8 +91,8 @@ typedef struct QEMUAudioTimeStamp {
uint64_t old_ts; uint64_t old_ts;
} QEMUAudioTimeStamp; } QEMUAudioTimeStamp;
void AUD_vlog (const char *cap, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0); void AUD_vlog (const char *cap, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0);
void AUD_log (const char *cap, const char *fmt, ...) GCC_FMT_ATTR(2, 3); void AUD_log (const char *cap, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
void AUD_register_card (const char *name, QEMUSoundCard *card); void AUD_register_card (const char *name, QEMUSoundCard *card);
void AUD_remove_card (QEMUSoundCard *card); void AUD_remove_card (QEMUSoundCard *card);

4
audio/coreaudio.m
View File

@ -211,7 +211,7 @@ static void coreaudio_logstatus (OSStatus status)
AUD_log (AUDIO_CAP, "Reason: %s\n", str); AUD_log (AUDIO_CAP, "Reason: %s\n", str);
} }
static void GCC_FMT_ATTR (2, 3) coreaudio_logerr ( static void G_GNUC_PRINTF (2, 3) coreaudio_logerr (
OSStatus status, OSStatus status,
const char *fmt, const char *fmt,
... ...
@ -226,7 +226,7 @@ static void GCC_FMT_ATTR (2, 3) coreaudio_logerr (
coreaudio_logstatus (status); coreaudio_logstatus (status);
} }
static void GCC_FMT_ATTR (3, 4) coreaudio_logerr2 ( static void G_GNUC_PRINTF (3, 4) coreaudio_logerr2 (
OSStatus status, OSStatus status,
const char *typ, const char *typ,
const char *fmt, const char *fmt,

4
audio/dsoundaudio.c
View File

@ -222,7 +222,7 @@ static void dsound_log_hresult (HRESULT hr)
AUD_log (AUDIO_CAP, "Reason: %s\n", str); AUD_log (AUDIO_CAP, "Reason: %s\n", str);
} }
static void GCC_FMT_ATTR (2, 3) dsound_logerr ( static void G_GNUC_PRINTF (2, 3) dsound_logerr (
HRESULT hr, HRESULT hr,
const char *fmt, const char *fmt,
... ...
@ -237,7 +237,7 @@ static void GCC_FMT_ATTR (2, 3) dsound_logerr (
dsound_log_hresult (hr); dsound_log_hresult (hr);
} }
static void GCC_FMT_ATTR (3, 4) dsound_logerr2 ( static void G_GNUC_PRINTF (3, 4) dsound_logerr2 (
HRESULT hr, HRESULT hr,
const char *typ, const char *typ,
const char *fmt, const char *fmt,

4
audio/ossaudio.c
View File

@ -63,7 +63,7 @@ struct oss_params {
int fragsize; int fragsize;
}; };
static void GCC_FMT_ATTR (2, 3) oss_logerr (int err, const char *fmt, ...) static void G_GNUC_PRINTF (2, 3) oss_logerr (int err, const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -74,7 +74,7 @@ static void GCC_FMT_ATTR (2, 3) oss_logerr (int err, const char *fmt, ...)
AUD_log (AUDIO_CAP, "Reason: %s\n", strerror (err)); AUD_log (AUDIO_CAP, "Reason: %s\n", strerror (err));
} }
static void GCC_FMT_ATTR (3, 4) oss_logerr2 ( static void G_GNUC_PRINTF (3, 4) oss_logerr2 (
int err, int err,
const char *typ, const char *typ,
const char *fmt, const char *fmt,

2
audio/paaudio.c
View File

@ -43,7 +43,7 @@ typedef struct {
static void qpa_conn_fini(PAConnection *c); static void qpa_conn_fini(PAConnection *c);
static void GCC_FMT_ATTR (2, 3) qpa_logerr (int err, const char *fmt, ...) static void G_GNUC_PRINTF (2, 3) qpa_logerr (int err, const char *fmt, ...)
{ {
va_list ap; va_list ap;

2
audio/sdlaudio.c
View File

@ -55,7 +55,7 @@ typedef struct SDLVoiceIn {
SDL_AudioDeviceID devid; SDL_AudioDeviceID devid;
} SDLVoiceIn; } SDLVoiceIn;
static void GCC_FMT_ATTR (1, 2) sdl_logerr (const char *fmt, ...) static void G_GNUC_PRINTF (1, 2) sdl_logerr (const char *fmt, ...)
{ {
va_list ap; va_list ap;

2
block/blkverify.c
View File

@ -44,7 +44,7 @@ typedef struct BlkverifyRequest {
QEMUIOVector *raw_qiov; /* cloned I/O vector for raw file */ QEMUIOVector *raw_qiov; /* cloned I/O vector for raw file */
} BlkverifyRequest; } BlkverifyRequest;
static void GCC_FMT_ATTR(2, 3) blkverify_err(BlkverifyRequest *r, static void G_GNUC_PRINTF(2, 3) blkverify_err(BlkverifyRequest *r,
const char *fmt, ...) const char *fmt, ...)
{ {
va_list ap; va_list ap;

2
block/qcow2.h
View File

@ -838,7 +838,7 @@ int qcow2_update_header(BlockDriverState *bs);
void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset, void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
int64_t size, const char *message_format, ...) int64_t size, const char *message_format, ...)
GCC_FMT_ATTR(5, 6); G_GNUC_PRINTF(5, 6);
int qcow2_validate_table(BlockDriverState *bs, uint64_t offset, int qcow2_validate_table(BlockDriverState *bs, uint64_t offset,
uint64_t entries, size_t entry_len, uint64_t entries, size_t entry_len,

4
block/ssh.c
View File

@ -108,7 +108,7 @@ static void ssh_state_free(BDRVSSHState *s)
} }
} }
static void GCC_FMT_ATTR(3, 4) static void G_GNUC_PRINTF(3, 4)
session_error_setg(Error **errp, BDRVSSHState *s, const char *fs, ...) session_error_setg(Error **errp, BDRVSSHState *s, const char *fs, ...)
{ {
va_list args; va_list args;
@ -133,7 +133,7 @@ session_error_setg(Error **errp, BDRVSSHState *s, const char *fs, ...)
g_free(msg); g_free(msg);
} }
static void GCC_FMT_ATTR(3, 4) static void G_GNUC_PRINTF(3, 4)
sftp_error_setg(Error **errp, BDRVSSHState *s, const char *fs, ...) sftp_error_setg(Error **errp, BDRVSSHState *s, const char *fs, ...)
{ {
va_list args; va_list args;

2
bsd-user/qemu.h
View File

@ -175,7 +175,7 @@ abi_long do_netbsd_syscall(void *cpu_env, int num, abi_long arg1,
abi_long do_openbsd_syscall(void *cpu_env, int num, abi_long arg1, abi_long do_openbsd_syscall(void *cpu_env, int num, abi_long arg1,
abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg2, abi_long arg3, abi_long arg4,
abi_long arg5, abi_long arg6); abi_long arg5, abi_long arg6);
void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void gemu_log(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
extern __thread CPUState *thread_cpu; extern __thread CPUState *thread_cpu;
void cpu_loop(CPUArchState *env); void cpu_loop(CPUArchState *env);
char *target_strerror(int err); char *target_strerror(int err);

2
fsdev/9p-marshal.c
View File

@ -27,7 +27,7 @@ void v9fs_string_free(V9fsString *str)
str->size = 0; str->size = 0;
} }
void GCC_FMT_ATTR(2, 3) void G_GNUC_PRINTF(2, 3)
v9fs_string_sprintf(V9fsString *str, const char *fmt, ...) v9fs_string_sprintf(V9fsString *str, const char *fmt, ...)
{ {
va_list ap; va_list ap;

2
fsdev/virtfs-proxy-helper.c
View File

@ -57,7 +57,7 @@ static bool is_daemon;
static bool get_version; /* IOC getversion IOCTL supported */ static bool get_version; /* IOC getversion IOCTL supported */
static char *prog_name; static char *prog_name;
static void GCC_FMT_ATTR(2, 3) do_log(int loglevel, const char *format, ...) static void G_GNUC_PRINTF(2, 3) do_log(int loglevel, const char *format, ...)
{ {
va_list ap; va_list ap;

2
hw/9pfs/9p.c
View File

@ -203,7 +203,7 @@ void v9fs_path_free(V9fsPath *path)
} }
void GCC_FMT_ATTR(2, 3) void G_GNUC_PRINTF(2, 3)
v9fs_path_sprintf(V9fsPath *path, const char *fmt, ...) v9fs_path_sprintf(V9fsPath *path, const char *fmt, ...)
{ {
va_list ap; va_list ap;

4
hw/acpi/aml-build.c
View File

@ -207,7 +207,7 @@ build_append_nameseg(GArray *array, const char *seg)
g_array_append_vals(array, "____", ACPI_NAMESEG_LEN - len); g_array_append_vals(array, "____", ACPI_NAMESEG_LEN - len);
} }
static void GCC_FMT_ATTR(2, 0) static void G_GNUC_PRINTF(2, 0)
build_append_namestringv(GArray *array, const char *format, va_list ap) build_append_namestringv(GArray *array, const char *format, va_list ap)
{ {
char *s; char *s;
@ -270,7 +270,7 @@ build_append_namestringv(GArray *array, const char *format, va_list ap)
g_strfreev(segs); g_strfreev(segs);
} }
GCC_FMT_ATTR(2, 3) G_GNUC_PRINTF(2, 3)
static void build_append_namestring(GArray *array, const char *format, ...) static void build_append_namestring(GArray *array, const char *format, ...)
{ {
va_list ap; va_list ap;

2
hw/display/qxl.h
View File

@ -149,7 +149,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL)
/* qxl.c */ /* qxl.c */
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id); void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id);
void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id, void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id,
struct QXLRect *area, struct QXLRect *dirty_rects, struct QXLRect *area, struct QXLRect *dirty_rects,

2
hw/mips/fuloong2e.c
View File

@ -72,7 +72,7 @@ static struct _loaderparams {
const char *initrd_filename; const char *initrd_filename;
} loaderparams; } loaderparams;
static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *prom_buf, int index, static void G_GNUC_PRINTF(3, 4) prom_set(uint32_t *prom_buf, int index,
const char *string, ...) const char *string, ...)
{ {
va_list ap; va_list ap;

2
hw/mips/malta.c
View File

@ -995,7 +995,7 @@ static void write_bootloader(uint8_t *base, uint64_t run_addr,
} }
static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *prom_buf, int index, static void G_GNUC_PRINTF(3, 4) prom_set(uint32_t *prom_buf, int index,
const char *string, ...) const char *string, ...)
{ {
va_list ap; va_list ap;

2
hw/net/rocker/rocker.h
View File

@ -30,7 +30,7 @@
fprintf(stderr, "%s ROCKER: " fmt, nowstr, ## __VA_ARGS__);\ fprintf(stderr, "%s ROCKER: " fmt, nowstr, ## __VA_ARGS__);\
} while (0) } while (0)
#else #else
static inline GCC_FMT_ATTR(1, 2) int DPRINTF(const char *fmt, ...) static inline G_GNUC_PRINTF(1, 2) int DPRINTF(const char *fmt, ...)
{ {
return 0; return 0;
} }

2
hw/net/rtl8139.c
View File

@ -86,7 +86,7 @@
# define DPRINTF(fmt, ...) \ # define DPRINTF(fmt, ...) \
do { fprintf(stderr, "RTL8139: " fmt, ## __VA_ARGS__); } while (0) do { fprintf(stderr, "RTL8139: " fmt, ## __VA_ARGS__); } while (0)
#else #else
static inline GCC_FMT_ATTR(1, 2) int DPRINTF(const char *fmt, ...) static inline G_GNUC_PRINTF(1, 2) int DPRINTF(const char *fmt, ...)
{ {
return 0; return 0;
} }

2
hw/virtio/virtio.c
View File

@ -3579,7 +3579,7 @@ void virtio_device_set_child_bus_name(VirtIODevice *vdev, char *bus_name)
vdev->bus_name = g_strdup(bus_name); vdev->bus_name = g_strdup(bus_name);
} }
void GCC_FMT_ATTR(2, 3) virtio_error(VirtIODevice *vdev, const char *fmt, ...) void G_GNUC_PRINTF(2, 3) virtio_error(VirtIODevice *vdev, const char *fmt, ...)
{ {
va_list ap; va_list ap;

2
hw/xen/xen_pt.h
View File

@ -9,7 +9,7 @@
bool xen_igd_gfx_pt_enabled(void); bool xen_igd_gfx_pt_enabled(void);
void xen_igd_gfx_pt_set(bool value, Error **errp); void xen_igd_gfx_pt_set(bool value, Error **errp);
void xen_pt_log(const PCIDevice *d, const char *f, ...) GCC_FMT_ATTR(2, 3); void xen_pt_log(const PCIDevice *d, const char *f, ...) G_GNUC_PRINTF(2, 3);
#define XEN_PT_ERR(d, _f, _a...) xen_pt_log(d, "%s: Error: "_f, __func__, ##_a) #define XEN_PT_ERR(d, _f, _a...) xen_pt_log(d, "%s: Error: "_f, __func__, ##_a)

2
include/chardev/char-fe.h
View File

@ -172,7 +172,7 @@ void qemu_chr_fe_set_open(CharBackend *be, int fe_open);
* Chardev. * Chardev.
*/ */
void qemu_chr_fe_printf(CharBackend *be, const char *fmt, ...) void qemu_chr_fe_printf(CharBackend *be, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
typedef gboolean (*FEWatchFunc)(void *do_not_use, GIOCondition condition, void *data); typedef gboolean (*FEWatchFunc)(void *do_not_use, GIOCondition condition, void *data);

2
include/disas/dis-asm.h
View File

@ -269,7 +269,7 @@ typedef struct symbol_cache_entry
} asymbol; } asymbol;
typedef int (*fprintf_function)(FILE *f, const char *fmt, ...) typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
enum dis_insn_type { enum dis_insn_type {
dis_noninsn, /* Not a valid instruction */ dis_noninsn, /* Not a valid instruction */

12
include/hw/acpi/aml-build.h
View File

@ -289,7 +289,7 @@ void free_aml_allocator(void);
void aml_append(Aml *parent_ctx, Aml *child); void aml_append(Aml *parent_ctx, Aml *child);
/* non block AML object primitives */ /* non block AML object primitives */
Aml *aml_name(const char *name_format, ...) GCC_FMT_ATTR(1, 2); Aml *aml_name(const char *name_format, ...) G_GNUC_PRINTF(1, 2);
Aml *aml_name_decl(const char *name, Aml *val); Aml *aml_name_decl(const char *name, Aml *val);
Aml *aml_debug(void); Aml *aml_debug(void);
Aml *aml_return(Aml *val); Aml *aml_return(Aml *val);
@ -344,13 +344,13 @@ Aml *aml_irq_no_flags(uint8_t irq);
Aml *aml_named_field(const char *name, unsigned length); Aml *aml_named_field(const char *name, unsigned length);
Aml *aml_reserved_field(unsigned length); Aml *aml_reserved_field(unsigned length);
Aml *aml_local(int num); Aml *aml_local(int num);
Aml *aml_string(const char *name_format, ...) GCC_FMT_ATTR(1, 2); Aml *aml_string(const char *name_format, ...) G_GNUC_PRINTF(1, 2);
Aml *aml_lnot(Aml *arg); Aml *aml_lnot(Aml *arg);
Aml *aml_equal(Aml *arg1, Aml *arg2); Aml *aml_equal(Aml *arg1, Aml *arg2);
Aml *aml_lgreater(Aml *arg1, Aml *arg2); Aml *aml_lgreater(Aml *arg1, Aml *arg2);
Aml *aml_lgreater_equal(Aml *arg1, Aml *arg2); Aml *aml_lgreater_equal(Aml *arg1, Aml *arg2);
Aml *aml_processor(uint8_t proc_id, uint32_t pblk_addr, uint8_t pblk_len, Aml *aml_processor(uint8_t proc_id, uint32_t pblk_addr, uint8_t pblk_len,
const char *name_format, ...) GCC_FMT_ATTR(4, 5); const char *name_format, ...) G_GNUC_PRINTF(4, 5);
Aml *aml_eisaid(const char *str); Aml *aml_eisaid(const char *str);
Aml *aml_word_bus_number(AmlMinFixed min_fixed, AmlMaxFixed max_fixed, Aml *aml_word_bus_number(AmlMinFixed min_fixed, AmlMaxFixed max_fixed,
AmlDecode dec, uint16_t addr_gran, AmlDecode dec, uint16_t addr_gran,
@ -384,8 +384,8 @@ Aml *aml_sleep(uint64_t msec);
Aml *aml_i2c_serial_bus_device(uint16_t address, const char *resource_source); Aml *aml_i2c_serial_bus_device(uint16_t address, const char *resource_source);
/* Block AML object primitives */ /* Block AML object primitives */
Aml *aml_scope(const char *name_format, ...) GCC_FMT_ATTR(1, 2); Aml *aml_scope(const char *name_format, ...) G_GNUC_PRINTF(1, 2);
Aml *aml_device(const char *name_format, ...) GCC_FMT_ATTR(1, 2); Aml *aml_device(const char *name_format, ...) G_GNUC_PRINTF(1, 2);
Aml *aml_method(const char *name, int arg_count, AmlSerializeFlag sflag); Aml *aml_method(const char *name, int arg_count, AmlSerializeFlag sflag);
Aml *aml_if(Aml *predicate); Aml *aml_if(Aml *predicate);
Aml *aml_else(void); Aml *aml_else(void);
@ -460,7 +460,7 @@ build_xsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,
int int
build_append_named_dword(GArray *array, const char *name_format, ...) build_append_named_dword(GArray *array, const char *name_format, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
void build_append_gas(GArray *table, AmlAddressSpace as, void build_append_gas(GArray *table, AmlAddressSpace as,
uint8_t bit_width, uint8_t bit_offset, uint8_t bit_width, uint8_t bit_offset,

2
include/hw/core/cpu.h
View File

@ -1016,7 +1016,7 @@ int cpu_watchpoint_address_matches(CPUState *cpu, vaddr addr, vaddr len);
AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx); AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx);
void QEMU_NORETURN cpu_abort(CPUState *cpu, const char *fmt, ...) void QEMU_NORETURN cpu_abort(CPUState *cpu, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
/* $(top_srcdir)/cpu.c */ /* $(top_srcdir)/cpu.c */
void cpu_class_init_props(DeviceClass *dc); void cpu_class_init_props(DeviceClass *dc);

2
include/hw/hw.h
View File

@ -5,6 +5,6 @@
#error Cannot include hw/hw.h from user emulation #error Cannot include hw/hw.h from user emulation
#endif #endif
void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void QEMU_NORETURN hw_error(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
#endif #endif

2
include/hw/virtio/virtio.h
View File

@ -169,7 +169,7 @@ void virtio_init(VirtIODevice *vdev, const char *name,
uint16_t device_id, size_t config_size); uint16_t device_id, size_t config_size);
void virtio_cleanup(VirtIODevice *vdev); void virtio_cleanup(VirtIODevice *vdev);
void virtio_error(VirtIODevice *vdev, const char *fmt, ...) GCC_FMT_ATTR(2, 3); void virtio_error(VirtIODevice *vdev, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
/* Set the child bus name. */ /* Set the child bus name. */
void virtio_device_set_child_bus_name(VirtIODevice *vdev, char *bus_name); void virtio_device_set_child_bus_name(VirtIODevice *vdev, char *bus_name);

4
include/hw/xen/xen-bus-helper.h
View File

@ -22,11 +22,11 @@ void xs_node_destroy(struct xs_handle *xsh, xs_transaction_t tid,
void xs_node_vprintf(struct xs_handle *xsh, xs_transaction_t tid, void xs_node_vprintf(struct xs_handle *xsh, xs_transaction_t tid,
const char *node, const char *key, Error **errp, const char *node, const char *key, Error **errp,
const char *fmt, va_list ap) const char *fmt, va_list ap)
GCC_FMT_ATTR(6, 0); G_GNUC_PRINTF(6, 0);
void xs_node_printf(struct xs_handle *xsh, xs_transaction_t tid, void xs_node_printf(struct xs_handle *xsh, xs_transaction_t tid,
const char *node, const char *key, Error **errp, const char *node, const char *key, Error **errp,
const char *fmt, ...) const char *fmt, ...)
GCC_FMT_ATTR(6, 7); G_GNUC_PRINTF(6, 7);
/* Read from node/key unless node is empty, in which case read from key */ /* Read from node/key unless node is empty, in which case read from key */
int xs_node_vscanf(struct xs_handle *xsh, xs_transaction_t tid, int xs_node_vscanf(struct xs_handle *xsh, xs_transaction_t tid,

4
include/hw/xen/xen-bus.h
View File

@ -88,10 +88,10 @@ enum xenbus_state xen_device_backend_get_state(XenDevice *xendev);
void xen_device_backend_printf(XenDevice *xendev, const char *key, void xen_device_backend_printf(XenDevice *xendev, const char *key,
const char *fmt, ...) const char *fmt, ...)
GCC_FMT_ATTR(3, 4); G_GNUC_PRINTF(3, 4);
void xen_device_frontend_printf(XenDevice *xendev, const char *key, void xen_device_frontend_printf(XenDevice *xendev, const char *key,
const char *fmt, ...) const char *fmt, ...)
GCC_FMT_ATTR(3, 4); G_GNUC_PRINTF(3, 4);
int xen_device_frontend_scanf(XenDevice *xendev, const char *key, int xen_device_frontend_scanf(XenDevice *xendev, const char *key,
const char *fmt, ...); const char *fmt, ...);

2
include/hw/xen/xen_common.h
View File

@ -358,7 +358,7 @@ static inline int xen_restrict(domid_t domid)
void destroy_hvm_domain(bool reboot); void destroy_hvm_domain(bool reboot);
/* shutdown/destroy current domain because of an error */ /* shutdown/destroy current domain because of an error */
void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void xen_shutdown_fatal_error(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
#ifdef HVM_PARAM_VMPORT_REGS_PFN #ifdef HVM_PARAM_VMPORT_REGS_PFN
static inline int xen_get_vmport_regs_pfn(xc_interface *xc, domid_t dom, static inline int xen_get_vmport_regs_pfn(xc_interface *xc, domid_t dom,

2
include/hw/xen/xen_pvdev.h
View File

@ -76,6 +76,6 @@ void xen_pv_unbind_evtchn(struct XenLegacyDevice *xendev);
int xen_pv_send_notify(struct XenLegacyDevice *xendev); int xen_pv_send_notify(struct XenLegacyDevice *xendev);
void xen_pv_printf(struct XenLegacyDevice *xendev, int msg_level, void xen_pv_printf(struct XenLegacyDevice *xendev, int msg_level,
const char *fmt, ...) GCC_FMT_ATTR(3, 4); const char *fmt, ...) G_GNUC_PRINTF(3, 4);
#endif /* QEMU_HW_XEN_PVDEV_H */ #endif /* QEMU_HW_XEN_PVDEV_H */

4
include/monitor/monitor.h
View File

@ -32,8 +32,8 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp);
int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp); int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp);
int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0); G_GNUC_PRINTF(2, 0);
int monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3); int monitor_printf(Monitor *mon, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
void monitor_flush(Monitor *mon); void monitor_flush(Monitor *mon);
int monitor_set_cpu(Monitor *mon, int cpu_index); int monitor_set_cpu(Monitor *mon, int cpu_index);
int monitor_get_cpu_index(Monitor *mon); int monitor_get_cpu_index(Monitor *mon);

20
include/qapi/error.h
View File

@ -320,7 +320,7 @@ ErrorClass error_get_class(const Error *err);
void error_setg_internal(Error **errp, void error_setg_internal(Error **errp,
const char *src, int line, const char *func, const char *src, int line, const char *func,
const char *fmt, ...) const char *fmt, ...)
GCC_FMT_ATTR(5, 6); G_GNUC_PRINTF(5, 6);
/* /*
* Just like error_setg(), with @os_error info added to the message. * Just like error_setg(), with @os_error info added to the message.
@ -336,7 +336,7 @@ void error_setg_internal(Error **errp,
void error_setg_errno_internal(Error **errp, void error_setg_errno_internal(Error **errp,
const char *fname, int line, const char *func, const char *fname, int line, const char *func,
int os_error, const char *fmt, ...) int os_error, const char *fmt, ...)
GCC_FMT_ATTR(6, 7); G_GNUC_PRINTF(6, 7);
#ifdef _WIN32 #ifdef _WIN32
/* /*
@ -350,7 +350,7 @@ void error_setg_errno_internal(Error **errp,
void error_setg_win32_internal(Error **errp, void error_setg_win32_internal(Error **errp,
const char *src, int line, const char *func, const char *src, int line, const char *func,
int win32_err, const char *fmt, ...) int win32_err, const char *fmt, ...)
GCC_FMT_ATTR(6, 7); G_GNUC_PRINTF(6, 7);
#endif #endif
/* /*
@ -383,21 +383,21 @@ void error_propagate(Error **dst_errp, Error *local_err);
*/ */
void error_propagate_prepend(Error **dst_errp, Error *local_err, void error_propagate_prepend(Error **dst_errp, Error *local_err,
const char *fmt, ...) const char *fmt, ...)
GCC_FMT_ATTR(3, 4); G_GNUC_PRINTF(3, 4);
/* /*
* Prepend some text to @errp's human-readable error message. * Prepend some text to @errp's human-readable error message.
* The text is made by formatting @fmt, @ap like vprintf(). * The text is made by formatting @fmt, @ap like vprintf().
*/ */
void error_vprepend(Error *const *errp, const char *fmt, va_list ap) void error_vprepend(Error *const *errp, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0); G_GNUC_PRINTF(2, 0);
/* /*
* Prepend some text to @errp's human-readable error message. * Prepend some text to @errp's human-readable error message.
* The text is made by formatting @fmt, ... like printf(). * The text is made by formatting @fmt, ... like printf().
*/ */
void error_prepend(Error *const *errp, const char *fmt, ...) void error_prepend(Error *const *errp, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
/* /*
* Append a printf-style human-readable explanation to an existing error. * Append a printf-style human-readable explanation to an existing error.
@ -414,7 +414,7 @@ void error_prepend(Error *const *errp, const char *fmt, ...)
* newline. * newline.
*/ */
void error_append_hint(Error *const *errp, const char *fmt, ...) void error_append_hint(Error *const *errp, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
/* /*
* Convenience function to report open() failure. * Convenience function to report open() failure.
@ -458,13 +458,13 @@ void error_report_err(Error *err);
* Convenience function to error_prepend(), warn_report() and free @err. * Convenience function to error_prepend(), warn_report() and free @err.
*/ */
void warn_reportf_err(Error *err, const char *fmt, ...) void warn_reportf_err(Error *err, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
/* /*
* Convenience function to error_prepend(), error_report() and free @err. * Convenience function to error_prepend(), error_report() and free @err.
*/ */
void error_reportf_err(Error *err, const char *fmt, ...) void error_reportf_err(Error *err, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
/* /*
* Just like error_setg(), except you get to specify the error class. * Just like error_setg(), except you get to specify the error class.
@ -477,7 +477,7 @@ void error_reportf_err(Error *err, const char *fmt, ...)
void error_set_internal(Error **errp, void error_set_internal(Error **errp,
const char *src, int line, const char *func, const char *src, int line, const char *func,
ErrorClass err_class, const char *fmt, ...) ErrorClass err_class, const char *fmt, ...)
GCC_FMT_ATTR(6, 7); G_GNUC_PRINTF(6, 7);
/* /*
* Make @errp parameter easier to use regardless of argument value * Make @errp parameter easier to use regardless of argument value

8
include/qapi/qmp/qjson.h
View File

@ -17,13 +17,13 @@
QObject *qobject_from_json(const char *string, Error **errp); QObject *qobject_from_json(const char *string, Error **errp);
QObject *qobject_from_vjsonf_nofail(const char *string, va_list ap) QObject *qobject_from_vjsonf_nofail(const char *string, va_list ap)
GCC_FMT_ATTR(1, 0); G_GNUC_PRINTF(1, 0);
QObject *qobject_from_jsonf_nofail(const char *string, ...) QObject *qobject_from_jsonf_nofail(const char *string, ...)
GCC_FMT_ATTR(1, 2); G_GNUC_PRINTF(1, 2);
QDict *qdict_from_vjsonf_nofail(const char *string, va_list ap) QDict *qdict_from_vjsonf_nofail(const char *string, va_list ap)
GCC_FMT_ATTR(1, 0); G_GNUC_PRINTF(1, 0);
QDict *qdict_from_jsonf_nofail(const char *string, ...) QDict *qdict_from_jsonf_nofail(const char *string, ...)
GCC_FMT_ATTR(1, 2); G_GNUC_PRINTF(1, 2);
GString *qobject_to_json(const QObject *obj); GString *qobject_to_json(const QObject *obj);
GString *qobject_to_json_pretty(const QObject *obj, bool pretty); GString *qobject_to_json_pretty(const QObject *obj, bool pretty);

2
include/qemu/buffer.h
View File

@ -49,7 +49,7 @@ struct Buffer {
* to identify in debug traces. * to identify in debug traces.
*/ */
void buffer_init(Buffer *buffer, const char *name, ...) void buffer_init(Buffer *buffer, const char *name, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
/** /**
* buffer_shrink: * buffer_shrink:

11
include/qemu/compiler.h
View File

@ -79,19 +79,12 @@
#define QEMU_BUILD_BUG_ON_ZERO(x) (sizeof(QEMU_BUILD_BUG_ON_STRUCT(x)) - \ #define QEMU_BUILD_BUG_ON_ZERO(x) (sizeof(QEMU_BUILD_BUG_ON_STRUCT(x)) - \
sizeof(QEMU_BUILD_BUG_ON_STRUCT(x))) sizeof(QEMU_BUILD_BUG_ON_STRUCT(x)))
#if defined(__clang__) #if !defined(__clang__) && defined(_WIN32)
/* clang doesn't support gnu_printf, so use printf. */
# define GCC_FMT_ATTR(n, m) __attribute__((format(printf, n, m)))
#else
/* Use gnu_printf (qemu uses standard format strings). */
# define GCC_FMT_ATTR(n, m) __attribute__((format(gnu_printf, n, m)))
# if defined(_WIN32)
/* /*
* Map __printf__ to __gnu_printf__ because we want standard format strings even * Map __printf__ to __gnu_printf__ because we want standard format strings even
* when MinGW or GLib include files use __printf__. * when MinGW or GLib include files use __printf__.
*/ */
# define __printf__ __gnu_printf__ # define __printf__ __gnu_printf__
# endif
#endif #endif
#ifndef __has_warning #ifndef __has_warning

24
include/qemu/error-report.h
View File

@ -30,23 +30,23 @@ void loc_set_none(void);
void loc_set_cmdline(char **argv, int idx, int cnt); void loc_set_cmdline(char **argv, int idx, int cnt);
void loc_set_file(const char *fname, int lno); void loc_set_file(const char *fname, int lno);
int error_vprintf(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0); int error_vprintf(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
int error_printf(const char *fmt, ...) GCC_FMT_ATTR(1, 2); int error_printf(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
int error_vprintf_unless_qmp(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0); int error_vprintf_unless_qmp(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
int error_printf_unless_qmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2); int error_printf_unless_qmp(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
void error_vreport(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0); void error_vreport(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
void warn_vreport(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0); void warn_vreport(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
void info_vreport(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0); void info_vreport(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
void error_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void error_report(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
void warn_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void warn_report(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
void info_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void info_report(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
bool error_report_once_cond(bool *printed, const char *fmt, ...) bool error_report_once_cond(bool *printed, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
bool warn_report_once_cond(bool *printed, const char *fmt, ...) bool warn_report_once_cond(bool *printed, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
void error_init(const char *argv0); void error_init(const char *argv0);

2
include/qemu/log-for-trace.h
View File

@ -30,6 +30,6 @@ static inline bool qemu_loglevel_mask(int mask)
} }
/* main logging function */ /* main logging function */
int GCC_FMT_ATTR(1, 2) qemu_log(const char *fmt, ...); int G_GNUC_PRINTF(1, 2) qemu_log(const char *fmt, ...);
#endif #endif

2
include/qemu/log.h
View File

@ -96,7 +96,7 @@ static inline void qemu_log_unlock(FILE *fd)
/* vfprintf-like logging function /* vfprintf-like logging function
*/ */
static inline void GCC_FMT_ATTR(1, 0) static inline void G_GNUC_PRINTF(1, 0)
qemu_log_vprintf(const char *fmt, va_list va) qemu_log_vprintf(const char *fmt, va_list va)
{ {
QemuLogFile *logfile; QemuLogFile *logfile;

8
include/qemu/qemu-print.h
View File

@ -13,11 +13,11 @@
#ifndef QEMU_PRINT_H #ifndef QEMU_PRINT_H
#define QEMU_PRINT_H #define QEMU_PRINT_H
int qemu_vprintf(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0); int qemu_vprintf(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
int qemu_printf(const char *fmt, ...) GCC_FMT_ATTR(1, 2); int qemu_printf(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
int qemu_vfprintf(FILE *stream, const char *fmt, va_list ap) int qemu_vfprintf(FILE *stream, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0); G_GNUC_PRINTF(2, 0);
int qemu_fprintf(FILE *stream, const char *fmt, ...) GCC_FMT_ATTR(2, 3); int qemu_fprintf(FILE *stream, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
#endif #endif

2
include/qemu/readline.h
View File

@ -5,7 +5,7 @@
#define READLINE_MAX_CMDS 64 #define READLINE_MAX_CMDS 64
#define READLINE_MAX_COMPLETIONS 256 #define READLINE_MAX_COMPLETIONS 256
typedef void GCC_FMT_ATTR(2, 3) ReadLinePrintfFunc(void *opaque, typedef void G_GNUC_PRINTF(2, 3) ReadLinePrintfFunc(void *opaque,
const char *fmt, ...); const char *fmt, ...);
typedef void ReadLineFlushFunc(void *opaque); typedef void ReadLineFlushFunc(void *opaque);
typedef void ReadLineFunc(void *opaque, const char *str, typedef void ReadLineFunc(void *opaque, const char *str,

2
io/channel-websock.c
View File

@ -157,7 +157,7 @@ enum {
QIO_CHANNEL_WEBSOCK_OPCODE_PONG = 0xA QIO_CHANNEL_WEBSOCK_OPCODE_PONG = 0xA
}; };
static void GCC_FMT_ATTR(2, 3) static void G_GNUC_PRINTF(2, 3)
qio_channel_websock_handshake_send_res(QIOChannelWebsock *ioc, qio_channel_websock_handshake_send_res(QIOChannelWebsock *ioc,
const char *resmsg, const char *resmsg,
...) ...)

4
monitor/hmp.c
View File

@ -308,7 +308,7 @@ void help_cmd(Monitor *mon, const char *name)
static const char *pch; static const char *pch;
static sigjmp_buf expr_env; static sigjmp_buf expr_env;
static void GCC_FMT_ATTR(2, 3) QEMU_NORETURN static void G_GNUC_PRINTF(2, 3) QEMU_NORETURN
expr_error(Monitor *mon, const char *fmt, ...) expr_error(Monitor *mon, const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -1462,7 +1462,7 @@ static void monitor_event(void *opaque, QEMUChrEvent event)
* These functions just adapt the readline interface in a typesafe way. We * These functions just adapt the readline interface in a typesafe way. We
* could cast function pointers but that discards compiler checks. * could cast function pointers but that discards compiler checks.
*/ */
static void GCC_FMT_ATTR(2, 3) monitor_readline_printf(void *opaque, static void G_GNUC_PRINTF(2, 3) monitor_readline_printf(void *opaque,
const char *fmt, ...) const char *fmt, ...)
{ {
MonitorHMP *mon = opaque; MonitorHMP *mon = opaque;

10
nbd/server.c
View File

@ -213,7 +213,7 @@ static int nbd_negotiate_send_rep(NBDClient *client, uint32_t type,
/* Send an error reply. /* Send an error reply.
* Return -errno on error, 0 on success. */ * Return -errno on error, 0 on success. */
static int GCC_FMT_ATTR(4, 0) static int G_GNUC_PRINTF(4, 0)
nbd_negotiate_send_rep_verr(NBDClient *client, uint32_t type, nbd_negotiate_send_rep_verr(NBDClient *client, uint32_t type,
Error **errp, const char *fmt, va_list va) Error **errp, const char *fmt, va_list va)
{ {
@ -253,7 +253,7 @@ nbd_sanitize_name(const char *name)
/* Send an error reply. /* Send an error reply.
* Return -errno on error, 0 on success. */ * Return -errno on error, 0 on success. */
static int GCC_FMT_ATTR(4, 5) static int G_GNUC_PRINTF(4, 5)
nbd_negotiate_send_rep_err(NBDClient *client, uint32_t type, nbd_negotiate_send_rep_err(NBDClient *client, uint32_t type,
Error **errp, const char *fmt, ...) Error **errp, const char *fmt, ...)
{ {
@ -269,7 +269,7 @@ nbd_negotiate_send_rep_err(NBDClient *client, uint32_t type,
/* Drop remainder of the current option, and send a reply with the /* Drop remainder of the current option, and send a reply with the
* given error type and message. Return -errno on read or write * given error type and message. Return -errno on read or write
* failure; or 0 if connection is still live. */ * failure; or 0 if connection is still live. */
static int GCC_FMT_ATTR(4, 0) static int G_GNUC_PRINTF(4, 0)
nbd_opt_vdrop(NBDClient *client, uint32_t type, Error **errp, nbd_opt_vdrop(NBDClient *client, uint32_t type, Error **errp,
const char *fmt, va_list va) const char *fmt, va_list va)
{ {
@ -282,7 +282,7 @@ nbd_opt_vdrop(NBDClient *client, uint32_t type, Error **errp,
return ret; return ret;
} }
static int GCC_FMT_ATTR(4, 5) static int G_GNUC_PRINTF(4, 5)
nbd_opt_drop(NBDClient *client, uint32_t type, Error **errp, nbd_opt_drop(NBDClient *client, uint32_t type, Error **errp,
const char *fmt, ...) const char *fmt, ...)
{ {
@ -296,7 +296,7 @@ nbd_opt_drop(NBDClient *client, uint32_t type, Error **errp,
return ret; return ret;
} }
static int GCC_FMT_ATTR(3, 4) static int G_GNUC_PRINTF(3, 4)
nbd_opt_invalid(NBDClient *client, Error **errp, const char *fmt, ...) nbd_opt_invalid(NBDClient *client, Error **errp, const char *fmt, ...)
{ {
int ret; int ret;

4
qemu-img.c
View File

@ -99,7 +99,7 @@ static void format_print(void *opaque, const char *name)
printf(" %s", name); printf(" %s", name);
} }
static void QEMU_NORETURN GCC_FMT_ATTR(1, 2) error_exit(const char *fmt, ...) static void QEMU_NORETURN G_GNUC_PRINTF(1, 2) error_exit(const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -284,7 +284,7 @@ static QemuOptsList qemu_source_opts = {
}, },
}; };
static int GCC_FMT_ATTR(2, 3) qprintf(bool quiet, const char *fmt, ...) static int G_GNUC_PRINTF(2, 3) qprintf(bool quiet, const char *fmt, ...)
{ {
int ret = 0; int ret = 0;
if (!quiet) { if (!quiet) {

2
qemu-io.c
View File

@ -329,7 +329,7 @@ static char *get_prompt(void)
return prompt; return prompt;
} }
static void GCC_FMT_ATTR(2, 3) readline_printf_func(void *opaque, static void G_GNUC_PRINTF(2, 3) readline_printf_func(void *opaque,
const char *fmt, ...) const char *fmt, ...)
{ {
va_list ap; va_list ap;

2
qga/guest-agent-core.h
View File

@ -36,7 +36,7 @@ void ga_command_state_free(GACommandState *cs);
bool ga_logging_enabled(GAState *s); bool ga_logging_enabled(GAState *s);
void ga_disable_logging(GAState *s); void ga_disable_logging(GAState *s);
void ga_enable_logging(GAState *s); void ga_enable_logging(GAState *s);
void GCC_FMT_ATTR(1, 2) slog(const gchar *fmt, ...); void G_GNUC_PRINTF(1, 2) slog(const gchar *fmt, ...);
void ga_set_response_delimited(GAState *s); void ga_set_response_delimited(GAState *s);
bool ga_is_frozen(GAState *s); bool ga_is_frozen(GAState *s);
void ga_set_frozen(GAState *s); void ga_set_frozen(GAState *s);

2
qga/vss-win32/requester.h
View File

@ -25,7 +25,7 @@ struct Error;
typedef void (*ErrorSetFunc)(struct Error **errp, typedef void (*ErrorSetFunc)(struct Error **errp,
const char *src, int line, const char *func, const char *src, int line, const char *func,
int win32_err, const char *fmt, ...) int win32_err, const char *fmt, ...)
GCC_FMT_ATTR(6, 7); G_GNUC_PRINTF(6, 7);
typedef struct ErrorSet { typedef struct ErrorSet {
ErrorSetFunc error_setg_win32_wrapper; ErrorSetFunc error_setg_win32_wrapper;
struct Error **errp; /* restriction: must not be null */ struct Error **errp; /* restriction: must not be null */

2
qobject/json-parser.c
View File

@ -54,7 +54,7 @@ static QObject *parse_value(JSONParserContext *ctxt);
/** /**
* Error handler * Error handler
*/ */
static void GCC_FMT_ATTR(3, 4) parse_error(JSONParserContext *ctxt, static void G_GNUC_PRINTF(3, 4) parse_error(JSONParserContext *ctxt,
JSONToken *token, const char *msg, ...) JSONToken *token, const char *msg, ...)
{ {
va_list ap; va_list ap;

2
scripts/checkpatch.pl
View File

@ -227,7 +227,7 @@ our $Attribute = qr{
QEMU_WARN_UNUSED_RESULT| QEMU_WARN_UNUSED_RESULT|
QEMU_SENTINEL| QEMU_SENTINEL|
QEMU_PACKED| QEMU_PACKED|
GCC_FMT_ATTR G_GNUC_PRINTF
}x; }x;
our $Modifier; our $Modifier;
our $Inline = qr{inline}; our $Inline = qr{inline};

2
scripts/cocci-macro-file.h
View File

@ -34,7 +34,7 @@
#define QEMU_BUILD_BUG_ON(x) \ #define QEMU_BUILD_BUG_ON(x) \
typedef char cat2(qemu_build_bug_on__,__LINE__)[(x)?-1:1] __attribute__((unused)); typedef char cat2(qemu_build_bug_on__,__LINE__)[(x)?-1:1] __attribute__((unused));
#define GCC_FMT_ATTR(n, m) __attribute__((format(gnu_printf, n, m))) #define G_GNUC_PRINTF(n, m) __attribute__((format(gnu_printf, n, m)))
#define xglue(x, y) x ## y #define xglue(x, y) x ## y
#define glue(x, y) xglue(x, y) #define glue(x, y) xglue(x, y)

4
softmmu/qtest.c
View File

@ -288,7 +288,7 @@ static void qtest_send_prefix(CharBackend *chr)
(long) tv.tv_sec, (long) tv.tv_usec); (long) tv.tv_sec, (long) tv.tv_usec);
} }
static void GCC_FMT_ATTR(1, 2) qtest_log_send(const char *fmt, ...) static void G_GNUC_PRINTF(1, 2) qtest_log_send(const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -318,7 +318,7 @@ static void qtest_send(CharBackend *chr, const char *str)
qtest_server_send(qtest_server_send_opaque, str); qtest_server_send(qtest_server_send_opaque, str);
} }
static void GCC_FMT_ATTR(2, 3) qtest_sendf(CharBackend *chr, static void G_GNUC_PRINTF(2, 3) qtest_sendf(CharBackend *chr,
const char *fmt, ...) const char *fmt, ...)
{ {
va_list ap; va_list ap;

42
tests/qtest/libqos/libqtest.h
View File

@ -31,7 +31,7 @@ typedef struct QTestState QTestState;
* *
* Returns: #QTestState instance. * Returns: #QTestState instance.
*/ */
QTestState *qtest_initf(const char *fmt, ...) GCC_FMT_ATTR(1, 2); QTestState *qtest_initf(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
/** /**
* qtest_vinitf: * qtest_vinitf:
@ -43,7 +43,7 @@ QTestState *qtest_initf(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
* *
* Returns: #QTestState instance. * Returns: #QTestState instance.
*/ */
QTestState *qtest_vinitf(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0); QTestState *qtest_vinitf(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
/** /**
* qtest_init: * qtest_init:
@ -106,7 +106,7 @@ void qtest_quit(QTestState *s);
*/ */
QDict *qtest_qmp_fds(QTestState *s, int *fds, size_t fds_num, QDict *qtest_qmp_fds(QTestState *s, int *fds, size_t fds_num,
const char *fmt, ...) const char *fmt, ...)
GCC_FMT_ATTR(4, 5); G_GNUC_PRINTF(4, 5);
/** /**
* qtest_qmp: * qtest_qmp:
@ -118,7 +118,7 @@ QDict *qtest_qmp_fds(QTestState *s, int *fds, size_t fds_num,
* Sends a QMP message to QEMU and returns the response. * Sends a QMP message to QEMU and returns the response.
*/ */
QDict *qtest_qmp(QTestState *s, const char *fmt, ...) QDict *qtest_qmp(QTestState *s, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
/** /**
* qtest_qmp_send: * qtest_qmp_send:
@ -130,7 +130,7 @@ QDict *qtest_qmp(QTestState *s, const char *fmt, ...)
* Sends a QMP message to QEMU and leaves the response in the stream. * Sends a QMP message to QEMU and leaves the response in the stream.
*/ */
void qtest_qmp_send(QTestState *s, const char *fmt, ...) void qtest_qmp_send(QTestState *s, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
/** /**
* qtest_qmp_send_raw: * qtest_qmp_send_raw:
@ -141,7 +141,7 @@ void qtest_qmp_send(QTestState *s, const char *fmt, ...)
* this is useful for negative tests. * this is useful for negative tests.
*/ */
void qtest_qmp_send_raw(QTestState *s, const char *fmt, ...) void qtest_qmp_send_raw(QTestState *s, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
/** /**
* qtest_socket_server: * qtest_socket_server:
@ -165,7 +165,7 @@ int qtest_socket_server(const char *socket_path);
*/ */
QDict *qtest_vqmp_fds(QTestState *s, int *fds, size_t fds_num, QDict *qtest_vqmp_fds(QTestState *s, int *fds, size_t fds_num,
const char *fmt, va_list ap) const char *fmt, va_list ap)
GCC_FMT_ATTR(4, 0); G_GNUC_PRINTF(4, 0);
/** /**
* qtest_vqmp: * qtest_vqmp:
@ -178,7 +178,7 @@ QDict *qtest_vqmp_fds(QTestState *s, int *fds, size_t fds_num,
* Sends a QMP message to QEMU and returns the response. * Sends a QMP message to QEMU and returns the response.
*/ */
QDict *qtest_vqmp(QTestState *s, const char *fmt, va_list ap) QDict *qtest_vqmp(QTestState *s, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0); G_GNUC_PRINTF(2, 0);
/** /**
* qtest_qmp_vsend_fds: * qtest_qmp_vsend_fds:
@ -194,7 +194,7 @@ QDict *qtest_vqmp(QTestState *s, const char *fmt, va_list ap)
*/ */
void qtest_qmp_vsend_fds(QTestState *s, int *fds, size_t fds_num, void qtest_qmp_vsend_fds(QTestState *s, int *fds, size_t fds_num,
const char *fmt, va_list ap) const char *fmt, va_list ap)
GCC_FMT_ATTR(4, 0); G_GNUC_PRINTF(4, 0);
/** /**
* qtest_qmp_vsend: * qtest_qmp_vsend:
@ -207,7 +207,7 @@ void qtest_qmp_vsend_fds(QTestState *s, int *fds, size_t fds_num,
* Sends a QMP message to QEMU and leaves the response in the stream. * Sends a QMP message to QEMU and leaves the response in the stream.
*/ */
void qtest_qmp_vsend(QTestState *s, const char *fmt, va_list ap) void qtest_qmp_vsend(QTestState *s, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0); G_GNUC_PRINTF(2, 0);
/** /**
* qtest_qmp_receive_dict: * qtest_qmp_receive_dict:
@ -269,7 +269,7 @@ QDict *qtest_qmp_event_ref(QTestState *s, const char *event);
* *
* Returns: the command's output. The caller should g_free() it. * Returns: the command's output. The caller should g_free() it.
*/ */
char *qtest_hmp(QTestState *s, const char *fmt, ...) GCC_FMT_ATTR(2, 3); char *qtest_hmp(QTestState *s, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
/** /**
* qtest_hmpv: * qtest_hmpv:
@ -283,7 +283,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
* Returns: the command's output. The caller should g_free() it. * Returns: the command's output. The caller should g_free() it.
*/ */
char *qtest_vhmp(QTestState *s, const char *fmt, va_list ap) char *qtest_vhmp(QTestState *s, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0); G_GNUC_PRINTF(2, 0);
void qtest_module_load(QTestState *s, const char *prefix, const char *libname); void qtest_module_load(QTestState *s, const char *prefix, const char *libname);
@ -688,17 +688,17 @@ void qtest_remove_abrt_handler(void *data);
* the response. * the response.
*/ */
void qtest_qmp_assert_success(QTestState *qts, const char *fmt, ...) void qtest_qmp_assert_success(QTestState *qts, const char *fmt, ...)
GCC_FMT_ATTR(2, 3); G_GNUC_PRINTF(2, 3);
QDict *qmp_fd_receive(int fd); QDict *qmp_fd_receive(int fd);
void qmp_fd_vsend_fds(int fd, int *fds, size_t fds_num, void qmp_fd_vsend_fds(int fd, int *fds, size_t fds_num,
const char *fmt, va_list ap) GCC_FMT_ATTR(4, 0); const char *fmt, va_list ap) G_GNUC_PRINTF(4, 0);
void qmp_fd_vsend(int fd, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0); void qmp_fd_vsend(int fd, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0);
void qmp_fd_send(int fd, const char *fmt, ...) GCC_FMT_ATTR(2, 3); void qmp_fd_send(int fd, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
void qmp_fd_send_raw(int fd, const char *fmt, ...) GCC_FMT_ATTR(2, 3); void qmp_fd_send_raw(int fd, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
void qmp_fd_vsend_raw(int fd, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0); void qmp_fd_vsend_raw(int fd, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0);
QDict *qmp_fdv(int fd, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0); QDict *qmp_fdv(int fd, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0);
QDict *qmp_fd(int fd, const char *fmt, ...) GCC_FMT_ATTR(2, 3); QDict *qmp_fd(int fd, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
/** /**
* qtest_cb_for_every_machine: * qtest_cb_for_every_machine:
@ -750,7 +750,7 @@ void qtest_qmp_device_add_qdict(QTestState *qts, const char *drv,
* Generic hot-plugging test via the device_add QMP command. * Generic hot-plugging test via the device_add QMP command.
*/ */
void qtest_qmp_device_add(QTestState *qts, const char *driver, const char *id, void qtest_qmp_device_add(QTestState *qts, const char *driver, const char *id,
const char *fmt, ...) GCC_FMT_ATTR(4, 5); const char *fmt, ...) G_GNUC_PRINTF(4, 5);
/** /**
* qtest_qmp_add_client: * qtest_qmp_add_client:

2
tests/qtest/libqtest-single.h
View File

@ -52,7 +52,7 @@ static inline void qtest_end(void)
* *
* Sends a QMP message to QEMU and returns the response. * Sends a QMP message to QEMU and returns the response.
*/ */
GCC_FMT_ATTR(1, 2) G_GNUC_PRINTF(1, 2)
static inline QDict *qmp(const char *fmt, ...) static inline QDict *qmp(const char *fmt, ...)
{ {
va_list ap; va_list ap;

2
tests/qtest/libqtest.c
View File

@ -437,7 +437,7 @@ static void qtest_client_socket_send(QTestState *s, const char *buf)
socket_send(s->fd, buf, strlen(buf)); socket_send(s->fd, buf, strlen(buf));
} }
static void GCC_FMT_ATTR(2, 3) qtest_sendf(QTestState *s, const char *fmt, ...) static void G_GNUC_PRINTF(2, 3) qtest_sendf(QTestState *s, const char *fmt, ...)
{ {
va_list ap; va_list ap;

6
tests/qtest/migration-helpers.h
View File

@ -16,13 +16,13 @@
extern bool got_stop; extern bool got_stop;
GCC_FMT_ATTR(3, 4) G_GNUC_PRINTF(3, 4)
QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...); QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...);
GCC_FMT_ATTR(2, 3) G_GNUC_PRINTF(2, 3)
QDict *wait_command(QTestState *who, const char *command, ...); QDict *wait_command(QTestState *who, const char *command, ...);
GCC_FMT_ATTR(3, 4) G_GNUC_PRINTF(3, 4)
void migrate_qmp(QTestState *who, const char *uri, const char *fmt, ...); void migrate_qmp(QTestState *who, const char *uri, const char *fmt, ...);
QDict *migrate_query(QTestState *who); QDict *migrate_query(QTestState *who);

4
tests/unit/test-qobject-input-visitor.c
View File

@ -64,7 +64,7 @@ static Visitor *test_init_internal(TestInputVisitorData *data, bool keyval,
return data->qiv; return data->qiv;
} }
static GCC_FMT_ATTR(3, 4) static G_GNUC_PRINTF(3, 4)
Visitor *visitor_input_test_init_full(TestInputVisitorData *data, Visitor *visitor_input_test_init_full(TestInputVisitorData *data,
bool keyval, bool keyval,
const char *json_string, ...) const char *json_string, ...)
@ -79,7 +79,7 @@ Visitor *visitor_input_test_init_full(TestInputVisitorData *data,
return v; return v;
} }
static GCC_FMT_ATTR(2, 3) static G_GNUC_PRINTF(2, 3)
Visitor *visitor_input_test_init(TestInputVisitorData *data, Visitor *visitor_input_test_init(TestInputVisitorData *data,
const char *json_string, ...) const char *json_string, ...)
{ {