diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-02-01 12:18:39 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-02-09 13:52:15 +0100 |
| commit | 452fcdbc49c59884c8c284268d64baa24fea11e1 (patch) | |
| tree | 8c057e6a77d4a83befd74d8a6a6e596f4db7d2d0 /block | |
| parent | 47e6b297e76007c04a1e9c492006fe093d932cd9 (diff) | |
| download | qemu-452fcdbc49c59884c8c284268d64baa24fea11e1.tar.gz | |
Include qapi/qmp/qdict.h exactly where needed
This cleanup makes the number of objects depending on qapi/qmp/qdict.h
drop from 4550 (out of 4743) to 368 in my "build everything" tree.
For qapi/qmp/qobject.h, the number drops from 4552 to 390.
While there, separate #include from file comment with a blank line.
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-13-armbru@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/crypto.c | 1 | ||||
| -rw-r--r-- | block/curl.c | 2 | ||||
| -rw-r--r-- | block/file-posix.c | 1 | ||||
| -rw-r--r-- | block/file-win32.c | 1 | ||||
| -rw-r--r-- | block/gluster.c | 1 | ||||
| -rw-r--r-- | block/iscsi.c | 1 | ||||
| -rw-r--r-- | block/qapi.c | 1 | ||||
| -rw-r--r-- | block/qcow.c | 2 | ||||
| -rw-r--r-- | block/rbd.c | 1 | ||||
| -rw-r--r-- | block/snapshot.c | 1 | ||||
| -rw-r--r-- | block/ssh.c | 1 | ||||
| -rw-r--r-- | block/vvfat.c | 2 |
12 files changed, 15 insertions, 0 deletions
diff --git a/block/crypto.c b/block/crypto.c index 60ddf8623e..2626f8ae3a 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -24,6 +24,7 @@ #include "sysemu/block-backend.h" #include "crypto/block.h" #include "qapi/opts-visitor.h" +#include "qapi/qmp/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qapi-visit.h" #include "qapi/error.h" diff --git a/block/curl.c b/block/curl.c index cd578d3d14..eafa97cd72 100644 --- a/block/curl.c +++ b/block/curl.c @@ -21,12 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "block/block_int.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "crypto/secret.h" #include <curl/curl.h> diff --git a/block/file-posix.c b/block/file-posix.c index 36ee89e940..9422ad529c 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -31,6 +31,7 @@ #include "block/thread-pool.h" #include "qemu/iov.h" #include "block/raw-aio.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "scsi/pr-manager.h" diff --git a/block/file-win32.c b/block/file-win32.c index 9e02214a69..2f1da48e71 100644 --- a/block/file-win32.c +++ b/block/file-win32.c @@ -30,6 +30,7 @@ #include "trace.h" #include "block/thread-pool.h" #include "qemu/iov.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include <windows.h> #include <winioctl.h> diff --git a/block/gluster.c b/block/gluster.c index 0f4265a3a4..097b6930a5 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -11,6 +11,7 @@ #include <glusterfs/api/glfs.h> #include "block/block_int.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qemu/uri.h" #include "qemu/error-report.h" diff --git a/block/iscsi.c b/block/iscsi.c index 9a1bf43cbc..8edd480f92 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -39,6 +39,7 @@ #include "qemu/uuid.h" #include "qmp-commands.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "crypto/secret.h" #include "scsi/utils.h" diff --git a/block/qapi.c b/block/qapi.c index 12a8cb5a82..1fdeb1ef2f 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -32,6 +32,7 @@ #include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" diff --git a/block/qcow.c b/block/qcow.c index 369241aae8..0b32c04cd0 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" @@ -30,6 +31,7 @@ #include "qemu/module.h" #include "qemu/bswap.h" #include <zlib.h> +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "crypto/block.h" #include "migration/blocker.h" diff --git a/block/rbd.c b/block/rbd.c index 76b9e83cea..42be5ed49d 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -20,6 +20,7 @@ #include "crypto/secret.h" #include "qemu/cutils.h" #include "qapi/qmp/qstring.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" diff --git a/block/snapshot.c b/block/snapshot.c index 8cb70dbad5..9294a9fcc4 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -26,6 +26,7 @@ #include "block/snapshot.h" #include "block/block_int.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qstring.h" diff --git a/block/ssh.c b/block/ssh.c index 8890a0c4ba..91f5f4c3c9 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -34,6 +34,7 @@ #include "qemu/sockets.h" #include "qemu/uri.h" #include "qapi-visit.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" diff --git a/block/vvfat.c b/block/vvfat.c index a690595f2c..93e76580b0 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -22,6 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include <dirent.h> #include "qapi/error.h" @@ -30,6 +31,7 @@ #include "qemu/bswap.h" #include "migration/blocker.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/error-report.h" |