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 /fsdev | |
| 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 'fsdev')
| -rw-r--r-- | fsdev/qemu-fsdev-throttle.c | 1 | ||||
| -rw-r--r-- | fsdev/qemu-fsdev.c | 2 | ||||
| -rw-r--r-- | fsdev/qemu-fsdev.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c index 1dc07fbc12..cfd86418ac 100644 --- a/fsdev/qemu-fsdev-throttle.c +++ b/fsdev/qemu-fsdev-throttle.c @@ -16,6 +16,7 @@ #include "qemu/error-report.h" #include "qemu-fsdev-throttle.h" #include "qemu/iov.h" +#include "qemu/option.h" static void fsdev_throttle_read_timer_cb(void *opaque) { diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c index de819cf7a1..8a4afbffbd 100644 --- a/fsdev/qemu-fsdev.c +++ b/fsdev/qemu-fsdev.c @@ -14,9 +14,9 @@ #include "qapi/error.h" #include "qemu-fsdev.h" #include "qemu/queue.h" -#include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" static QTAILQ_HEAD(FsDriverEntry_head, FsDriverListEntry) fsdriver_entries = QTAILQ_HEAD_INITIALIZER(fsdriver_entries); diff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h index 29c962296d..65e4b1cfab 100644 --- a/fsdev/qemu-fsdev.h +++ b/fsdev/qemu-fsdev.h @@ -12,7 +12,6 @@ */ #ifndef QEMU_FSDEV_H #define QEMU_FSDEV_H -#include "qemu/option.h" #include "file-op-9p.h" |