[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/12] coroutine: Move coroutine_fn to qemu/osdep.h, trim includes
From: |
Markus Armbruster |
Subject: |
[PULL 02/12] coroutine: Move coroutine_fn to qemu/osdep.h, trim includes |
Date: |
Fri, 20 Jan 2023 08:01:12 +0100 |
block/block-hmp-cmds.h and qemu/co-shared-resource.h use coroutine_fn
without including qemu/coroutine.h. They compile only if it's already
included from elsewhere.
I could fix that, but pulling in qemu/coroutine.h and everything it
includes just for a macro that expands into nothing feels silly.
Instead, move the macro to qemu/osdep.h.
Inclusions of qemu/coroutine.h just for coroutine_fn become
superfluous. Drop them.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221221131435.3851212-3-armbru@redhat.com>
---
include/block/aio_task.h | 2 --
include/block/block-common.h | 1 -
include/block/graph-lock.h | 2 --
include/monitor/hmp.h | 1 -
include/qemu/coroutine.h | 18 +++++++-----------
include/qemu/osdep.h | 16 ++++++++++++++++
6 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/include/block/aio_task.h b/include/block/aio_task.h
index 50bc1e1817..18a9c41f4e 100644
--- a/include/block/aio_task.h
+++ b/include/block/aio_task.h
@@ -25,8 +25,6 @@
#ifndef BLOCK_AIO_TASK_H
#define BLOCK_AIO_TASK_H
-#include "qemu/coroutine.h"
-
typedef struct AioTaskPool AioTaskPool;
typedef struct AioTask AioTask;
typedef int coroutine_fn (*AioTaskFunc)(AioTask *task);
diff --git a/include/block/block-common.h b/include/block/block-common.h
index 4749c46a5e..434ffc5d34 100644
--- a/include/block/block-common.h
+++ b/include/block/block-common.h
@@ -27,7 +27,6 @@
#include "block/aio.h"
#include "block/aio-wait.h"
#include "qemu/iov.h"
-#include "qemu/coroutine.h"
#include "block/accounting.h"
#include "qemu/hbitmap.h"
#include "qemu/transactions.h"
diff --git a/include/block/graph-lock.h b/include/block/graph-lock.h
index 4c92cd8edf..3ab924d5e2 100644
--- a/include/block/graph-lock.h
+++ b/include/block/graph-lock.h
@@ -23,8 +23,6 @@
#include "qemu/osdep.h"
#include "qemu/clang-tsa.h"
-#include "qemu/coroutine.h"
-
/**
* Graph Lock API
* This API provides a rwlock used to protect block layer
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 27f86399f7..c9e3887737 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -15,7 +15,6 @@
#define HMP_H
#include "qemu/readline.h"
-#include "qemu/coroutine.h"
#include "qapi/qapi-types-common.h"
bool hmp_handle_error(Monitor *mon, Error *err);
diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index 89650a2d7f..2496a4f4ef 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -26,23 +26,19 @@
* waiting for events to complete.
*
* These functions are re-entrant and may be used outside the global mutex.
- */
-
-/**
- * Mark a function that executes in coroutine context
*
- * Functions that execute in coroutine context cannot be called directly from
- * normal functions. In the future it would be nice to enable compiler or
- * static checker support for catching such errors. This annotation might make
- * it possible and in the meantime it serves as documentation.
- *
- * For example:
+ * Functions that execute in coroutine context cannot be called
+ * directly from normal functions. Use @coroutine_fn to mark such
+ * functions. For example:
*
* static void coroutine_fn foo(void) {
* ....
* }
+ *
+ * In the future it would be nice to have the compiler or a static
+ * checker catch misuse of such functions. This annotation might make
+ * it possible and in the meantime it serves as documentation.
*/
-#define coroutine_fn
typedef struct Coroutine Coroutine;
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index bd23a08595..c850001408 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -157,6 +157,22 @@ extern "C" {
#include "qemu/typedefs.h"
+/**
+ * Mark a function that executes in coroutine context
+ *
+ * Functions that execute in coroutine context cannot be called directly from
+ * normal functions. In the future it would be nice to enable compiler or
+ * static checker support for catching such errors. This annotation might make
+ * it possible and in the meantime it serves as documentation.
+ *
+ * For example:
+ *
+ * static void coroutine_fn foo(void) {
+ * ....
+ * }
+ */
+#define coroutine_fn
+
/*
* For mingw, as of v6.0.0, the function implementing the assert macro is
* not marked as noreturn, so the compiler cannot delete code following an
--
2.39.0
- [PULL 00/12] Header cleanup patches for 2023-01-20, Markus Armbruster, 2023/01/20
- [PULL 08/12] include/hw/block: Include hw/block/block.h where needed, Markus Armbruster, 2023/01/20
- [PULL 03/12] coroutine: Clean up superfluous inclusion of qemu/lockable.h, Markus Armbruster, 2023/01/20
- [PULL 01/12] coroutine: Clean up superfluous inclusion of qemu/coroutine.h, Markus Armbruster, 2023/01/20
- [PULL 10/12] include/hw/ppc: Supply a few missing includes, Markus Armbruster, 2023/01/20
- [PULL 02/12] coroutine: Move coroutine_fn to qemu/osdep.h, trim includes,
Markus Armbruster <=
- [PULL 12/12] include/hw/ppc include/hw/pci-host: Drop extra typedefs, Markus Armbruster, 2023/01/20
- [PULL 05/12] coroutine: Use Coroutine typedef name instead of structure tag, Markus Armbruster, 2023/01/20
- [PULL 06/12] include/block: Untangle inclusion loops, Markus Armbruster, 2023/01/20
- [PULL 09/12] include/hw/ppc: Split pnv_chip.h off pnv.h, Markus Armbruster, 2023/01/20
- [PULL 04/12] coroutine: Split qemu/coroutine-core.h off qemu/coroutine.h, Markus Armbruster, 2023/01/20
- [PULL 11/12] include/hw/ppc: Don't include hw/pci-host/pnv_phb.h from pnv.h, Markus Armbruster, 2023/01/20
- [PULL 07/12] hw/sparc64/niagara: Use blk_name() instead of open-coding it, Markus Armbruster, 2023/01/20