aboutsummaryrefslogtreecommitdiff
path: root/nbd
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 /nbd
parent436956013539c19cf781ae333bc1c125d728cf1f (diff)
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 'nbd')
-rw-r--r--nbd/server.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/nbd/server.c b/nbd/server.c
index 67ed333578..a4750e4188 100644
--- 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"