linux-user: Move PRAGMA_DISABLE_PACKED_WARNING to compiler.h
PATCH 1/1 linux-user: Move PRAGMA_DISABLE_PACKED_WARNING to compiler.h
Replace the slightly older version of this in include/qemu/compiler.h that was commit as part of bsd-user changes with the newer one from linux-user. bsd-user has no regreassions with this.
--- include/qemu/compiler.h | 3 +-- linux-user/qemu.h | 26 -------------------------- tests/lcitool/libvirt-ci | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-)
include/qemu/compiler.h +1 -2
@@ -38,10 +38,9 @@* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 -- so we only * include the warning-suppression pragmas for clang */ -#ifdef __clang__ +#if defined(__clang__) && __has_warning("-Waddress-of-packed-member")#define PRAGMA_DISABLE_PACKED_WARNING \ _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Wpragmas\""); \ _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"")#define PRAGMA_REENABLE_PACKED_WARNING \
linux-user/qemu.h +0 -26
@@ -193,32 +193,6 @@ static inline bool access_ok(CPUState *cpu, int type,These are usually used to access struct data members once the struct has been locked - usually with lock_user_struct. */ -/* -* Tricky points: -* - Use __builtin_choose_expr to avoid type promotion from ?:, -* - Invalid sizes result in a compile time error stemming from -* the fact that abort has no parameters. -* - It's easier to use the endian-specific unaligned load/store -* functions than host-endian unaligned load/store plus tswapN. -* - The pragmas are necessary only to silence a clang false-positive -* warning: see https://bugs.llvm.org/show_bug.cgi?id=39113 . -* - gcc has bugs in its _Pragma() support in some versions, eg -* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 -- so we only -* include the warning-suppression pragmas for clang -*/ -#if defined(__clang__) && __has_warning("-Waddress-of-packed-member") -#define PRAGMA_DISABLE_PACKED_WARNING \ - _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"") - -#define PRAGMA_REENABLE_PACKED_WARNING \ - _Pragma("GCC diagnostic pop") - -#else -#define PRAGMA_DISABLE_PACKED_WARNING -#define PRAGMA_REENABLE_PACKED_WARNING -#endif -#define __put_user_e (x, hptr, e) \ do { \ PRAGMA_DISABLE_PACKED_WARNING; \
tests/lcitool/libvirt-ci +1 -1
@@ -1 +1 @@ -Subproject commit bbd55b4d18cce8f89b5167675e434a6941315634 +Subproject commit 9bff3b763b5531a1490e238bfbf77306dc3a6dbb
Signature · 1 line
2.41.0
v1 should have had a comment removed, but didn't. v2 addresses that (should already be in your mailbox).
Warner
Quoted 79 lines · Warner Losh
Replace the slightly older version of this in
include/qemu/compiler.hthat was commit as part of bsd-user changes with the newer one from linux-user. bsd-user has no regreassions with this.Signed-off-by Warner Losh <[email protected]>--- include/qemu/compiler.h | 3 +-- linux-user/qemu.h | 26 -------------------------- tests/lcitool/libvirt-ci | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-)include/qemu/compiler.h +1
-2@@ -38,10 +38,9 @@* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 -- so we only * include the warning-suppression pragmas for clang */ -#ifdef __clang__ +#if defined(__clang__) && __has_warning("-Waddress-of-packed-member")#define PRAGMA_DISABLE_PACKED_WARNING \ _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Wpragmas\""); \ _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"")#define PRAGMA_REENABLE_PACKED_WARNING \linux-user/qemu.h +0
-0@@ -193,32 +193,6 @@ static inline bool access_ok(CPUState *cpu, int type, These are usually used to access struct data members once the structhas
been locked - usually withlock_user_struct. */linux-user/qemu.h +0
-26-/* -* Tricky points: -* - Use __builtin_choose_expr to avoid type promotion from ?:, -* - Invalid sizes result in a compile time error stemming from -* the fact that abort has no parameters. -* - It's easier to use the endian-specific unaligned load/store -* functions than host-endian unaligned load/store plus tswapN. -* - The pragmas are necessary only to silence a clang false-positive -* warning: see https://bugs.llvm.org/show_bug.cgi?id=39113 . -* - gcc has bugs in its _Pragma() support in some versions, eg -* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 -- so we only -* include the warning-suppression pragmas for clang -*/ -#if defined(__clang__) && __has_warning("-Waddress-of-packed-member") -#define PRAGMA_DISABLE_PACKED_WARNING \ - _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"") - -#define PRAGMA_REENABLE_PACKED_WARNING \ - _Pragma("GCC diagnostic pop") - -#else -#define PRAGMA_DISABLE_PACKED_WARNING -#define PRAGMA_REENABLE_PACKED_WARNING -#endif -#define __put_user_e (x, hptr, e) \ do { \ PRAGMA_DISABLE_PACKED_WARNING; \tests/lcitool/libvirt-ci +1
-2@@ -1 +1 @@ -Subproject commit bbd55b4d18cce8f89b5167675e434a6941315634 +Subproject commit 9bff3b763b5531a1490e238bfbf77306dc3a6dbb --2.41.0
Quoted 2 lines · Warner Losh
Replace the slightly older version of this in
include/qemu/compiler.hthat was commit as part of bsd-user changes with the newer one from
s/commit/committed/ ?
Quoted 1 line
linux-user. bsd-user has no regreassions with this.
s/regreassions/regressions/
Quoted 66 lines
Signed-off-by Warner Losh <[email protected]>--- include/qemu/compiler.h | 3 +-- linux-user/qemu.h | 26 -------------------------- tests/lcitool/libvirt-ci | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-)include/qemu/compiler.h +1
-2@@ -38,10 +38,9 @@* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 -- so we only * include the warning-suppression pragmas for clang */ -#ifdef __clang__ +#if defined(__clang__) && __has_warning("-Waddress-of-packed-member")#define PRAGMA_DISABLE_PACKED_WARNING \ _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Wpragmas\""); \ _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"")#define PRAGMA_REENABLE_PACKED_WARNING \linux-user/qemu.h +0
-26@@ -193,32 +193,6 @@ static inline bool access_ok(CPUState *cpu, int type,These are usually used to access struct data members once the struct has been locked - usually with lock_user_struct. */ -/* -* Tricky points: -* - Use __builtin_choose_expr to avoid type promotion from ?:, -* - Invalid sizes result in a compile time error stemming from -* the fact that abort has no parameters. -* - It's easier to use the endian-specific unaligned load/store -* functions than host-endian unaligned load/store plus tswapN. -* - The pragmas are necessary only to silence a clang false-positive -* warning: see https://bugs.llvm.org/show_bug.cgi?id=39113 . -* - gcc has bugs in its _Pragma() support in some versions, eg -* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 -- so we only -* include the warning-suppression pragmas for clang -*/ -#if defined(__clang__) && __has_warning("-Waddress-of-packed-member") -#define PRAGMA_DISABLE_PACKED_WARNING \ - _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"") - -#define PRAGMA_REENABLE_PACKED_WARNING \ - _Pragma("GCC diagnostic pop") - -#else -#define PRAGMA_DISABLE_PACKED_WARNING -#define PRAGMA_REENABLE_PACKED_WARNING -#endif -#define __put_user_e (x, hptr, e) \ do { \ PRAGMA_DISABLE_PACKED_WARNING; \tests/lcitool/libvirt-ci +0
-0
tests/lcitool/libvirt-ci line 1
Quoted 2 lines
tests/lcitool/libvirt-ci +1
-1@@ -1 +1 @@ -Subproject commit bbd55b4d18cce8f89b5167675e434a6941315634 +Subproject commit 9bff3b763b5531a1490e238bfbf77306dc3a6dbb
Accidentially committed the libvirt-ci submodule change?
Thomas