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 /softmmu | |
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 'softmmu')
-rw-r--r-- | softmmu/cpus.c | 1 | ||||
-rw-r--r-- | softmmu/physmem.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 5a584a8..9cbc817 100644 --- 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 edec095..cd5b6a1 100644 --- 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 |