Skip to contentSkip to conversation

qemu/compiler: Absorb 'clang-tsa.h'

PATCH In review Philippe Mathieu-Daudé 2 participants 3 messages Jan 17, 2025 – Feb 17, 2025 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH v3 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.

---
 bsd-user/qemu.h                  |   1 -
 include/block/block_int-common.h |   1 -
 include/block/graph-lock.h       |   2 -
 include/exec/page-protection.h   |   2 -
 include/qemu/clang-tsa.h         | 114 -------------------------------
 include/qemu/compiler.h          |  87 +++++++++++++++++++++++
 include/qemu/thread.h            |   1 -
 block/create.c                   |   1 -
 tests/unit/test-bdrv-drain.c     |   1 -
 tests/unit/test-block-iothread.c |   1 -
 util/qemu-thread-posix.c         |   1 -
 11 files changed, 87 insertions(+), 125 deletions(-)
 delete mode 100644 include/qemu/clang-tsa.h
bsd-user/qemu.h +0 -1
index 3eaa14f3f56..4e97c796318 100644
@@ -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
index bb91a0f62fa..ebb4e56a503 100644
@@ -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
index dc8d9491843..2c26c721081 100644
@@ -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/page-protection.h +0 -2
index bae3355f62c..3e0a8a03331 100644
@@ -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/clang-tsa.h deleted +0 -114

114 lines not on this page · raw message

include/qemu/compiler.h +87 -0

93 lines not on this page · raw message

include/qemu/thread.h +0 -1
index 7eba27a7049..6f800aad31a 100644
@@ -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;
block/create.c +0 -1
index 72abafb4c12..6b23a216753 100644
@@ -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
index 98ad89b390c..7410e6f3528 100644
@@ -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
index 1de04a8a13d..26a6c051758 100644
@@ -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
index 6fff4162ac6..b2e26e21205 100644
@@ -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
Reviewed-by on v3 1/1
#1 lore raw
Quoted 22 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.

---
  bsd-user/qemu.h                  |   1 -
  include/block/block_int-common.h |   1 -
  include/block/graph-lock.h       |   2 -
  include/exec/page-protection.h   |   2 -
  include/qemu/clang-tsa.h         | 114 -------------------------------
  include/qemu/compiler.h          |  87 +++++++++++++++++++++++
  include/qemu/thread.h            |   1 -
  block/create.c                   |   1 -
  tests/unit/test-bdrv-drain.c     |   1 -
  tests/unit/test-block-iothread.c |   1 -
  util/qemu-thread-posix.c         |   1 -
  11 files changed, 87 insertions(+), 125 deletions(-)
Quoted 1 line

delete mode 100644 include/qemu/clang-tsa.h

r~

#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 22 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.

---
  bsd-user/qemu.h                  |   1 -
  include/block/block_int-common.h |   1 -
  include/block/graph-lock.h       |   2 -
  include/exec/page-protection.h   |   2 -
  include/qemu/clang-tsa.h         | 114 -------------------------------
  include/qemu/compiler.h          |  87 +++++++++++++++++++++++
  include/qemu/thread.h            |   1 -
  block/create.c                   |   1 -
  tests/unit/test-bdrv-drain.c     |   1 -
  tests/unit/test-block-iothread.c |   1 -
  util/qemu-thread-posix.c         |   1 -
  11 files changed, 87 insertions(+), 125 deletions(-)
Quoted 1 line

delete mode 100644 include/qemu/clang-tsa.h

Patch queued, thanks.