From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 37/46] lockable: remove QemuLockable from typedefs.h
Date: Mon, 6 May 2024 09:51:16 +0200 [thread overview]
Message-ID: <20240506075125.8238-38-pbonzini@redhat.com> (raw)
In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com>
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>
---
include/qemu/coroutine.h | 4 ++--
include/qemu/lockable.h | 4 ++--
include/qemu/typedefs.h | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index e6aff453017..ff3084538b8 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -84,6 +84,8 @@ static inline coroutine_fn void qemu_co_mutex_assert_locked(CoMutex *mutex)
mutex->holder == qemu_coroutine_self());
}
+#include "qemu/lockable.h"
+
/**
* CoQueues are a mechanism to queue coroutines in order to continue executing
* 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);
-#include "qemu/lockable.h"
-
/**
* 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,
diff --git a/include/qemu/lockable.h b/include/qemu/lockable.h
index 9823220446d..62110d2eb74 100644
--- a/include/qemu/lockable.h
+++ b/include/qemu/lockable.h
@@ -18,11 +18,11 @@
typedef void QemuLockUnlockFunc(void *);
-struct QemuLockable {
+typedef struct QemuLockable {
void *object;
QemuLockUnlockFunc *lock;
QemuLockUnlockFunc *unlock;
-};
+} QemuLockable;
static inline __attribute__((__always_inline__)) QemuLockable *
qemu_make_lockable(void *x, QemuLockable *lockable)
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 090e219248a..ab24ca2876c 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -105,7 +105,6 @@ typedef struct QEMUBH QEMUBH;
typedef struct QemuConsole QemuConsole;
typedef struct QEMUCursor QEMUCursor;
typedef struct QEMUFile QEMUFile;
-typedef struct QemuLockable QemuLockable;
typedef struct QemuMutex QemuMutex;
typedef struct QemuOpts QemuOpts;
typedef struct QemuOptsList QemuOptsList;
--
2.44.0
next prev parent reply other threads:[~2024-05-06 7:54 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 7:50 [PULL 00/46] Mostly build system and other cleanups patches for 2024-05-06 Paolo Bonzini
2024-05-06 7:50 ` [PULL 01/46] target/i386: Give IRQs a chance when resetting HF_INHIBIT_IRQ_MASK Paolo Bonzini
2024-05-06 7:50 ` [PULL 02/46] Kconfig: kvm: allow building without any board Paolo Bonzini
2024-05-06 7:50 ` [PULL 03/46] tests/qtest: skip m48t59-test if the machine is absent Paolo Bonzini
2024-05-06 7:50 ` [PULL 04/46] gitlab-ci: adjust msys2-64bit to be able to run qtest Paolo Bonzini
2024-05-06 7:50 ` [PULL 05/46] kvm: ppc: disable sPAPR code if CONFIG_PSERIES is disabled Paolo Bonzini
2024-05-06 7:50 ` [PULL 06/46] configs: list "implied" device groups in the default configs Paolo Bonzini
2024-05-06 7:50 ` [PULL 07/46] alpha: switch boards to "default y" Paolo Bonzini
2024-05-06 7:50 ` [PULL 08/46] arm: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 09/46] avr: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 10/46] cris: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 11/46] hppa: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 12/46] i386: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 13/46] loongarch: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 14/46] m68k: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 15/46] microblaze: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 16/46] meson: make target endianneess available to Kconfig Paolo Bonzini
2024-05-06 7:50 ` [PULL 17/46] mips: switch boards to "default y" Paolo Bonzini
2024-05-06 7:50 ` [PULL 18/46] openrisc: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 19/46] ppc: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 20/46] riscv: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 21/46] rx: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 22/46] s390x: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 23/46] sh4: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 24/46] sparc: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 25/46] tricore: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 26/46] xtensa: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 27/46] docs: document new convention for Kconfig board symbols Paolo Bonzini
2024-05-06 7:51 ` [PULL 28/46] target/i386: Introduce SapphireRapids-v3 to add missing features Paolo Bonzini
2024-05-06 7:51 ` [PULL 29/46] bitmap: Use g_try_new0/g_new0/g_renew Paolo Bonzini
2024-05-06 7:51 ` [PULL 30/46] build: do not build virtio-vga-gl if virgl/opengl not available Paolo Bonzini
2024-05-06 7:51 ` [PULL 31/46] fw_cfg: remove useless declarations from typedefs.h Paolo Bonzini
2024-05-06 7:51 ` [PULL 32/46] qdev-core: remove DeviceListener " Paolo Bonzini
2024-05-06 7:51 ` [PULL 33/46] numa: remove types " Paolo Bonzini
2024-05-06 7:51 ` [PULL 34/46] net: remove AnnounceTimer " Paolo Bonzini
2024-05-06 7:51 ` [PULL 35/46] qemu-option: remove QemuOpt " Paolo Bonzini
2024-05-06 7:51 ` [PULL 36/46] intc: remove PICCommonState " Paolo Bonzini
2024-05-06 7:51 ` Paolo Bonzini [this message]
2024-05-06 7:51 ` [PULL 38/46] migration: remove PostcopyDiscardState " Paolo Bonzini
2024-05-06 7:51 ` [PULL 39/46] monitor: remove MonitorDef " Paolo Bonzini
2024-05-06 7:51 ` [PULL 40/46] qapi/machine: remove types " Paolo Bonzini
2024-05-06 7:51 ` [PULL 41/46] display: remove GraphicHwOps " Paolo Bonzini
2024-05-06 7:51 ` [PULL 42/46] tcg: remove CPU* types " Paolo Bonzini
2024-05-06 7:51 ` [PULL 43/46] pci: remove some " Paolo Bonzini
2024-05-06 7:51 ` [PULL 44/46] kvm: move target-dependent interrupt routing out of kvm-all.c Paolo Bonzini
2024-05-06 7:51 ` [PULL 45/46] migration: do not include coroutine_int.h Paolo Bonzini
2024-05-06 7:51 ` [PULL 46/46] qga/commands-posix: fix typo in qmp_guest_set_user_password Paolo Bonzini
2024-05-06 17:17 ` [PULL 00/46] Mostly build system and other cleanups patches for 2024-05-06 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240506075125.8238-38-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).