From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 21 Dec 2022 13:14:33 +0000 (+0100)
Subject: coroutine: Clean up superfluous inclusion of qemu/lockable.h
X-Git-Tag: v8.0.0-rc0~87^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df4bbc9dcb09d9e3a385ca1a2a23daad0819f531;p=thirdparty%2Fqemu.git

coroutine: Clean up superfluous inclusion of qemu/lockable.h

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221221131435.3851212-4-armbru@redhat.com>
---

diff --git a/block/progress_meter.c b/block/progress_meter.c
index aa2e60248c0..31a170a2cd6 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/include/qemu/progress_meter.h b/include/qemu/progress_meter.h
index dadf822bbf8..0f2c0a32d20 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/tests/unit/test-coroutine.c b/tests/unit/test-coroutine.c
index 513800d3db9..b0d21d673a0 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