| Message ID | 20241212185341.2857-4-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | accel/tcg: Extract user APIs out of 'exec/[cpu, exec]-all.h' | expand |
On 12/12/24 10:53, Philippe Mathieu-Daudé wrote: > The next commit will remove "qemu/clang-tsa.h" of "exec/exec-all.h", > however the following files indirectly include it: > > $ git grep -L qemu/clang-tsa.h $(git grep -wl TSA_NO_TSA) > block/create.c > include/block/block_int-common.h > tests/unit/test-bdrv-drain.c > tests/unit/test-block-iothread.c > util/qemu-thread-posix.c > > Explicitly include it so we can process with the removal in the > next commit. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > include/block/block_int-common.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 + > 5 files changed, 5 insertions(+) > > diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h > index ebb4e56a503..bb91a0f62fa 100644 > --- a/include/block/block_int-common.h > +++ b/include/block/block_int-common.h > @@ -28,6 +28,7 @@ > #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" > diff --git a/block/create.c b/block/create.c > index 6b23a216753..72abafb4c12 100644 > --- a/block/create.c > +++ b/block/create.c > @@ -24,6 +24,7 @@ > > #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" > diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c > index 7410e6f3528..98ad89b390c 100644 > --- a/tests/unit/test-bdrv-drain.c > +++ b/tests/unit/test-bdrv-drain.c > @@ -28,6 +28,7 @@ > #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; > diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c > index 26a6c051758..1de04a8a13d 100644 > --- a/tests/unit/test-block-iothread.c > +++ b/tests/unit/test-block-iothread.c > @@ -29,6 +29,7 @@ > #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" > > diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c > index b2e26e21205..6fff4162ac6 100644 > --- a/util/qemu-thread-posix.c > +++ b/util/qemu-thread-posix.c > @@ -17,6 +17,7 @@ > #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> Seems like a better place for all this would be in: include/qemu/compiler.h, instead of a separate clang-tsa header. But for the current version, Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
On 12/12/24 20:22, Pierrick Bouvier wrote: > On 12/12/24 10:53, Philippe Mathieu-Daudé wrote: >> The next commit will remove "qemu/clang-tsa.h" of "exec/exec-all.h", >> however the following files indirectly include it: >> >> $ git grep -L qemu/clang-tsa.h $(git grep -wl TSA_NO_TSA) >> block/create.c >> include/block/block_int-common.h >> tests/unit/test-bdrv-drain.c >> tests/unit/test-block-iothread.c >> util/qemu-thread-posix.c >> >> Explicitly include it so we can process with the removal in the >> next commit. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> include/block/block_int-common.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 + >> 5 files changed, 5 insertions(+) >> >> diff --git a/include/block/block_int-common.h b/include/block/ >> block_int-common.h >> index ebb4e56a503..bb91a0f62fa 100644 >> --- a/include/block/block_int-common.h >> +++ b/include/block/block_int-common.h >> @@ -28,6 +28,7 @@ >> #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" >> diff --git a/block/create.c b/block/create.c >> index 6b23a216753..72abafb4c12 100644 >> --- a/block/create.c >> +++ b/block/create.c >> @@ -24,6 +24,7 @@ >> #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" >> diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c >> index 7410e6f3528..98ad89b390c 100644 >> --- a/tests/unit/test-bdrv-drain.c >> +++ b/tests/unit/test-bdrv-drain.c >> @@ -28,6 +28,7 @@ >> #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; >> diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block- >> iothread.c >> index 26a6c051758..1de04a8a13d 100644 >> --- a/tests/unit/test-block-iothread.c >> +++ b/tests/unit/test-block-iothread.c >> @@ -29,6 +29,7 @@ >> #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" >> diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c >> index b2e26e21205..6fff4162ac6 100644 >> --- a/util/qemu-thread-posix.c >> +++ b/util/qemu-thread-posix.c >> @@ -17,6 +17,7 @@ >> #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> > > Seems like a better place for all this would be in: > include/qemu/compiler.h, instead of a separate clang-tsa header. Yeah I was thinking the same, but since there is already another header, I didn't want to delay this cleanup further by modifying unrelated files. > But for the current version, > Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Thanks!
On 12/12/24 12:18, Philippe Mathieu-Daudé wrote: > On 12/12/24 20:22, Pierrick Bouvier wrote: >> On 12/12/24 10:53, Philippe Mathieu-Daudé wrote: >>> The next commit will remove "qemu/clang-tsa.h" of "exec/exec-all.h", >>> however the following files indirectly include it: >>> >>> $ git grep -L qemu/clang-tsa.h $(git grep -wl TSA_NO_TSA) >>> block/create.c >>> include/block/block_int-common.h >>> tests/unit/test-bdrv-drain.c >>> tests/unit/test-block-iothread.c >>> util/qemu-thread-posix.c >>> >>> Explicitly include it so we can process with the removal in the >>> next commit. >>> >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>> --- >>> include/block/block_int-common.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 + >>> 5 files changed, 5 insertions(+) >>> >>> diff --git a/include/block/block_int-common.h b/include/block/ >>> block_int-common.h >>> index ebb4e56a503..bb91a0f62fa 100644 >>> --- a/include/block/block_int-common.h >>> +++ b/include/block/block_int-common.h >>> @@ -28,6 +28,7 @@ >>> #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" >>> diff --git a/block/create.c b/block/create.c >>> index 6b23a216753..72abafb4c12 100644 >>> --- a/block/create.c >>> +++ b/block/create.c >>> @@ -24,6 +24,7 @@ >>> #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" >>> diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c >>> index 7410e6f3528..98ad89b390c 100644 >>> --- a/tests/unit/test-bdrv-drain.c >>> +++ b/tests/unit/test-bdrv-drain.c >>> @@ -28,6 +28,7 @@ >>> #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; >>> diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block- >>> iothread.c >>> index 26a6c051758..1de04a8a13d 100644 >>> --- a/tests/unit/test-block-iothread.c >>> +++ b/tests/unit/test-block-iothread.c >>> @@ -29,6 +29,7 @@ >>> #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" >>> diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c >>> index b2e26e21205..6fff4162ac6 100644 >>> --- a/util/qemu-thread-posix.c >>> +++ b/util/qemu-thread-posix.c >>> @@ -17,6 +17,7 @@ >>> #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> >> >> Seems like a better place for all this would be in: >> include/qemu/compiler.h, instead of a separate clang-tsa header. > > Yeah I was thinking the same, but since there is already another > header, I didn't want to delay this cleanup further by modifying > unrelated files. > No worries, that's why I still sent a reviewed-by. >> But for the current version, >> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > > Thanks!
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h index ebb4e56a503..bb91a0f62fa 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -28,6 +28,7 @@ #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" diff --git a/block/create.c b/block/create.c index 6b23a216753..72abafb4c12 100644 --- a/block/create.c +++ b/block/create.c @@ -24,6 +24,7 @@ #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" diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c index 7410e6f3528..98ad89b390c 100644 --- a/tests/unit/test-bdrv-drain.c +++ b/tests/unit/test-bdrv-drain.c @@ -28,6 +28,7 @@ #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; diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c index 26a6c051758..1de04a8a13d 100644 --- a/tests/unit/test-block-iothread.c +++ b/tests/unit/test-block-iothread.c @@ -29,6 +29,7 @@ #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" diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index b2e26e21205..6fff4162ac6 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -17,6 +17,7 @@ #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>
The next commit will remove "qemu/clang-tsa.h" of "exec/exec-all.h", however the following files indirectly include it: $ git grep -L qemu/clang-tsa.h $(git grep -wl TSA_NO_TSA) block/create.c include/block/block_int-common.h tests/unit/test-bdrv-drain.c tests/unit/test-block-iothread.c util/qemu-thread-posix.c Explicitly include it so we can process with the removal in the next commit. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/block/block_int-common.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 + 5 files changed, 5 insertions(+)