diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-02-01 12:18:46 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-02-09 13:52:16 +0100 |
| commit | 922a01a013d2270682a188258cbccacfecf8129c (patch) | |
| tree | ff4647b023fc4eac730341ec581c46ca4ac58c87 /include/sysemu | |
| parent | bbcad965bf7b3afac13d7bbc90d3eeca1a5b66bf (diff) | |
Move include qemu/option.h from qemu-common.h to actual users
qemu-common.h includes qemu/option.h, but most places that include the
former don't actually need the latter. Drop the include, and add it
to the places that actually need it.
While there, drop superfluous includes of both headers, and
separate #include from file comment with a blank line.
This cleanup makes the number of objects depending on qemu/option.h
drop from 4545 (out of 4743) to 284 in my "build everything" tree.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180201111846.21846-20-armbru@redhat.com>
[Semantic conflict with commit bdd6a90a9e in block/nvme.c resolved]
Diffstat (limited to 'include/sysemu')
| -rw-r--r-- | include/sysemu/arch_init.h | 1 | ||||
| -rw-r--r-- | include/sysemu/hostmem.h | 1 | ||||
| -rw-r--r-- | include/sysemu/numa.h | 1 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 28f713eae2..d40d882e38 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -2,7 +2,6 @@ #define QEMU_ARCH_INIT_H #include "qapi-types.h" -#include "qemu/option.h" enum { QEMU_ARCH_ALL = -1, diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index ed6a437f4d..621a3f9d42 100644 --- a/include/sysemu/hostmem.h +++ b/include/sysemu/hostmem.h @@ -16,7 +16,6 @@ #include "sysemu/sysemu.h" /* for MAX_NODES */ #include "qom/object.h" #include "exec/memory.h" -#include "qemu/option.h" #include "qemu/bitmap.h" #define TYPE_MEMORY_BACKEND "memory-backend" diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index b3545215f6..d99e5474b4 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -2,7 +2,6 @@ #define SYSEMU_NUMA_H #include "qemu/bitmap.h" -#include "qemu/option.h" #include "sysemu/sysemu.h" #include "sysemu/hostmem.h" #include "hw/boards.h" diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 36fd371c93..77bb3da582 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -2,7 +2,6 @@ #define SYSEMU_H /* Misc. things related to the system emulator. */ -#include "qemu/option.h" #include "qemu/queue.h" #include "qemu/timer.h" #include "qemu/notify.h" |