qemu/compiler: Absorb 'clang-tsa.h'
PATCH 1/1 qemu/compiler: Absorb 'clang-tsa.h'
We already have "qemu/compiler.h" for compiler-specific arrangements, automatically included by "qemu/osdep.h" for each source file. No need to explicitly include a header for a Clang particularity, let the common "qemu/compiler.h" deal with that by having it include "qemu/clang-tsa.h" (renamed as qemu/clang-tsa.h.inc). Add a check to not include "qemu/clang-tsa.h.inc" directly, remove previous "qemu/clang-tsa.h" inclusions.
---
bsd-user/qemu.h | 1 -
include/block/block_int-common.h | 1 -
include/block/graph-lock.h | 2 -
include/exec/exec-all.h | 516 ------------------
include/exec/page-protection.h | 2 -
include/qemu/compiler.h | 2 +
include/qemu/thread.h | 1 -
include/qemu/{clang-tsa.h => clang-tsa.h.inc} | 8 +-
block/create.c | 1 -
tests/unit/test-bdrv-drain.c | 1 -
tests/unit/test-block-iothread.c | 1 -
util/qemu-thread-posix.c | 1 -
12 files changed, 8 insertions(+), 529 deletions(-)
delete mode 100644 include/exec/exec-all.h
rename include/qemu/{clang-tsa.h => clang-tsa.h.inc} (97%)bsd-user/qemu.h +0 -1
@@ -40,7 +40,6 @@ extern char **environ;#include "target.h" #include "exec/gdbstub.h" #include "exec/page-protection.h" -#include "qemu/clang-tsa.h" #include "accel/tcg/vcpu-state.h" #include "qemu-os.h"
include/block/block_int-common.h +0 -1
@@ -28,7 +28,6 @@#include "block/block-common.h" #include "block/block-global-state.h" #include "block/snapshot.h" -#include "qemu/clang-tsa.h" #include "qemu/iov.h" #include "qemu/rcu.h" #include "qemu/stats64.h"
include/block/graph-lock.h +0 -2
@@ -20,8 +20,6 @@#ifndef GRAPH_LOCK_H #define GRAPH_LOCK_H -#include "qemu/clang-tsa.h" -/** * Graph Lock API * This API provides a rwlock used to protect block layer
include/exec/exec-all.h deleted +0 -516
516 lines not on this page · raw message
include/exec/page-protection.h +0 -2
@@ -40,8 +40,6 @@#ifdef CONFIG_USER_ONLY -#include "qemu/clang-tsa.h" - void TSA_NO_TSA mmap_lock(void); void TSA_NO_TSA mmap_unlock(void);bool have_mmap_lock (void );
include/qemu/compiler.h +2 -0
@@ -7,6 +7,8 @@#ifndef COMPILER_H #define COMPILER_H +#include "qemu/clang-tsa.h.inc" +#define HOST_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)/* HOST_LONG_BITS is the size of a native pointer in bits. */
include/qemu/thread.h +0 -1
@@ -3,7 +3,6 @@#include "qemu/processor.h" #include "qemu/atomic.h" -#include "qemu/clang-tsa.h" typedef struct QemuCond QemuCond ;typedef struct QemuSemaphore QemuSemaphore ;
include/qemu/clang-tsa.h.inc renamed from include/qemu/clang-tsa.h +6 -2
@@ -1,5 +1,5 @@ -#ifndef CLANG_TSA_H -#define CLANG_TSA_H +#ifndef CLANG_TSA_H_INC +#define CLANG_TSA_H_INC /* * Copyright 2018 Jarkko Hietaniemi <[email protected]>
@@ -24,6 +24,10 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifndef COMPILER_H +#error Cannot include this header directly +#endif + /* http://clang.llvm.org/docs/ThreadSafetyAnalysis.html * * TSA is available since clang 3.6-ish.
block/create.c +0 -1
@@ -24,7 +24,6 @@#include "qemu/osdep.h" #include "block/block_int.h" -#include "qemu/clang-tsa.h" #include "qemu/job.h" #include "qemu/main-loop.h" #include "qapi/qapi-commands-block-core.h"
tests/unit/test-bdrv-drain.c +0 -1
@@ -28,7 +28,6 @@#include "system/block-backend.h" #include "qapi/error.h" #include "qemu/main-loop.h" -#include "qemu/clang-tsa.h" #include "iothread.h" static QemuEvent done_event;
tests/unit/test-block-iothread.c +0 -1
@@ -29,7 +29,6 @@#include "system/block-backend.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" -#include "qemu/clang-tsa.h" #include "qemu/main-loop.h" #include "iothread.h"
util/qemu-thread-posix.c +0 -1
@@ -17,7 +17,6 @@#include "qemu-thread-common.h" #include "qemu/tsan.h" #include "qemu/bitmap.h" -#include "qemu/clang-tsa.h" #ifdef CONFIG_PTHREAD_SET_NAME_NP #include <pthread_np.h>
Signature · 1 line
2.47.1
Quoted 8 lines · Philippe Mathieu-Daudé
We already have "
qemu/compiler.h" for compiler-specific arrangements, automatically included by "qemu/osdep.h" for each source file. No need to explicitly include a header for a Clang particularity, let the common "qemu/compiler.h" deal with that by having it include "qemu/clang-tsa.h" (renamed as qemu/clang-tsa.h.inc). Add a check to not include "qemu/clang-tsa.h.inc" directly, remove previous "qemu/clang-tsa.h" inclusions.
Quoted 7 lines
Suggested-by Pierrick Bouvier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- bsd-user/qemu.h | 1 - include/block/block_int-common.h | 1 - include/block/graph-lock.h | 2 - include/exec/exec-all.h | 516 ------------------
Oops, weird thing happened while rebasing!
Quoted 11 lines
include/exec/page-protection.h | 2 - include/qemu/compiler.h | 2 + include/qemu/thread.h | 1 - include/qemu/{clang-tsa.h => clang-tsa.h.inc} | 8 +- block/create.c | 1 - tests/unit/test-bdrv-drain.c | 1 - tests/unit/test-block-iothread.c | 1 - util/qemu-thread-posix.c | 1 - 12 files changed, 8 insertions(+), 529 deletions(-)delete mode 100644
include/exec/exec-all.hrenameinclude/qemu/{clang-tsa.h=> clang-tsa.h.inc} (97%)