| Message ID | 20210614233143.1221879-4-richard.henderson@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | configure: Change to -std=gnu11 | expand |
On 15/06/2021 01.31, Richard Henderson wrote: > Move the declarations from thread-win32.h into thread.h > and remove the macro redirection from thread-posix.h. > This will be required by following cleanups. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/qemu/thread-posix.h | 4 ---- > include/qemu/thread-win32.h | 6 ------ > include/qemu/thread.h | 9 ++++++--- > util/qemu-thread-posix.c | 20 ++++++++++++++++++++ > 4 files changed, 26 insertions(+), 13 deletions(-) > > diff --git a/include/qemu/thread-posix.h b/include/qemu/thread-posix.h > index c903525062..cf8bc90468 100644 > --- a/include/qemu/thread-posix.h > +++ b/include/qemu/thread-posix.h > @@ -5,10 +5,6 @@ > #include <semaphore.h> > > typedef QemuMutex QemuRecMutex; > -#define qemu_rec_mutex_destroy qemu_mutex_destroy > -#define qemu_rec_mutex_lock_impl qemu_mutex_lock_impl > -#define qemu_rec_mutex_trylock_impl qemu_mutex_trylock_impl > -#define qemu_rec_mutex_unlock qemu_mutex_unlock > > struct QemuMutex { > pthread_mutex_t lock; > diff --git a/include/qemu/thread-win32.h b/include/qemu/thread-win32.h > index d0a1a9597e..d95af4498f 100644 > --- a/include/qemu/thread-win32.h > +++ b/include/qemu/thread-win32.h > @@ -18,12 +18,6 @@ struct QemuRecMutex { > bool initialized; > }; > > -void qemu_rec_mutex_destroy(QemuRecMutex *mutex); > -void qemu_rec_mutex_lock_impl(QemuRecMutex *mutex, const char *file, int line); > -int qemu_rec_mutex_trylock_impl(QemuRecMutex *mutex, const char *file, > - int line); > -void qemu_rec_mutex_unlock(QemuRecMutex *mutex); > - > struct QemuCond { > CONDITION_VARIABLE var; > bool initialized; > diff --git a/include/qemu/thread.h b/include/qemu/thread.h > index 5435763184..2c0d85f3bc 100644 > --- a/include/qemu/thread.h > +++ b/include/qemu/thread.h > @@ -28,6 +28,12 @@ int qemu_mutex_trylock_impl(QemuMutex *mutex, const char *file, const int line); > void qemu_mutex_lock_impl(QemuMutex *mutex, const char *file, const int line); > void qemu_mutex_unlock_impl(QemuMutex *mutex, const char *file, const int line); > > +void qemu_rec_mutex_init(QemuRecMutex *mutex); > +void qemu_rec_mutex_destroy(QemuRecMutex *mutex); > +void qemu_rec_mutex_lock_impl(QemuRecMutex *mutex, const char *file, int line); > +int qemu_rec_mutex_trylock_impl(QemuRecMutex *mutex, const char *file, int line); > +void qemu_rec_mutex_unlock(QemuRecMutex *mutex); > + > typedef void (*QemuMutexLockFunc)(QemuMutex *m, const char *f, int l); > typedef int (*QemuMutexTrylockFunc)(QemuMutex *m, const char *f, int l); > typedef void (*QemuRecMutexLockFunc)(QemuRecMutex *m, const char *f, int l); > @@ -129,9 +135,6 @@ static inline int (qemu_rec_mutex_trylock)(QemuRecMutex *mutex) > return qemu_rec_mutex_trylock(mutex); > } > > -/* Prototypes for other functions are in thread-posix.h/thread-win32.h. */ > -void qemu_rec_mutex_init(QemuRecMutex *mutex); > - > void qemu_cond_init(QemuCond *cond); > void qemu_cond_destroy(QemuCond *cond); > > diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c > index dcff5e7c5d..8e2b6653f5 100644 > --- a/util/qemu-thread-posix.c > +++ b/util/qemu-thread-posix.c > @@ -124,6 +124,26 @@ void qemu_rec_mutex_init(QemuRecMutex *mutex) > mutex->initialized = true; > } > > +void qemu_rec_mutex_destroy(QemuRecMutex *mutex) > +{ > + qemu_mutex_destroy(mutex); > +} > + > +void qemu_rec_mutex_lock_impl(QemuRecMutex *mutex, const char *file, int line) > +{ > + qemu_mutex_lock_impl(mutex, file, line); > +} > + > +int qemu_rec_mutex_trylock_impl(QemuRecMutex *mutex, const char *file, int line) > +{ > + return qemu_mutex_trylock_impl(mutex, file, line); > +} > + > +void qemu_rec_mutex_unlock(QemuRecMutex *mutex) > +{ > + qemu_mutex_unlock(mutex); > +} > + > void qemu_cond_init(QemuCond *cond) > { > int err; > Reviewed-by: Thomas Huth <thuth@redhat.com>
Richard Henderson <richard.henderson@linaro.org> writes: > Move the declarations from thread-win32.h into thread.h > and remove the macro redirection from thread-posix.h. > This will be required by following cleanups. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/include/qemu/thread-posix.h b/include/qemu/thread-posix.h index c903525062..cf8bc90468 100644 --- a/include/qemu/thread-posix.h +++ b/include/qemu/thread-posix.h @@ -5,10 +5,6 @@ #include <semaphore.h> typedef QemuMutex QemuRecMutex; -#define qemu_rec_mutex_destroy qemu_mutex_destroy -#define qemu_rec_mutex_lock_impl qemu_mutex_lock_impl -#define qemu_rec_mutex_trylock_impl qemu_mutex_trylock_impl -#define qemu_rec_mutex_unlock qemu_mutex_unlock struct QemuMutex { pthread_mutex_t lock; diff --git a/include/qemu/thread-win32.h b/include/qemu/thread-win32.h index d0a1a9597e..d95af4498f 100644 --- a/include/qemu/thread-win32.h +++ b/include/qemu/thread-win32.h @@ -18,12 +18,6 @@ struct QemuRecMutex { bool initialized; }; -void qemu_rec_mutex_destroy(QemuRecMutex *mutex); -void qemu_rec_mutex_lock_impl(QemuRecMutex *mutex, const char *file, int line); -int qemu_rec_mutex_trylock_impl(QemuRecMutex *mutex, const char *file, - int line); -void qemu_rec_mutex_unlock(QemuRecMutex *mutex); - struct QemuCond { CONDITION_VARIABLE var; bool initialized; diff --git a/include/qemu/thread.h b/include/qemu/thread.h index 5435763184..2c0d85f3bc 100644 --- a/include/qemu/thread.h +++ b/include/qemu/thread.h @@ -28,6 +28,12 @@ int qemu_mutex_trylock_impl(QemuMutex *mutex, const char *file, const int line); void qemu_mutex_lock_impl(QemuMutex *mutex, const char *file, const int line); void qemu_mutex_unlock_impl(QemuMutex *mutex, const char *file, const int line); +void qemu_rec_mutex_init(QemuRecMutex *mutex); +void qemu_rec_mutex_destroy(QemuRecMutex *mutex); +void qemu_rec_mutex_lock_impl(QemuRecMutex *mutex, const char *file, int line); +int qemu_rec_mutex_trylock_impl(QemuRecMutex *mutex, const char *file, int line); +void qemu_rec_mutex_unlock(QemuRecMutex *mutex); + typedef void (*QemuMutexLockFunc)(QemuMutex *m, const char *f, int l); typedef int (*QemuMutexTrylockFunc)(QemuMutex *m, const char *f, int l); typedef void (*QemuRecMutexLockFunc)(QemuRecMutex *m, const char *f, int l); @@ -129,9 +135,6 @@ static inline int (qemu_rec_mutex_trylock)(QemuRecMutex *mutex) return qemu_rec_mutex_trylock(mutex); } -/* Prototypes for other functions are in thread-posix.h/thread-win32.h. */ -void qemu_rec_mutex_init(QemuRecMutex *mutex); - void qemu_cond_init(QemuCond *cond); void qemu_cond_destroy(QemuCond *cond); diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index dcff5e7c5d..8e2b6653f5 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -124,6 +124,26 @@ void qemu_rec_mutex_init(QemuRecMutex *mutex) mutex->initialized = true; } +void qemu_rec_mutex_destroy(QemuRecMutex *mutex) +{ + qemu_mutex_destroy(mutex); +} + +void qemu_rec_mutex_lock_impl(QemuRecMutex *mutex, const char *file, int line) +{ + qemu_mutex_lock_impl(mutex, file, line); +} + +int qemu_rec_mutex_trylock_impl(QemuRecMutex *mutex, const char *file, int line) +{ + return qemu_mutex_trylock_impl(mutex, file, line); +} + +void qemu_rec_mutex_unlock(QemuRecMutex *mutex) +{ + qemu_mutex_unlock(mutex); +} + void qemu_cond_init(QemuCond *cond) { int err;
Move the declarations from thread-win32.h into thread.h and remove the macro redirection from thread-posix.h. This will be required by following cleanups. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/qemu/thread-posix.h | 4 ---- include/qemu/thread-win32.h | 6 ------ include/qemu/thread.h | 9 ++++++--- util/qemu-thread-posix.c | 20 ++++++++++++++++++++ 4 files changed, 26 insertions(+), 13 deletions(-)