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 /hw | |
| parent | 436956013539c19cf781ae333bc1c125d728cf1f (diff) | |
| download | qemu-e2c1c34f139f49ef909bb4322607fb8b39002312.zip qemu-e2c1c34f139f49ef909bb4322607fb8b39002312.tar.gz qemu-e2c1c34f139f49ef909bb4322607fb8b39002312.tar.bz2 | |
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 'hw')
| -rw-r--r-- | hw/block/block.c | 1 | ||||
| -rw-r--r-- | hw/sparc64/niagara.c | 1 | ||||
| -rw-r--r-- | hw/virtio/virtio-pmem.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/hw/block/block.c b/hw/block/block.c index f9c4fe6..ddcef71f 100644 --- 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 ccad2c4..ab3c4ec 100644 --- 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 a1abfe0..dff402f 100644 --- 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" |