bulk: Do not declare function prototypes using 'extern' keyword
Subsystems (4)
cover bulk: Do not declare function prototypes using 'extern' keyword
- Remove the 'extern' keyword on function prototypes declared in header.
- Replace __attribute__((noreturn)) -> G_NORETURN
- Trivial cleanups to keep the previous commits generic.
TODO: Add a rule in scripts/checkpatch.pl :)
Based-on: <[email protected]>
Philippe Mathieu-Daudé (5):
qemu/osdep.h: Do not declare function prototypes using extern keyword block/dmg: Remove duplicated prototype declarations qemu/uri: Use QueryParams type definition
bulk: Do not declare function prototypes using extern keyword
bulk: Replace __attribute__((noreturn)) -> G_NORETURN
block/dmg.h | 8 +++---- bsd-user/bsd-file.h | 6 ++--- crypto/hmacpriv.h | 13 +++++------ hw/xen/xen_pt.h | 8 +++---- include/crypto/secret_common.h | 14 +++++------- include/exec/page-vary.h | 4 ++-- include/hw/misc/aspeed_scu.h | 2 +- include/hw/nvram/npcm7xx_otp.h | 4 ++-- include/hw/qdev-core.h | 4 ++-- include/qemu/crc-ccitt.h | 4 ++-- include/qemu/osdep.h | 4 ++-- include/qemu/rcu.h | 14 ++++++------ include/qemu/sys_membarrier.h | 4 ++-- include/qemu/uri.h | 6 ++--- include/sysemu/accel-blocker.h | 14 ++++++------ include/sysemu/os-win32.h | 4 ++-- include/user/safe-syscall.h | 4 ++-- target/i386/sev.h | 6 ++--- target/mips/cpu.h | 4 ++-- tcg/tcg-internal.h | 4 ++-- tests/tcg/minilib/minilib.h | 2 +- include/exec/memory_ldst.h.inc | 42 +++++++++++++++++----------------- block/dmg.c | 6 ----- tests/migration/stress.c | 2 +- roms/seabios | 2 +- 25 files changed, 86 insertions(+), 99 deletions(-)
Signature · 1 line
2.38.1
PATCH 1/5 qemu/osdep.h: Do not declare function prototypes using extern keyword
By default, C function prototypes declared in headers are visible, so there is no need to declare them as 'extern' functions. Remove this redundancy. This also fixes when building under MSYS2:
C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: error: standard attributes in middle of decl-specifiers 1075 | # define G_NORETURN [[noreturn]]
| ^
C:/msys64/code/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN' 240 | extern G_NORETURN
| ^~~~~~~~~~
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1541
--- include/qemu/osdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/qemu/osdep.h +1 -1
@@ -237,7 +237,7 @@ extern "C" {* supports QEMU_ERROR, this will be reported at compile time; otherwise * this will be reported at link time due to the missing symbol. */ -extern G_NORETURN +G_NORETURN void QEMU_ERROR("code path is reachable")qemu_build_not_reached_always (void);#if defined(__OPTIMIZE__) && !defined(__NO_INLINE__)
Signature · 1 line
2.38.1
PATCH 2/5 block/dmg: Remove duplicated prototype declarations
In reply to Philippe Mathieu-DaudéBoth dmg_uncompress_bz2 / dmg_uncompress_lzfse are declared in "dmg.h", included 1 line before.
--- block/dmg.c | 6 ------ 1 file changed, 6 deletions(-)
block/dmg.c +0 -6
@@ -31,12 +31,6 @@#include "qemu/memalign.h" #include "dmg.h" -int (*dmg_uncompress_bz2)(char *next_in,unsigned int avail_in, -char *next_out,unsigned int avail_out); - -int (*dmg_uncompress_lzfse)(char *next_in,unsigned int avail_in, -char *next_out,unsigned int avail_out); -enum {/* Limit chunk sizes to prevent unreasonable amounts of memory being used * or truncating when converting to 32-bit types
Signature · 1 line
2.38.1
Re: [PATCH-for-8.1 2/5] block/dmg: Remove duplicated prototype declarations
Quoted 13 lines · Philippe Mathieu-Daudé
Both
dmg_uncompress_bz2/dmg_uncompress_lzfseare declared in "dmg.h", included 1 line before.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/dmg.c | 6 ------ 1 file changed, 6 deletions(-)block/dmg.c +0
-0
block/dmg.c line 38
Quoted 8 lines
block/dmg.c +0
-5@@ -31,12 +31,6 @@#include "qemu/memalign.h" #include "dmg.h" -int (*dmg_uncompress_bz2)(char *next_in,unsigned int avail_in, -char *next_out,unsigned int avail_out); - -int (*dmg_uncompress_lzfse)(char *next_in,unsigned int avail_in, -char *next_out,unsigned int avail_out);
These aren't prototypes, they are variables that hold a funtion pointer. The header has them as 'extern' to avoid the variables being instantiated more than once if the header is included many times. This code is correct as-is, and so this change is not desirable.
Quoted 8 lines
block/dmg.c +0
-1-enum {/* Limit chunk sizes to prevent unreasonable amounts of memory being used * or truncating when converting to 32-bit types Signature · 1 line
2.38.1
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
PATCH 3/5 qemu/uri: Use QueryParams type definition
In reply to Philippe Mathieu-DaudéFollow QEMU CODING_STYLE, use the type definition.
--- include/qemu/uri.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/qemu/uri.h +1 -1
@@ -96,7 +96,7 @@ typedef struct QueryParams {QueryParam *p;/* array of parameters */ } QueryParams; -struct QueryParams *query_params_new (int init_alloc); +QueryParams *query_params_new (int init_alloc);extern QueryParams *query_params_parse (const char *query);extern void query_params_free (QueryParams *ps);
Signature · 1 line
2.38.1
PATCH 4/5 bulk: Do not declare function prototypes using extern keyword
In reply to Philippe Mathieu-DaudéBy default, C function prototypes declared in headers are visible, so there is no need to declare them as 'extern' functions. Remove this redundancy in a single bulk commit; do not modify:
- meson.build (used to check function availability at runtime)
- pc-bios
- libdecnumber
- *.c
--- block/dmg.h | 8 +++---- bsd-user/bsd-file.h | 6 ++--- crypto/hmacpriv.h | 13 +++++------ hw/xen/xen_pt.h | 8 +++---- include/crypto/secret_common.h | 14 +++++------- include/exec/page-vary.h | 4 ++-- include/hw/misc/aspeed_scu.h | 2 +- include/hw/nvram/npcm7xx_otp.h | 4 ++-- include/hw/qdev-core.h | 4 ++-- include/qemu/crc-ccitt.h | 4 ++-- include/qemu/osdep.h | 2 +- include/qemu/rcu.h | 14 ++++++------ include/qemu/sys_membarrier.h | 4 ++-- include/qemu/uri.h | 6 ++--- include/sysemu/accel-blocker.h | 14 ++++++------ include/sysemu/os-win32.h | 4 ++-- include/user/safe-syscall.h | 4 ++-- target/i386/sev.h | 6 ++--- target/mips/cpu.h | 4 ++-- tcg/tcg-internal.h | 4 ++-- tests/tcg/minilib/minilib.h | 2 +- include/exec/memory_ldst.h.inc | 42 +++++++++++++++++----------------- roms/seabios | 2 +- 23 files changed, 84 insertions(+), 91 deletions(-)
block/dmg.h +4 -4
@@ -51,10 +51,10 @@ typedef struct BDRVDMGState { z_stream zstream; } BDRVDMGState; -extern int (*dmg_uncompress_bz2)(char *next_in,unsigned int avail_in, -char *next_out,unsigned int avail_out); +int (*dmg_uncompress_bz2)(char *next_in,unsigned int avail_in, +char *next_out,unsigned int avail_out); -extern int (*dmg_uncompress_lzfse)(char *next_in,unsigned int avail_in, -char *next_out,unsigned int avail_out); +int (*dmg_uncompress_lzfse)(char *next_in,unsigned int avail_in, +char *next_out,unsigned int avail_out);#endif
bsd-user/bsd-file.h +2 -4
@@ -51,10 +51,8 @@ do { \unlock_user (p1, arg1,0 ); \ }while (0 ) -extern struct iovec *lock_iovec(int type, abi_ulong target_addr, int count, -int copy); -extern void unlock_iovec (struct iovec *vec,abi_ulong target_addr,int count, -int copy); +struct iovec *lock_iovec(int type, abi_ulong target_addr, int count, int copy); +void unlock_iovec (struct iovec *vec,abi_ulong target_addr,int count,int copy);int safe_open (const char *path,int flags,mode_t mode);int safe_openat (int fd,const char *path,int flags,mode_t mode);
crypto/hmacpriv.h +6 -7
@@ -28,19 +28,18 @@ struct QCryptoHmacDriver {void (*hmac_free)(QCryptoHmac *hmac); }; -extern void *qcrypto_hmac_ctx_new (QCryptoHashAlgorithm alg, -const uint8_t *key,size_t nkey, -Error **errp); +void *qcrypto_hmac_ctx_new (QCryptoHashAlgorithm alg, +const uint8_t *key,size_t nkey, +Error **errp);extern QCryptoHmacDriver qcrypto_hmac_lib_driver;#ifdef CONFIG_AF_ALG #include "afalgpriv.h" -extern QCryptoAFAlg * -qcrypto_afalg_hmac_ctx_new (QCryptoHashAlgorithm alg, -const uint8_t *key,size_t nkey, -Error **errp); +QCryptoAFAlg *qcrypto_afalg_hmac_ctx_new (QCryptoHashAlgorithm alg, +const uint8_t *key,size_t nkey, +Error **errp);extern QCryptoHmacDriver qcrypto_hmac_afalg_driver;#endif
hw/xen/xen_pt.h +3 -5
@@ -340,11 +340,9 @@ static inline bool xen_pt_has_msix_mapping(XenPCIPassthroughState *s, int bar)return s->msix && s->msix->bar_index == bar; } -extern void *pci_assign_dev_load_option_rom (PCIDevice *dev, -int *size, -unsigned int domain, -unsigned int bus,unsigned int slot, -unsigned int function); +void *pci_assign_dev_load_option_rom (PCIDevice *dev,int *size, +unsigned int domain,unsigned int bus, +unsigned int slot,unsigned int function);static inline bool is_igd_vga_passthrough (XenHostPCIDevice *dev) { return (xen_igd_gfx_pt_enabled()
include/crypto/secret_common.h +6 -8
@@ -48,13 +48,11 @@ struct QCryptoSecretCommonClass { }; -extern int qcrypto_secret_lookup (const char *secretid, -uint8_t **data, -size_t *datalen, -Error **errp); -extern char *qcrypto_secret_lookup_as_utf8 (const char *secretid, -Error **errp); -extern char *qcrypto_secret_lookup_as_base64 (const char *secretid, -Error **errp); +int qcrypto_secret_lookup (const char *secretid, +uint8_t **data, +size_t *datalen, +Error **errp); +char *qcrypto_secret_lookup_as_utf8 (const char *secretid,Error **errp); +char *qcrypto_secret_lookup_as_base64 (const char *secretid,Error **errp);#endif /* QCRYPTO_SECRET_COMMON_H */
include/exec/page-vary.h +2 -2
@@ -27,8 +27,8 @@ typedef struct { } TargetPageBits;#ifdef IN_PAGE_VARY -extern bool set_preferred_target_page_bits_common (int bits); -extern void finalize_target_page_bits_common (int min); +bool set_preferred_target_page_bits_common (int bits); +void finalize_target_page_bits_common (int min);#endif /**
include/hw/misc/aspeed_scu.h +1 -1
@@ -51,7 +51,7 @@ struct AspeedSCUState {#define ASPEED_IS_AST2500 (si_rev) ((((si_rev) >> 24) & 0xff) == 0x04) -extern bool is_supported_silicon_rev (uint32_t silicon_rev); +bool is_supported_silicon_rev (uint32_t silicon_rev);struct AspeedSCUClass {
include/hw/nvram/npcm7xx_otp.h +2 -2
@@ -73,7 +73,7 @@ typedef struct NPCM7xxOTPClass NPCM7xxOTPClass;* Each nibble of data is encoded into a byte, so the number of bytes written * to the array will be @len * 2. */ -extern void npcm7xx_otp_array_write (NPCM7xxOTPState *s,const void *data, -unsigned int offset,unsigned int len); +void npcm7xx_otp_array_write (NPCM7xxOTPState *s,const void *data, +unsigned int offset,unsigned int len);#endif /* NPCM7XX_OTP_H */
include/hw/qdev-core.h +2 -2
@@ -892,7 +892,7 @@ typedef enum MachineInitPhase {PHASE_MACHINE_READY , } MachineInitPhase; -extern bool phase_check (MachineInitPhase phase); -extern void phase_advance (MachineInitPhase phase); +bool phase_check (MachineInitPhase phase); +void phase_advance (MachineInitPhase phase);#endif
include/qemu/crc-ccitt.h +2 -2
@@ -17,8 +17,8 @@extern uint16_t const crc_ccitt_table[256 ];extern uint16_t const crc_ccitt_false_table[256 ]; -extern uint16_t crc_ccitt (uint16_t crc,const uint8_t *buffer,size_t len); -extern uint16_t crc_ccitt_false (uint16_t crc,const uint8_t *buffer,size_t len); +uint16_t crc_ccitt (uint16_t crc,const uint8_t *buffer,size_t len); +uint16_t crc_ccitt_false (uint16_t crc,const uint8_t *buffer,size_t len);static inline uint16_t crc_ccitt_byte (uint16_t crc,const uint8_t c) {
include/qemu/osdep.h +1 -1
@@ -496,7 +496,7 @@ void qemu_anon_ram_free(void *ptr, size_t size);* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for discussion * about Solaris missing the madvise() prototype. */ -extern int madvise (char *,size_t ,int ); +int madvise (char *,size_t ,int );#endif #if defined(CONFIG_LINUX )
include/qemu/rcu.h +7 -7
@@ -115,19 +115,19 @@ static inline void rcu_read_unlock(void) } } -extern void synchronize_rcu (void ); +void synchronize_rcu (void );/* * Reader thread registration. */ -extern void rcu_register_thread (void ); -extern void rcu_unregister_thread (void ); +void rcu_register_thread (void ); +void rcu_unregister_thread (void );/* * Support for fork(). fork() support is enabled at startup. */ -extern void rcu_enable_atfork (void ); -extern void rcu_disable_atfork (void ); +void rcu_enable_atfork (void ); +void rcu_disable_atfork (void );struct rcu_head ;typedef void RCUCBFunc (struct rcu_head *head);
@@ -137,8 +137,8 @@ struct rcu_head {RCUCBFunc *func; }; -extern void call_rcu1 (struct rcu_head *head,RCUCBFunc *func); -extern void drain_call_rcu (void ); +void call_rcu1 (struct rcu_head *head,RCUCBFunc *func); +void drain_call_rcu (void );/* The operands of the minus operator must have the same type, * which must be the one that we specify in the cast.
include/qemu/sys_membarrier.h +2 -2
@@ -14,8 +14,8 @@* side. The slow side forces processor-level ordering on all other cores * through a system call. */ -extern void smp_mb_global_init (void ); -extern void smp_mb_global (void ); +void smp_mb_global_init (void ); +void smp_mb_global (void );#define smp_mb_placeholder () barrier()#else /* Keep it simple, execute a real memory barrier on both sides. */
include/qemu/uri.h +3 -3
@@ -96,8 +96,8 @@ typedef struct QueryParams { QueryParam *p; /* array of parameters */ } QueryParams; -QueryParams *query_params_new (int init_alloc); -extern QueryParams *query_params_parse (const char *query); -extern void query_params_free (QueryParams *ps); +QueryParams *query_params_new (int init_alloc); +QueryParams *query_params_parse (const char *query); +void query_params_free (QueryParams *ps);#endif /* QEMU_URI_H */
include/sysemu/accel-blocker.h +7 -7
@@ -16,7 +16,7 @@#include "sysemu/cpus.h" -extern void accel_blocker_init (void ); +void accel_blocker_init (void );/* * accel_{cpu_}ioctl_begin/end:
@@ -26,10 +26,10 @@ extern void accel_blocker_init(void);* called, preventing new ioctls to run. They will continue only after * accel_ioctl_inibith_end(). */ -extern void accel_ioctl_begin (void ); -extern void accel_ioctl_end (void ); -extern void accel_cpu_ioctl_begin (CPUState *cpu); -extern void accel_cpu_ioctl_end (CPUState *cpu); +void accel_ioctl_begin (void ); +void accel_ioctl_end (void ); +void accel_cpu_ioctl_begin (CPUState *cpu); +void accel_cpu_ioctl_end (CPUState *cpu);/* * accel_ioctl_inhibit_begin: start critical section
@@ -42,7 +42,7 @@ extern void accel_cpu_ioctl_end(CPUState *cpu);* This allows the caller to access shared data or perform operations without * worrying of concurrent vcpus accesses. */ -extern void accel_ioctl_inhibit_begin (void ); +void accel_ioctl_inhibit_begin (void );/* * accel_ioctl_inhibit_end: end critical section started by
@@ -50,6 +50,6 @@ extern void accel_ioctl_inhibit_begin(void);* * This function allows blocked accel_{cpu_}ioctl_begin() to continue. */ -extern void accel_ioctl_inhibit_end (void ); +void accel_ioctl_inhibit_end (void );#endif /* ACCEL_BLOCKER_H */
include/sysemu/os-win32.h +2 -2
@@ -66,8 +66,8 @@ extern "C" {* setjmp to _setjmpex instead. However, they are still defined in libmingwex.a, * which gets linked automatically. */ -extern int __mingw_setjmp (jmp_buf ); -extern void __attribute__((noreturn))__mingw_longjmp (jmp_buf ,int ); +int __mingw_setjmp (jmp_buf ); +void __attribute__((noreturn))__mingw_longjmp (jmp_buf ,int );#define setjmp (env) __mingw_setjmp(env)#define longjmp (env, val) __mingw_longjmp(env, val)#elif defined(_WIN64)
include/user/safe-syscall.h +2 -2
@@ -126,8 +126,8 @@*/ /* The core part of this function is implemented in assembly */ -extern long safe_syscall_base (int *pending,long number, ...); -extern long safe_syscall_set_errno_tail (int value); +long safe_syscall_base (int *pending,long number, ...); +long safe_syscall_set_errno_tail (int value);/* These are defined by the safe-syscall.inc.S file */ extern char safe_syscall_start[];
target/i386/sev.h +3 -3
@@ -46,9 +46,9 @@ bool sev_es_enabled(void);#define sev_es_enabled () 0#endif -extern uint32_t sev_get_cbit_position (void ); -extern uint32_t sev_get_reduced_phys_bits (void ); -extern bool sev_add_kernel_loader_hashes (SevKernelLoaderContext *ctx,Error **errp); +uint32_t sev_get_cbit_position (void ); +uint32_t sev_get_reduced_phys_bits (void ); +bool sev_add_kernel_loader_hashes (SevKernelLoaderContext *ctx,Error **errp);int sev_encrypt_flash (uint8_t *ptr,uint64_t len,Error **errp); int sev_inject_launch_secret(const char *hdr, const char *secret,
target/mips/cpu.h +2 -2
@@ -1187,8 +1187,8 @@ void mips_cpu_list(void);#define cpu_list mips_cpu_list -extern void cpu_wrdsp (uint32_t rs,uint32_t mask_num,CPUMIPSState *env); -extern uint32_t cpu_rddsp (uint32_t mask_num,CPUMIPSState *env); +void cpu_wrdsp (uint32_t rs,uint32_t mask_num,CPUMIPSState *env); +uint32_t cpu_rddsp (uint32_t mask_num,CPUMIPSState *env);/* * MMU modes definitions. We carefully match the indices with our
tcg/tcg-internal.h +2 -2
@@ -113,8 +113,8 @@ static inline TCGv_i32 TCGV_HIGH(TCGv_i64 t)return temp_tcgv_i32 (tcgv_i64_temp (t) + !HOST_BIG_ENDIAN ); }#else -extern TCGv_i32 TCGV_LOW(TCGv_i64) QEMU_ERROR("32-bit code path is reachable"); -extern TCGv_i32 TCGV_HIGH(TCGv_i64) QEMU_ERROR("32-bit code path is reachable"); +TCGv_i32 TCGV_LOW(TCGv_i64) QEMU_ERROR("32-bit code path is reachable"); +TCGv_i32 TCGV_HIGH(TCGv_i64) QEMU_ERROR("32-bit code path is reachable");#endif static inline TCGv_i64 TCGV128_LOW (TCGv_i128 t)
tests/tcg/minilib/minilib.h +1 -1
@@ -15,7 +15,7 @@/* * Provided by the individual arch */ -extern void __sys_outc (char c); +void __sys_outc (char c);/* * Provided by the common minilib
include/exec/memory_ldst.h.inc +21 -21
69 lines not on this page · raw message
roms/seabios +1 -1
@@ -1 +1 @@ -Subproject commit ea1b7a0733906b8425d948ae94fba63c32b1d425 +Subproject commit 3208b098f51a9ef96d0dfa71d5ec3a3eaec88f0a
Signature · 1 line
2.38.1
Re: [PATCH-for-8.1 4/5] bulk: Do not declare function prototypes using extern keyword
Quoted 26 lines · Philippe Mathieu-Daudé
By default, C function prototypes declared in headers are visible, so there is no need to declare them as 'extern' functions. Remove this redundancy in a single bulk commit; do not modify:
- meson.build (used to check function availability at runtime)
- pc-bios
- libdecnumber
- *.cSigned-off-by Philippe Mathieu-Daudé <[email protected]>--- block/dmg.h | 8 +++---- bsd-user/bsd-file.h | 6 ++--- crypto/hmacpriv.h | 13 +++++------ hw/xen/xen_pt.h | 8 +++---- include/crypto/secret_common.h | 14 +++++------- include/exec/page-vary.h | 4 ++-- include/hw/misc/aspeed_scu.h | 2 +- include/hw/nvram/npcm7xx_otp.h | 4 ++-- include/hw/qdev-core.h | 4 ++-- include/qemu/crc-ccitt.h | 4 ++-- include/qemu/osdep.h | 2 +- include/qemu/rcu.h | 14 ++++++------ include/qemu/sys_membarrier.h | 4 ++-- include/qemu/uri.h | 6 ++--- include/sysemu/accel-blocker.h | 14 ++++++------
Quoted 8 lines
include/sysemu/os-win32.h | 4 ++-- include/user/safe-syscall.h | 4 ++-- target/i386/sev.h | 6 ++--- target/mips/cpu.h | 4 ++-- tcg/tcg-internal.h | 4 ++-- tests/tcg/minilib/minilib.h | 2 +- include/exec/memory_ldst.h.inc | 42 +++++++++++++++++----------------- roms/seabios | 2 +-
Accidental submodule commit.,
Quoted 9 lines
23 files changed, 84 insertions(+), 91 deletions(-)block/dmg.h +0
-0@@ -51,10 +51,10 @@ typedef struct BDRVDMGState {z_stream zstream; } BDRVDMGState;
block/dmg.h typedef struct BDRVDMGState { · line 58
Quoted 10 lines
block/dmg.h +4
-4-extern int (*dmg_uncompress_bz2)(char *next_in,unsigned int avail_in, -char *next_out,unsigned int avail_out); +int (*dmg_uncompress_bz2)(char *next_in,unsigned int avail_in, +char *next_out,unsigned int avail_out); -extern int (*dmg_uncompress_lzfse)(char *next_in,unsigned int avail_in, -char *next_out,unsigned int avail_out); +int (*dmg_uncompress_lzfse)(char *next_in,unsigned int avail_in, +char *next_out,unsigned int avail_out);
These are variable declarations, so with this change you'll get multiple copies of the variable if this header is included from multiple source files. IOW, the 'extern' usage is correct.
roms/seabios line 1
Quoted 7 lines
roms/seabios +1
-1@@ -1 +1 @@ -Subproject commit ea1b7a0733906b8425d948ae94fba63c32b1d425 +Subproject commit 3208b098f51a9ef96d0dfa71d5ec3a3eaec88f0a
Nope !
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH-for-8.1 4/5] bulk: Do not declare function prototypes using extern keyword
Quoted 53 lines · Daniel P. Berrangé
Quoted 26 lines · Philippe Mathieu-Daudé
By default, C function prototypes declared in headers are visible, so there is no need to declare them as 'extern' functions. Remove this redundancy in a single bulk commit; do not modify:
- meson.build (used to check function availability at runtime)
- pc-bios
- libdecnumber
- *.cSigned-off-by Philippe Mathieu-Daudé <[email protected]>--- block/dmg.h | 8 +++---- bsd-user/bsd-file.h | 6 ++--- crypto/hmacpriv.h | 13 +++++------ hw/xen/xen_pt.h | 8 +++---- include/crypto/secret_common.h | 14 +++++------- include/exec/page-vary.h | 4 ++-- include/hw/misc/aspeed_scu.h | 2 +- include/hw/nvram/npcm7xx_otp.h | 4 ++-- include/hw/qdev-core.h | 4 ++-- include/qemu/crc-ccitt.h | 4 ++-- include/qemu/osdep.h | 2 +- include/qemu/rcu.h | 14 ++++++------ include/qemu/sys_membarrier.h | 4 ++-- include/qemu/uri.h | 6 ++--- include/sysemu/accel-blocker.h | 14 ++++++------Quoted 8 lines
include/sysemu/os-win32.h | 4 ++-- include/user/safe-syscall.h | 4 ++-- target/i386/sev.h | 6 ++--- target/mips/cpu.h | 4 ++-- tcg/tcg-internal.h | 4 ++-- tests/tcg/minilib/minilib.h | 2 +- include/exec/memory_ldst.h.inc | 42 +++++++++++++++++----------------- roms/seabios | 2 +-Accidental submodule commit.,
Quoted 15 lines
23 files changed, 84 insertions(+), 91 deletions(-)block/dmg.h +2
-2@@ -51,10 +51,10 @@ typedef struct BDRVDMGState {z_stream zstream; } BDRVDMGState; -extern int (*dmg_uncompress_bz2)(char *next_in,unsigned int avail_in, -char *next_out,unsigned int avail_out); +int (*dmg_uncompress_bz2)(char *next_in,unsigned int avail_in, +char *next_out,unsigned int avail_out);
Quoted 8 lines
block/dmg.h typedef struct BDRVDMGState { · line 58
Quoted 4 lines
block/dmg.h +2
-2-extern int (*dmg_uncompress_lzfse)(char *next_in,unsigned int avail_in, -char *next_out,unsigned int avail_out); +int (*dmg_uncompress_lzfse)(char *next_in,unsigned int avail_in, +char *next_out,unsigned int avail_out);These are variable declarations, so with this change you'll get multiple copies of the variable if this header is included from multiple source files. IOW, the 'extern' usage is correct.
Doh indeed, good catch, thanks.
Quoted 9 lines
roms/seabios line 1
Quoted 7 lines
roms/seabios +1
-1@@ -1 +1 @@ -Subproject commit ea1b7a0733906b8425d948ae94fba63c32b1d425 +Subproject commit 3208b098f51a9ef96d0dfa71d5ec3a3eaec88f0aNope !
Oops...
PATCH 5/5 bulk: Replace __attribute__((noreturn)) -> G_NORETURN
In reply to Philippe Mathieu-DaudéUnder MSYS2, G_NORETURN is expanded to '[[noreturn]]'. Simpler to use the same definition everywhere, unifying the code style.
--- include/sysemu/os-win32.h | 2 +- tests/migration/stress.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/sysemu/os-win32.h +1 -1
@@ -67,7 +67,7 @@ extern "C" {* which gets linked automatically. */ int __mingw_setjmp (jmp_buf ); -void __attribute__((noreturn))__mingw_longjmp (jmp_buf ,int ); +G_NORETURN void __mingw_longjmp(jmp_buf, int);#define setjmp (env) __mingw_setjmp(env)#define longjmp (env, val) __mingw_longjmp(env, val)#elif defined(_WIN64)
tests/migration/stress.c +1 -1
@@ -36,7 +36,7 @@ static int gettid(void) }#endif -static __attribute__((noreturn))void exit_failure (void ) +static G_NORETURN void exit_failure(void) {if (getpid () ==1 ) {sync ();
Signature · 1 line
2.38.1
Re: [PATCH-for-8.1 5/5] bulk: Replace __attribute__((noreturn)) -> G_NORETURN
Quoted 5 lines · Philippe Mathieu-Daudé
Under MSYS2,
G_NORETURNis expanded to '[[noreturn]]'. Simpler to use the same definition everywhere, unifying the code style.Signed-off-by Philippe Mathieu-Daudé <[email protected]>