motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

include: Fix typo in name of MAKE_IDENTFIER macro

Browse source 
In commit bb71846325 we added some macro magic to avoid
variable-shadowing when using some of our more complicated
macros. One of the internal components of this is a macro
named MAKE_IDENTFIER. Fix the typo in its name: it should
be MAKE_IDENTIFIER.

Commit created with
 sed -i -e 's/MAKE_IDENTFIER/MAKE_IDENTIFIER/g' include/qemu/*.h include/qapi/qmp/qobject.h

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20240801102516.3843780-1-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-08-09 17:37:54 +01:00
parent 64678fc45d
commit 0554840032
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/qapi/qmp/qobject.h
View file

@ -54,7 +54,7 @@ struct QObject {
typeof(obj) _obj = (obj); \ typeof(obj) _obj = (obj); \
_obj ? container_of(&_obj->base, QObject, base) : NULL; \ _obj ? container_of(&_obj->base, QObject, base) : NULL; \
}) })
#define QOBJECT(obj) QOBJECT_INTERNAL((obj), MAKE_IDENTFIER(_obj)) #define QOBJECT(obj) QOBJECT_INTERNAL((obj), MAKE_IDENTIFIER(_obj))
/* Required for qobject_to() */ /* Required for qobject_to() */
#define QTYPE_CAST_TO_QNull QTYPE_QNULL #define QTYPE_CAST_TO_QNull QTYPE_QNULL

2
include/qemu/atomic.h
View file

@ -128,7 +128,7 @@
_val; \ _val; \
}) })
#define qatomic_rcu_read(ptr) \ #define qatomic_rcu_read(ptr) \
qatomic_rcu_read_internal((ptr), MAKE_IDENTFIER(_val)) qatomic_rcu_read_internal((ptr), MAKE_IDENTIFIER(_val))
#define qatomic_rcu_set(ptr, i) do { \ #define qatomic_rcu_set(ptr, i) do { \
qemu_build_assert(sizeof(*ptr) <= ATOMIC_REG_SIZE); \ qemu_build_assert(sizeof(*ptr) <= ATOMIC_REG_SIZE); \

2
include/qemu/compiler.h
View file

@ -38,7 +38,7 @@
#endif #endif
/* Expands into an identifier stemN, where N is another number each time */ /* Expands into an identifier stemN, where N is another number each time */
#define MAKE_IDENTFIER(stem) glue(stem, __COUNTER__) #define MAKE_IDENTIFIER(stem) glue(stem, __COUNTER__)
#ifndef likely #ifndef likely
#define likely(x) __builtin_expect(!!(x), 1) #define likely(x) __builtin_expect(!!(x), 1)

6
include/qemu/osdep.h
View file

@ -399,7 +399,7 @@ void QEMU_ERROR("code path is reachable")
}) })
#undef MIN #undef MIN
#define MIN(a, b) \ #define MIN(a, b) \
MIN_INTERNAL((a), (b), MAKE_IDENTFIER(_a), MAKE_IDENTFIER(_b)) MIN_INTERNAL((a), (b), MAKE_IDENTIFIER(_a), MAKE_IDENTIFIER(_b))
#define MAX_INTERNAL(a, b, _a, _b) \ #define MAX_INTERNAL(a, b, _a, _b) \
({ \ ({ \
@ -408,7 +408,7 @@ void QEMU_ERROR("code path is reachable")
}) })
#undef MAX #undef MAX
#define MAX(a, b) \ #define MAX(a, b) \
MAX_INTERNAL((a), (b), MAKE_IDENTFIER(_a), MAKE_IDENTFIER(_b)) MAX_INTERNAL((a), (b), MAKE_IDENTIFIER(_a), MAKE_IDENTIFIER(_b))
#ifdef __COVERITY__ #ifdef __COVERITY__
# define MIN_CONST(a, b) ((a) < (b) ? (a) : (b)) # define MIN_CONST(a, b) ((a) < (b) ? (a) : (b))
@ -440,7 +440,7 @@ void QEMU_ERROR("code path is reachable")
_a == 0 ? _b : (_b == 0 || _b > _a) ? _a : _b; \ _a == 0 ? _b : (_b == 0 || _b > _a) ? _a : _b; \
}) })
#define MIN_NON_ZERO(a, b) \ #define MIN_NON_ZERO(a, b) \
MIN_NON_ZERO_INTERNAL((a), (b), MAKE_IDENTFIER(_a), MAKE_IDENTFIER(_b)) MIN_NON_ZERO_INTERNAL((a), (b), MAKE_IDENTIFIER(_a), MAKE_IDENTIFIER(_b))
/* /*
* Round number down to multiple. Safe when m is not a power of 2 (see * Round number down to multiple. Safe when m is not a power of 2 (see