include/block: Untangle inclusion loops

We have two inclusion loops:

       block/block.h
    -> block/block-global-state.h
    -> block/block-common.h
    -> block/blockjob.h
    -> block/block.h

       block/block.h
    -> block/block-io.h
    -> block/block-common.h
    -> block/blockjob.h
    -> block/block.h

I believe these go back to Emanuele's reorganization of the block API,
merged a few months ago in commit d7e2fe4aac8.

Fortunately, breaking them is merely a matter of deleting unnecessary
includes from headers, and adding them back in places where they are
now missing.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221221133551.3967339-2-armbru@redhat.com>

diff --git a/block.c b/block.c
index 9c2ac757e49586140372b41bf47de6616c99a89e..b4a89207ad2d1c4d64bfaf56ee10b5d45193530c 100644 (file)
--- a/block.c
+++ b/block.c
@@ -27,6 +27,7 @@
 #include "block/trace.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
+#include "block/dirty-bitmap.h"
 #include "block/fuse.h"
 #include "block/nbd.h"
 #include "block/qdict.h"

diff --git a/block/amend.c b/block/amend.c
index f696a006e321e18797680c46eb1a5e0a68292583..bc4bb7b4169331cc51f2680b451883f74b11b3c1 100644 (file)
--- a/block/amend.c
+++ b/block/amend.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qemu/job.h"
 #include "qemu/main-loop.h"

diff --git a/block/backup.c b/block/backup.c
index 6a9ad97a53222eea11b5b2c85de9380e29d4a29c..824d39acaacdf6c46b81560ba5a271388f0eb948 100644 (file)
--- a/block/backup.c
+++ b/block/backup.c
@@ -20,6 +20,7 @@
 #include "block/blockjob_int.h"
 #include "block/block_backup.h"
 #include "block/block-copy.h"
+#include "block/dirty-bitmap.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/cutils.h"

diff --git a/block/blkdebug.c b/block/blkdebug.c
index ca65b043f07a22ff2a4912471ac11dc1a80ee3ea..fa38c1cf7d75fbad39f0e68ac127b800bf6f774a 100644 (file)
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -27,6 +27,7 @@
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "qemu/config-file.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "block/qdict.h"
 #include "qemu/module.h"

diff --git a/block/blklogwrites.c b/block/blklogwrites.c
index cef9efe55d758a1eee75f20598f5a20188723f86..a5bf767184fbf9244ac06eef527b1ae938187cc8 100644 (file)
--- a/block/blklogwrites.c
+++ b/block/blklogwrites.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/sockets.h" /* for EINPROGRESS on Windows */
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"

diff --git a/block/blkreplay.c b/block/blkreplay.c
index 76a0b8d12ae148a1d75b7047c0b5a15e59f28e56..e3b6a3efb21bded3f9bc1cd703807da1812120e9 100644 (file)
--- a/block/blkreplay.c
+++ b/block/blkreplay.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/module.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "sysemu/replay.h"
 #include "qapi/error.h"

diff --git a/block/blkverify.c b/block/blkverify.c
index c60a2dc624dca3a21a97f0cf14cd0e7d1fb6900e..0e78bc9dd6cc3cc0bf3180bcbfac271c9395e8ae 100644 (file)
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/sockets.h" /* for EINPROGRESS on Windows */
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"

diff --git a/block/block-copy.c b/block/block-copy.c
index 5e59d6262fbb7a115ef9efea13a23c5f50e2a7d3..30a4da0f2e61cadd159cad082524d969659eb035 100644 (file)
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -17,10 +17,14 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "block/block-copy.h"
+#include "block/block_int-io.h"
+#include "block/dirty-bitmap.h"
 #include "block/reqlist.h"
 #include "sysemu/block-backend.h"
 #include "qemu/units.h"
+#include "qemu/co-shared-resource.h"
 #include "qemu/coroutine.h"
+#include "qemu/ratelimit.h"
 #include "block/aio_task.h"
 #include "qemu/error-report.h"
 #include "qemu/memalign.h"

diff --git a/block/bochs.c b/block/bochs.c
index e30e3908d9316f0f94480db86be16caad5f1f449..46e79583165d700d7f068629196a37a3f4f632fc 100644 (file)
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -24,6 +24,7 @@
  */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
 #include "qemu/bswap.h"

diff --git a/block/cloop.c b/block/cloop.c
index 3ff975a94d7b7ef4f5c45da2071888523890b33f..1e5a52d6b2dc49d804b3fd8b4f211634ae3b4017 100644 (file)
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -24,6 +24,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
 #include "qemu/bswap.h"

diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index 70c4ba74329e20b5b625f336562ff37114961a24..c9fb809ba0f5c3a6dd1542cc88730f7704479df1 100644 (file)
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -32,6 +32,7 @@
 #include "block/block_int.h"
 #include "block/qdict.h"
 #include "block/block-copy.h"
+#include "block/dirty-bitmap.h"
 
 #include "block/copy-before-write.h"
 #include "block/reqlist.h"

diff --git a/block/copy-on-read.c b/block/copy-on-read.c
index 815ac1d8356cd9c62e4a911fa54aa0b771b4100e..13ed4150a6f2351fb00b6010578b7d29048b2f21 100644 (file)
--- a/block/copy-on-read.c
+++ b/block/copy-on-read.c
@@ -21,6 +21,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
 #include "qapi/error.h"

diff --git a/block/curl.c b/block/curl.c
index cba4c4cac7680aacae67788979f6cd5709bf1d73..bf45fa3244fd7e3666f269a540bde65a9644ced0 100644 (file)
--- a/block/curl.c
+++ b/block/curl.c
@@ -27,6 +27,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/option.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"

diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 956feeb2aeed00db5d0e1fab06c48cb058880809..1e7aee40107c817a851a8db0a4d06202e80a4e78 100644 (file)
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -24,8 +24,10 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "trace.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
+#include "block/dirty-bitmap.h"
 #include "qemu/main-loop.h"
 
 struct BdrvDirtyBitmap {

diff --git a/block/dmg.c b/block/dmg.c
index 675e840ca5878c9884ed1ec396c29111b8bf3340..e10b9a2ba5afa83bceba8d61df9c1043b61d3ad6 100644 (file)
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -23,6 +23,7 @@
  */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qemu/bswap.h"
 #include "qemu/error-report.h"

diff --git a/block/export/fuse.c b/block/export/fuse.c
index 1b26ddfcf3c11bd53c1157d93d3bf24637cf803d..e5fc4af165fa733e4fee2f9d55b7b7349b4fe970 100644 (file)
--- a/block/export/fuse.c
+++ b/block/export/fuse.c
@@ -21,12 +21,13 @@
 #include "qemu/osdep.h"
 #include "qemu/memalign.h"
 #include "block/aio.h"
-#include "block/block.h"
+#include "block/block_int-common.h"
 #include "block/export.h"
 #include "block/fuse.h"
 #include "block/qapi.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-block.h"
+#include "qemu/main-loop.h"
 #include "sysemu/block-backend.h"
 
 #include <fuse.h>

diff --git a/block/file-posix.c b/block/file-posix.c
index b9955db2053a6d4788b961b8889d01e1f15717ae..fa227d9d14edf20abc74839b285e24a38b4afbd9 100644 (file)
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -26,6 +26,7 @@
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
 #include "qemu/option.h"

diff --git a/block/file-win32.c b/block/file-win32.c
index ec9d64d0e4e25f6903b9074959966b6e83c87dde..12be9c3d0fe8d41d7897289bb0e24ee57f944a50 100644 (file)
--- a/block/file-win32.c
+++ b/block/file-win32.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
 #include "qemu/option.h"

diff --git a/block/filter-compress.c b/block/filter-compress.c
index 305716c86cb33bb744c7507e2d6aca64fe2fade5..0ff8d28661d92aa7a27ba160dc0be5133b5543d1 100644 (file)
--- a/block/filter-compress.c
+++ b/block/filter-compress.c
@@ -22,6 +22,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
 #include "qapi/error.h"

diff --git a/block/gluster.c b/block/gluster.c
index 7efc2963996e8d893aac865f9dd2c398cea2c504..1ad19ae9152340303cfeba05910d95d1ec04e32d 100644 (file)
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include <glusterfs/api/glfs.h>
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "block/qdict.h"
 #include "qapi/error.h"

diff --git a/block/io.c b/block/io.c
index a09b1b34abf0e9fd0585e87f2cb15bb1910e4e64..a09a19f7a71d0372d112f6546d74e8c72533b19b 100644 (file)
--- a/block/io.c
+++ b/block/io.c
@@ -30,6 +30,7 @@
 #include "block/blockjob_int.h"
 #include "block/block_int.h"
 #include "block/coroutines.h"
+#include "block/dirty-bitmap.h"
 #include "block/write-threshold.h"
 #include "qemu/cutils.h"
 #include "qemu/memalign.h"

diff --git a/block/iscsi.c b/block/iscsi.c
index a316d46d9625865b0dff796d2266f3c4bfa3666c..c16c592042f2b6fd31d0f67b3930ab788f376880 100644 (file)
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -33,6 +33,7 @@
 #include "qemu/error-report.h"
 #include "qemu/bitops.h"
 #include "qemu/bitmap.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "block/qdict.h"
 #include "scsi/constants.h"

diff --git a/block/mirror.c b/block/mirror.c
index 251adc5ae02acf941df7eb9ecef879dca349f836..634815d78d386036f4b75cf629949edfa6151a4e 100644 (file)
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -18,6 +18,7 @@
 #include "trace.h"
 #include "block/blockjob_int.h"
 #include "block/block_int.h"
+#include "block/dirty-bitmap.h"
 #include "sysemu/block-backend.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"

diff --git a/block/monitor/bitmap-qmp-cmds.c b/block/monitor/bitmap-qmp-cmds.c
index 282363606f945d6938dbd0543a8800fe405c0369..55f778f5af56b48d100c578dddc3e5035ddf2cdc 100644 (file)
--- a/block/monitor/bitmap-qmp-cmds.c
+++ b/block/monitor/bitmap-qmp-cmds.c
@@ -32,7 +32,9 @@
 
 #include "qemu/osdep.h"
 
+#include "block/block-io.h"
 #include "block/block_int.h"
+#include "block/dirty-bitmap.h"
 #include "qapi/qapi-commands-block.h"
 #include "qapi/error.h"
 

diff --git a/block/nfs.c b/block/nfs.c
index ece22353ac53a5aec7f133a41e31729cbda80b5f..5e288dfc83c4272c7d354ad1ec09499635f1aa92 100644 (file)
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -30,6 +30,7 @@
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "block/qdict.h"
 #include "trace.h"

diff --git a/block/null.c b/block/null.c
index 75f7d0db40c47900483654594c41d6d557790d67..306e605fa127a3ed4d57d3c4e705f73da40bc2c7 100644 (file)
--- a/block/null.c
+++ b/block/null.c
@@ -16,6 +16,7 @@
 #include "qapi/qmp/qstring.h"
 #include "qemu/module.h"
 #include "qemu/option.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "sysemu/replay.h"
 

diff --git a/block/nvme.c b/block/nvme.c
index 656624c585a204ecb8fa01f95684e38c901b257b..1f1367640a561d0bd5347cffcdb4e8dfbd2e778b 100644 (file)
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -23,6 +23,7 @@
 #include "qemu/option.h"
 #include "qemu/memalign.h"
 #include "qemu/vfio-helpers.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "sysemu/replay.h"
 #include "trace.h"

diff --git a/block/parallels-ext.c b/block/parallels-ext.c
index c9dbbf5089e56ca24abc46f27b2a57e315709bbc..8a109f005ae73e848658e3f044968307a0bfd99d 100644 (file)
--- a/block/parallels-ext.c
+++ b/block/parallels-ext.c
@@ -25,7 +25,9 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
+#include "block/dirty-bitmap.h"
 #include "parallels.h"
 #include "crypto/hash.h"
 #include "qemu/uuid.h"

diff --git a/block/preallocate.c b/block/preallocate.c
index d50ee7f49b5780311db995b619cd2b21a21af8b6..a51fc085152f0cd4e0ed3a08430a0f5ce5309f4e 100644 (file)
--- a/block/preallocate.c
+++ b/block/preallocate.c
@@ -30,6 +30,7 @@
 #include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/units.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 
 

diff --git a/block/qapi-sysemu.c b/block/qapi-sysemu.c
index 0c7a1423debd88c0a3eb42c274e896602c0cc189..7bd75541506969b63069e57fb1ad27fbfcce56db 100644 (file)
--- a/block/qapi-sysemu.c
+++ b/block/qapi-sysemu.c
@@ -32,6 +32,7 @@
 
 #include "qemu/osdep.h"
 
+#include "block/block_int.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-block.h"
 #include "qapi/qmp/qdict.h"

diff --git a/block/qapi.c b/block/qapi.c
index fea808425b4eaf685aca1e569be7d5d93fd8c02b..9b4da12966518844f2cfe600fc713dbe7ffc14c7 100644 (file)
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -26,6 +26,7 @@
 #include "qemu/cutils.h"
 #include "block/qapi.h"
 #include "block/block_int.h"
+#include "block/dirty-bitmap.h"
 #include "block/throttle-groups.h"
 #include "block/write-threshold.h"
 #include "qapi/error.h"

diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index bcad567c0c33868ea2dd6a117c1afefc1392110c..385260a1b561495150f32d9b2c4727f25e17ef75 100644 (file)
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -26,6 +26,8 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
+#include "block/dirty-bitmap.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 

diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c
index 54b2d5f4de199866c273f8c882492757a6f4c71b..01c67bdddc1233e3f9b608d4ae519eaf582d09df 100644 (file)
--- a/block/qcow2-cache.c
+++ b/block/qcow2-cache.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
 #include "qemu/memalign.h"
 #include "qcow2.h"
 #include "trace.h"

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 40ed847f97cd33b2ec5c97326a949fb0076053a8..870be106b6cd63bf1b4d689b9256527082fe4bde 100644 (file)
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include <zlib.h>
 
+#include "block/block-io.h"
 #include "qapi/error.h"
 #include "qcow2.h"
 #include "qemu/bswap.h"

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 81264740f047acdd4c0de088f19ee160a598ab64..5ffbefee2e9746344f0f58784978f5efe9602dee 100644 (file)
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
 #include "qapi/error.h"
 #include "qcow2.h"
 #include "qemu/range.h"

diff --git a/block/qcow2-threads.c b/block/qcow2-threads.c
index 1914baf456c71cb5caef3ca85c1ded57d837251b..953bbe6df8845e05f19200c43afb0395da1c6021 100644 (file)
--- a/block/qcow2-threads.c
+++ b/block/qcow2-threads.c
@@ -34,6 +34,7 @@
 #endif
 
 #include "qcow2.h"
+#include "block/block-io.h"
 #include "block/thread-pool.h"
 #include "crypto.h"
 

diff --git a/block/qcow2.c b/block/qcow2.c
index bafbd077b9f1a6d14d0b7d49b047d9664b88af04..2e9c57e269e77e10ae649edd24d96bad4feb58fc 100644 (file)
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -43,6 +43,7 @@
 #include "qapi/qapi-visit-block-core.h"
 #include "crypto.h"
 #include "block/aio_task.h"
+#include "block/dirty-bitmap.h"
 
 /*
   Differences with QCOW:

diff --git a/block/qed-check.c b/block/qed-check.c
index 418033ee24e25ccf1ef29d00433aa1c4e765f9c4..a6612be00f578012c773ca539c1e17af05ffe64a 100644 (file)
--- a/block/qed-check.c
+++ b/block/qed-check.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
 #include "qed.h"
 
 typedef struct {

diff --git a/block/qed-table.c b/block/qed-table.c
index aa203f262797007ecfcb9808fc8de84cc448416a..e41c87a157d079302d9ccc0f70fccf11c8708b5d 100644 (file)
--- a/block/qed-table.c
+++ b/block/qed-table.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
 #include "trace.h"
 #include "qemu/sockets.h" /* for EINPROGRESS on Windows */
 #include "qed.h"

diff --git a/block/raw-format.c b/block/raw-format.c
index 28905b09ee8abb3aa0de497f56c865a1c3a4477e..b6a0ce58f490c466d0c7e75ab9f42642a7be8f95 100644 (file)
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -27,6 +27,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/block/rbd.c b/block/rbd.c
index 3aa6aae0e0af12a8d292325a7e33adbb7cbfccff..6167c5e424ce72eab559431a9c0aa83df118b3a4 100644 (file)
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -18,6 +18,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/option.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "block/qdict.h"
 #include "crypto/secret.h"

diff --git a/block/ssh.c b/block/ssh.c
index 8508710f2f549ac4318d4ca96b1caecd29e704b5..8bd2a134c141deb3bc640a16ddc7fcebff115177 100644 (file)
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -27,6 +27,7 @@
 #include <libssh/libssh.h>
 #include <libssh/sftp.h>
 
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "block/qdict.h"
 #include "qapi/error.h"

diff --git a/block/throttle.c b/block/throttle.c
index 88851c84f4d355429658f80186e554c3184a2daf..00cb46d0e586e4fe2b4545fe5a56c25e3fc917d8 100644 (file)
--- a/block/throttle.c
+++ b/block/throttle.c
@@ -18,6 +18,8 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
+#include "block/block_int.h"
 #include "block/throttle-groups.h"
 #include "qemu/module.h"
 #include "qemu/option.h"

diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index 572582b87bfbfb8bf996fb633a47337bd98effd1..c48cf65d62ee601abc640a00bbe310d8149e6638 100644 (file)
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "qemu/error-report.h"
 #include "qemu/bswap.h"

diff --git a/block/vvfat.c b/block/vvfat.c
index 723c91216e0c988532663be1d520a7aca76af895..d7d775bd2ce04e91e80d223b1965f7ac5f251525 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -27,6 +27,7 @@
 #include <dirent.h>
 #include <glib/gstdio.h>
 #include "qapi/error.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "block/qdict.h"
 #include "qemu/module.h"

diff --git a/block/win32-aio.c b/block/win32-aio.c
index aadc7b1bc3c053783874be3316f5ce94e06f77dc..ee87d6048f3a9cbb1a728f00dcf699b6df3dbd2b 100644 (file)
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/timer.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "block/aio.h"
 #include "block/raw-aio.h"

diff --git a/block/write-threshold.c b/block/write-threshold.c
index 35cafbc22d9bf223fd02710658ef9d200d9055bb..76d8885677e266af57574020c403ee4901e9134c 100644 (file)
--- a/block/write-threshold.c
+++ b/block/write-threshold.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block-io.h"
 #include "block/block_int.h"
 #include "block/write-threshold.h"
 #include "qapi/error.h"

diff --git a/blockdev.c b/blockdev.c
index ebf952cd218e44caa6c63960e1b77544afd7d0f6..fe9d8d89c07341bf11b4e4af3122866d5d0fd80c 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -35,6 +35,7 @@
 #include "sysemu/blockdev.h"
 #include "hw/block/block.h"
 #include "block/blockjob.h"
+#include "block/dirty-bitmap.h"
 #include "block/qdict.h"
 #include "block/throttle-groups.h"
 #include "monitor/monitor.h"

diff --git a/blockjob.c b/blockjob.c
index 54b4091a3643b48498c53fc70fac48311682ab64..659c3cb9de651ff8eb579cf5d93086886e55ff2b 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/aio-wait.h"
 #include "block/block.h"
 #include "block/blockjob_int.h"
 #include "block/block_int.h"

diff --git a/hw/block/block.c b/hw/block/block.c
index f9c4fe67673b36bec4464db76b9fc4b04937009a..ddcef71f80751b88a361b574b1480fcba3020e38 100644 (file)
--- a/hw/block/block.c
+++ b/hw/block/block.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block_int-common.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"

diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index ccad2c43a31355258f9acff1a503d5d781a40ba6..ab3c4ec346305d770803eb04af5f3ae0be6f701b 100644 (file)
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/block_int-common.h"
 #include "qemu/units.h"
 #include "cpu.h"
 #include "hw/boards.h"

diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
index a1abfe0e1b1c0b62e11445850e94f3f887afb557..dff402f08f8642be1d1f2d0e7fc5d2ba7611ac03 100644 (file)
--- a/hw/virtio/virtio-pmem.c
+++ b/hw/virtio/virtio-pmem.c
@@ -14,6 +14,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/iov.h"
 #include "qemu/main-loop.h"
 #include "hw/virtio/virtio-pmem.h"
 #include "hw/qdev-properties.h"

diff --git a/include/block/block-common.h b/include/block/block-common.h
index 434ffc5d347be0c0013c13737672fe97baf05be7..41686810de9eac20d34317cd8c5160032b7e50eb 100644 (file)
--- a/include/block/block-common.h
+++ b/include/block/block-common.h
@@ -24,12 +24,8 @@
 #ifndef BLOCK_COMMON_H
 #define BLOCK_COMMON_H
 
-#include "block/aio.h"
-#include "block/aio-wait.h"
-#include "qemu/iov.h"
-#include "block/accounting.h"
-#include "qemu/hbitmap.h"
-#include "qemu/transactions.h"
+#include "qapi/qapi-types-block-core.h"
+#include "qemu/queue.h"
 
 /*
  * co_wrapper{*}: Function specifiers used by block-coroutine-wrapper.py
@@ -55,7 +51,6 @@
 #define co_wrapper_bdrv_rdlock
 #define co_wrapper_mixed_bdrv_rdlock
 
-#include "block/dirty-bitmap.h"
 #include "block/blockjob.h"
 
 /* block.c */

diff --git a/include/block/block-copy.h b/include/block/block-copy.h
index 8cea4f9b90860c1b540965cd3bb110a6ccf8ccec..d0f83865542d6b62bcb1f3ce1595c6be40732c2b 100644 (file)
--- a/include/block/block-copy.h
+++ b/include/block/block-copy.h
@@ -15,8 +15,8 @@
 #ifndef BLOCK_COPY_H
 #define BLOCK_COPY_H
 
-#include "block/block.h"
-#include "qemu/co-shared-resource.h"
+#include "block/block-common.h"
+#include "qemu/progress_meter.h"
 
 /* All APIs are thread-safe */
 

diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
index b0a3cfe6b87667ebdc93437851a1c18bbbd6f646..a38f86dc154750a738332c5c9bf749072013f5dd 100644 (file)
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -24,7 +24,9 @@
 #ifndef BLOCK_GLOBAL_STATE_H
 #define BLOCK_GLOBAL_STATE_H
 
-#include "block-common.h"
+#include "block/block-common.h"
+#include "qemu/coroutine.h"
+#include "qemu/transactions.h"
 
 /*
  * Global state (GS) API. These functions run under the BQL.

diff --git a/include/block/block-hmp-cmds.h b/include/block/block-hmp-cmds.h
index ba0593c440e262488b1cd7046b7ff6d5d9b6e9e4..71113cd7efa44faf7b49019c26c052fe2055d8a4 100644 (file)
--- a/include/block/block-hmp-cmds.h
+++ b/include/block/block-hmp-cmds.h
@@ -15,6 +15,8 @@
 #ifndef BLOCK_BLOCK_HMP_CMDS_H
 #define BLOCK_BLOCK_HMP_CMDS_H
 
+#include "qemu/coroutine.h"
+
 void hmp_drive_add(Monitor *mon, const QDict *qdict);
 
 void hmp_commit(Monitor *mon, const QDict *qdict);

diff --git a/include/block/block-io.h b/include/block/block-io.h
index 2ed6214909d8b1dbf33a7382a630fa11dc546067..339835159691fa373f19fb9f0c504968988edf65 100644 (file)
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -24,7 +24,10 @@
 #ifndef BLOCK_IO_H
 #define BLOCK_IO_H
 
-#include "block-common.h"
+#include "block/aio-wait.h"
+#include "block/block-common.h"
+#include "qemu/coroutine.h"
+#include "qemu/iov.h"
 
 /*
  * I/O API functions. These functions are thread-safe, and therefore

diff --git a/include/block/block.h b/include/block/block.h
index 1e6b8fef1e91483e6d632cc525f694a86a348397..e2c647de279b3dfa612e3ca4561f8c3a751d2453 100644 (file)
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -24,8 +24,8 @@
 #ifndef BLOCK_H
 #define BLOCK_H
 
-#include "block-global-state.h"
-#include "block-io.h"
+#include "block/block-global-state.h"
+#include "block/block-io.h"
 
 /* DO NOT ADD ANYTHING IN HERE. USE ONE OF THE HEADERS INCLUDED ABOVE */
 

diff --git a/include/block/block_backup.h b/include/block/block_backup.h
index 157596c2963fea03a57bf7dc2ab69fb2d8191210..4d4d5ba1538c9dcd3db07b81716a38695610f96a 100644 (file)
--- a/include/block/block_backup.h
+++ b/include/block/block_backup.h
@@ -18,7 +18,7 @@
 #ifndef BLOCK_BACKUP_H
 #define BLOCK_BACKUP_H
 
-#include "block/block_int.h"
+#include "block/blockjob.h"
 
 void backup_do_checkpoint(BlockJob *job, Error **errp);
 

diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index c34c525fa6ba152d78bcbdce491de2142e5769e0..887ace7dbd9fb3c20bd5edcaf5665f94a5109061 100644 (file)
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -24,17 +24,13 @@
 #ifndef BLOCK_INT_COMMON_H
 #define BLOCK_INT_COMMON_H
 
-#include "block/accounting.h"
-#include "block/block.h"
-#include "block/aio-wait.h"
-#include "qemu/queue.h"
-#include "qemu/coroutine.h"
-#include "qemu/stats64.h"
-#include "qemu/timer.h"
-#include "qemu/hbitmap.h"
+#include "block/aio.h"
+#include "block/block-common.h"
+#include "block/block-global-state.h"
 #include "block/snapshot.h"
-#include "qemu/throttle.h"
+#include "qemu/iov.h"
 #include "qemu/rcu.h"
+#include "qemu/stats64.h"
 
 #define BLOCK_FLAG_LAZY_REFCOUNTS   8
 

diff --git a/include/block/block_int-global-state.h b/include/block/block_int-global-state.h
index 2f0993f6e9ca93c9d3205ca167bf368820836f12..902406eb999b85c4dd7fbe17e882a7163b4f6312 100644 (file)
--- a/include/block/block_int-global-state.h
+++ b/include/block/block_int-global-state.h
@@ -25,7 +25,10 @@
 #ifndef BLOCK_INT_GLOBAL_STATE_H
 #define BLOCK_INT_GLOBAL_STATE_H
 
-#include "block_int-common.h"
+#include "block/blockjob.h"
+#include "block/block_int-common.h"
+#include "qemu/hbitmap.h"
+#include "qemu/main-loop.h"
 
 /*
  * Global state (GS) API. These functions run under the BQL.

diff --git a/include/block/block_int-io.h b/include/block/block_int-io.h
index 8bc061ebb895e7be9983c950806d07dff8d874d4..44367219f43a3bdd8dccd3c5aa03982c097d182b 100644 (file)
--- a/include/block/block_int-io.h
+++ b/include/block/block_int-io.h
@@ -24,7 +24,9 @@
 #ifndef BLOCK_INT_IO_H
 #define BLOCK_INT_IO_H
 
-#include "block_int-common.h"
+#include "block/block_int-common.h"
+#include "qemu/hbitmap.h"
+#include "qemu/main-loop.h"
 
 /*
  * I/O API functions. These functions are thread-safe.

diff --git a/include/block/block_int.h b/include/block/block_int.h
index b35b0138ed29d95caee1897489321dba97eecdf7..567a178e13d10cffae10caae932b8f5012230a18 100644 (file)
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -24,8 +24,8 @@
 #ifndef BLOCK_INT_H
 #define BLOCK_INT_H
 
-#include "block_int-global-state.h"
-#include "block_int-io.h"
+#include "block/block_int-global-state.h"
+#include "block/block_int-io.h"
 #include "block/graph-lock.h"
 
 /* DO NOT ADD ANYTHING IN HERE. USE ONE OF THE HEADERS INCLUDED ABOVE */

diff --git a/include/block/blockjob.h b/include/block/blockjob.h
index 03032b2eca76702128b41194093981ef3ef46eb4..058b0c824cd3b731ed638fe1bf4a26cecd8e7639 100644 (file)
--- a/include/block/blockjob.h
+++ b/include/block/blockjob.h
@@ -26,8 +26,8 @@
 #ifndef BLOCKJOB_H
 #define BLOCKJOB_H
 
+#include "qapi/qapi-types-block-core.h"
 #include "qemu/job.h"
-#include "block/block.h"
 #include "qemu/ratelimit.h"
 
 #define BLOCK_JOB_SLICE_TIME 100000000ULL /* ns */

diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
index 6bd9ae2b20875f022119d52908430b507cd21bb6..f00844628561dccc1e199443d2527fd1f8a05deb 100644 (file)
--- a/include/block/blockjob_int.h
+++ b/include/block/blockjob_int.h
@@ -27,7 +27,6 @@
 #define BLOCKJOB_INT_H
 
 #include "block/blockjob.h"
-#include "block/block.h"
 
 /**
  * BlockJobDriver:

diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index c3700cec762c5e6dd17f22b46a94bab1b411bd1e..233535ef2d3c139f6a4239a8223300fd7dafe51b 100644 (file)
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -1,6 +1,7 @@
 #ifndef BLOCK_DIRTY_BITMAP_H
 #define BLOCK_DIRTY_BITMAP_H
 
+#include "block/block-common.h"
 #include "qapi/qapi-types-block-core.h"
 #include "qemu/hbitmap.h"
 

diff --git a/include/block/qapi.h b/include/block/qapi.h
index 22c7807c89a90749eb187859ef6e7e1ed214cf87..865fb974d47580d314d901e31144449660d4ff9f 100644 (file)
--- a/include/block/qapi.h
+++ b/include/block/qapi.h
@@ -25,8 +25,8 @@
 #ifndef BLOCK_QAPI_H
 #define BLOCK_QAPI_H
 
-#include "block/block.h"
 #include "block/snapshot.h"
+#include "qapi/qapi-types-block-core.h"
 
 BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
                                         BlockDriverState *bs,

diff --git a/include/block/thread-pool.h b/include/block/thread-pool.h
index 2020bcc92df07451b5b156cb8a3de86d17327ccc..95ff2b0bdbabdab28559e4cb329855eee17d156d 100644 (file)
--- a/include/block/thread-pool.h
+++ b/include/block/thread-pool.h
@@ -18,7 +18,7 @@
 #ifndef QEMU_THREAD_POOL_H
 #define QEMU_THREAD_POOL_H
 
-#include "block/block.h"
+#include "block/aio.h"
 
 #define THREAD_POOL_MAX_THREADS_DEFAULT         64
 

diff --git a/include/block/throttle-groups.h b/include/block/throttle-groups.h
index 9541b3243280ef349c3156636130f1f27f847322..ff282fc0f8ab1b3cac5527fe11fdfe216fb7a1f6 100644 (file)
--- a/include/block/throttle-groups.h
+++ b/include/block/throttle-groups.h
@@ -25,8 +25,8 @@
 #ifndef THROTTLE_GROUPS_H
 #define THROTTLE_GROUPS_H
 
+#include "qemu/coroutine.h"
 #include "qemu/throttle.h"
-#include "block/block_int.h"
 #include "qom/object.h"
 
 /* The ThrottleGroupMember structure indicates membership in a ThrottleGroup

diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backend-io.h
index 7ec6d978d4083de3c0a6800efa96d2a929c7a2a2..031a27ba101c545e9b74165131fbb07b2b1bc607 100644 (file)
--- a/include/sysemu/block-backend-io.h
+++ b/include/sysemu/block-backend-io.h
@@ -14,6 +14,7 @@
 #define BLOCK_BACKEND_IO_H
 
 #include "block-backend-common.h"
+#include "block/accounting.h"
 
 /*
  * I/O API functions. These functions are thread-safe.

diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 283017d7d3d8f72c80a5ef8ad052c25664585887..15127d489a73044543671d6600433cc7aec516af 100644 (file)
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -61,6 +61,7 @@
 #include "qemu/osdep.h"
 #include "block/block.h"
 #include "block/block_int.h"
+#include "block/dirty-bitmap.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/runstate.h"
 #include "qemu/main-loop.h"

diff --git a/migration/block.c b/migration/block.c
index 4347da1526a4e333fa2ba352674a530c6996d213..5da15a62de2bfbe8979ddfb747676eff64ce76b1 100644 (file)
--- a/migration/block.c
+++ b/migration/block.c
@@ -20,6 +20,7 @@
 #include "qemu/cutils.h"
 #include "qemu/queue.h"
 #include "block.h"
+#include "block/dirty-bitmap.h"
 #include "migration/misc.h"
 #include "migration.h"
 #include "migration/register.h"

diff --git a/migration/savevm.c b/migration/savevm.c
index a0cdb714f74cf9036e9baf390fe273068472c529..a783789430a83c5f77d78667cfb026693c78c145 100644 (file)
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -52,6 +52,7 @@
 #include "exec/target_page.h"
 #include "trace.h"
 #include "qemu/iov.h"
+#include "qemu/job.h"
 #include "qemu/main-loop.h"
 #include "block/snapshot.h"
 #include "qemu/cutils.h"

diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 2932b3f3a5b237582f4426453d5856df1aa7094f..e0e1fdf5073c8322488ac9acffa211aecb831a64 100644 (file)
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/blockjob.h"
 #include "qemu/cutils.h"
 #include "qemu/option.h"
 #include "monitor/monitor.h"

diff --git a/nbd/server.c b/nbd/server.c
index 67ed3335784746b413c9e206c0e5061c819f9aa9..a4750e41880ab8a244df60277c1713d2d45478d7 100644 (file)
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -19,7 +19,9 @@
 
 #include "qemu/osdep.h"
 
+#include "block/block_int.h"
 #include "block/export.h"
+#include "block/dirty-bitmap.h"
 #include "qapi/error.h"
 #include "qemu/queue.h"
 #include "trace.h"

diff --git a/qemu-img.c b/qemu-img.c
index 439d8de1e3b77145b5305214b2a34f183d78055a..7e73c5c1da289ec415572c63458cfbfdce52937a 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -48,6 +48,7 @@
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
+#include "block/dirty-bitmap.h"
 #include "block/qapi.h"
 #include "crypto/init.h"
 #include "trace/control.h"

diff --git a/scripts/block-coroutine-wrapper.py b/scripts/block-coroutine-wrapper.py
index 6e087fa0b7f0748617746f4245a82a8ab18d1ba0..dff3af49f5805eb4d9406dcc53ca5e101a6cef55 100644 (file)
--- a/scripts/block-coroutine-wrapper.py
+++ b/scripts/block-coroutine-wrapper.py
@@ -42,7 +42,8 @@ def gen_header():
 #include "qemu/osdep.h"
 #include "block/coroutines.h"
 #include "block/block-gen.h"
-#include "block/block_int.h"\
+#include "block/block_int.h"
+#include "block/dirty-bitmap.h"
 """
 
 

diff --git a/softmmu/cpus.c b/softmmu/cpus.c
index 5a584a8d57d7d553414da957fb035b1f06ebc5a8..9cbc8172b5f20d6c55acdc852020143ad8d80781 100644 (file)
--- a/softmmu/cpus.c
+++ b/softmmu/cpus.c
@@ -34,6 +34,7 @@
 #include "sysemu/hw_accel.h"
 #include "exec/cpu-common.h"
 #include "qemu/thread.h"
+#include "qemu/main-loop.h"
 #include "qemu/plugin.h"
 #include "sysemu/cpus.h"
 #include "qemu/guest-random.h"

diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index edec095c7a5f414c8c9df24112c02a2ea33b75a0..cd5b6a1634a7c66de63368b96533231045b93e16 100644 (file)
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -23,6 +23,7 @@
 
 #include "qemu/cutils.h"
 #include "qemu/cacheflush.h"
+#include "qemu/hbitmap.h"
 #include "qemu/madvise.h"
 
 #ifdef CONFIG_TCG

diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
index 7718f6dcda30f3cae6b053d6ec77b38cdb093ca7..da19498c66c5c5f64e5b8ea86866974f2fe1801f 100644 (file)
--- a/storage-daemon/qemu-storage-daemon.c
+++ b/storage-daemon/qemu-storage-daemon.c
@@ -48,6 +48,7 @@
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qemu/help_option.h"
+#include "qemu/job.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"

diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 0ab4e0734a023d6fbbd985df1b2927af9bb910b1..5870301991928c6025ca81ac4af9d86efe019a5d 100644 (file)
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -37,6 +37,7 @@
 #include "exec/gdbstub.h"
 #include "qemu/host-utils.h"
 #include "qemu/main-loop.h"
+#include "qemu/ratelimit.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qemu/memalign.h"

diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c
index 8cedea4959d517d9484e2857781959fc319421dc..4fed8b751f3896d4286d53d6266c633c2ee91680 100644 (file)
--- a/tests/unit/test-bdrv-drain.c
+++ b/tests/unit/test-bdrv-drain.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "block/block.h"
+#include "block/block_int.h"
 #include "block/blockjob_int.h"
 #include "sysemu/block-backend.h"
 #include "qapi/error.h"

diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c
index 8ca5adec5e829559f87ecba56f80f85990efdf1b..ff5147f61951c08d300b775bc5eae0bdea623998 100644 (file)
--- a/tests/unit/test-block-iothread.c
+++ b/tests/unit/test-block-iothread.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "block/block.h"
+#include "block/block_int-global-state.h"
 #include "block/blockjob_int.h"
 #include "sysemu/block-backend.h"
 #include "qapi/error.h"