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 aa2e60248c0948f97468a223f0618b81c38b7261..31a170a2cd69595b3da889d83f422ffd2327b648 100644 (file)
--- 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 dadf822bbf805be1a560b287e23d21cb35db8cab..0f2c0a32d20af6f6e925a65a0c87440a7fc1760a 100644 (file)
--- 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 513800d3db91f4799501c6a58eac4e1f395eada6..b0d21d673a01d841d48dd362187f778246d1c050 100644 (file)
--- 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