summary refs log tree commit diff stats
path: root/blockjob.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2022-12-21 14:35:49 +0100
committerMarkus Armbruster <armbru@redhat.com>2023-01-20 07:24:28 +0100
commite2c1c34f139f49ef909bb4322607fb8b39002312 (patch)
tree7bd8fcb9db4dd89d8edcd3d59e8c5f42f2e5f445 /blockjob.c
parent436956013539c19cf781ae333bc1c125d728cf1f (diff)
downloadfocaccia-qemu-e2c1c34f139f49ef909bb4322607fb8b39002312.tar.gz
focaccia-qemu-e2c1c34f139f49ef909bb4322607fb8b39002312.zip
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>
Diffstat (limited to 'blockjob.c')
-rw-r--r--blockjob.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/blockjob.c b/blockjob.c
index 54b4091a36..659c3cb9de 100644
--- 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"