[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/5] coroutine: Clean up superfluous inclusion of qemu/lockabl
From: |
Markus Armbruster |
Subject: |
[PATCH v2 3/5] coroutine: Clean up superfluous inclusion of qemu/lockable.h |
Date: |
Tue, 20 Dec 2022 16:49:42 +0100 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
include/qemu/progress_meter.h | 2 +-
block/progress_meter.c | 2 ++
tests/unit/test-coroutine.c | 1 -
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/qemu/progress_meter.h b/include/qemu/progress_meter.h
index dadf822bbf..0f2c0a32d2 100644
--- a/include/qemu/progress_meter.h
+++ b/include/qemu/progress_meter.h
@@ -27,7 +27,7 @@
#ifndef QEMU_PROGRESS_METER_H
#define QEMU_PROGRESS_METER_H
-#include "qemu/lockable.h"
+#include "qemu/thread.h"
typedef struct ProgressMeter {
/**
diff --git a/block/progress_meter.c b/block/progress_meter.c
index aa2e60248c..31a170a2cd 100644
--- a/block/progress_meter.c
+++ b/block/progress_meter.c
@@ -23,7 +23,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+
#include "qemu/osdep.h"
+#include "qemu/coroutine.h"
#include "qemu/progress_meter.h"
void progress_init(ProgressMeter *pm)
diff --git a/tests/unit/test-coroutine.c b/tests/unit/test-coroutine.c
index 513800d3db..b0d21d673a 100644
--- a/tests/unit/test-coroutine.c
+++ b/tests/unit/test-coroutine.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qemu/coroutine_int.h"
-#include "qemu/lockable.h"
/*
* Check that qemu_in_coroutine() works
--
2.38.1
- [PATCH v2 0/5] coroutine: Clean up includes, Markus Armbruster, 2022/12/20
- [PATCH v2 3/5] coroutine: Clean up superfluous inclusion of qemu/lockable.h,
Markus Armbruster <=
- [PATCH v2 5/5] coroutine: Use Coroutine typedef name instead of structure tag, Markus Armbruster, 2022/12/20
- [PATCH v2 2/5] coroutine: Move coroutine_fn to qemu/osdep.h, trim includes, Markus Armbruster, 2022/12/20
- [PATCH v2 1/5] coroutine: Clean up superfluous inclusion of qemu/coroutine.h, Markus Armbruster, 2022/12/20
- [PATCH v2 4/5] coroutine: Split qemu/coroutine-core.h off qemu/coroutine.h, Markus Armbruster, 2022/12/20