diff options
| author | Markus Armbruster <armbru@redhat.com> | 2022-12-21 14:35:49 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2023-01-20 07:24:28 +0100 |
| commit | e2c1c34f139f49ef909bb4322607fb8b39002312 (patch) | |
| tree | 7bd8fcb9db4dd89d8edcd3d59e8c5f42f2e5f445 /include/block/block-global-state.h | |
| parent | 436956013539c19cf781ae333bc1c125d728cf1f (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 'include/block/block-global-state.h')
| -rw-r--r-- | include/block/block-global-state.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h index b0a3cfe6b8..a38f86dc15 100644 --- 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. |