mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lockable: remove QemuLockable from typedefs.h

Browse Source 
Using QemuLockable almost always requires going through QEMU_MAKE_LOCKABLE().
Therefore, there is little point in having the typedef always present.  Move
it to lockable.h, with only a small adjustment to coroutine.h (which has
a tricky co-dependency with lockable.h due to defining CoMutex *and*
using QemuLockable as a part of the CoQueue API).

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-05-02 16:32:25 +02:00
parent a42706dbe4
commit 13d1109448
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/qemu/coroutine.h
View File

@ -84,6 +84,8 @@ static inline coroutine_fn void qemu_co_mutex_assert_locked(CoMutex *mutex)
mutex->holder == qemu_coroutine_self()); mutex->holder == qemu_coroutine_self());
} }
#include "qemu/lockable.h"
/** /**
* CoQueues are a mechanism to queue coroutines in order to continue executing * CoQueues are a mechanism to queue coroutines in order to continue executing
* them later. They are similar to condition variables, but they need help * them later. They are similar to condition variables, but they need help
@ -281,8 +283,6 @@ void qemu_coroutine_inc_pool_size(unsigned int additional_pool_size);
*/ */
void qemu_coroutine_dec_pool_size(unsigned int additional_pool_size); void qemu_coroutine_dec_pool_size(unsigned int additional_pool_size);
#include "qemu/lockable.h"
/** /**
* Sends a (part of) iovec down a socket, yielding when the socket is full, or * Sends a (part of) iovec down a socket, yielding when the socket is full, or
* Receives data into a (part of) iovec from a socket, * Receives data into a (part of) iovec from a socket,

4
include/qemu/lockable.h
View File

@ -18,11 +18,11 @@
typedef void QemuLockUnlockFunc(void *); typedef void QemuLockUnlockFunc(void *);
struct QemuLockable { typedef struct QemuLockable {
void *object; void *object;
QemuLockUnlockFunc *lock; QemuLockUnlockFunc *lock;
QemuLockUnlockFunc *unlock; QemuLockUnlockFunc *unlock;
}; } QemuLockable;
static inline __attribute__((__always_inline__)) QemuLockable * static inline __attribute__((__always_inline__)) QemuLockable *
qemu_make_lockable(void *x, QemuLockable *lockable) qemu_make_lockable(void *x, QemuLockable *lockable)

1
include/qemu/typedefs.h
View File

@ -105,7 +105,6 @@ typedef struct QEMUBH QEMUBH;
typedef struct QemuConsole QemuConsole; typedef struct QemuConsole QemuConsole;
typedef struct QEMUCursor QEMUCursor; typedef struct QEMUCursor QEMUCursor;
typedef struct QEMUFile QEMUFile; typedef struct QEMUFile QEMUFile;
typedef struct QemuLockable QemuLockable;
typedef struct QemuMutex QemuMutex; typedef struct QemuMutex QemuMutex;
typedef struct QemuOpts QemuOpts; typedef struct QemuOpts QemuOpts;
typedef struct QemuOptsList QemuOptsList; typedef struct QemuOptsList QemuOptsList;