diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-02-01 12:18:31 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-02-09 13:50:17 +0100 |
| commit | e688df6bc4549f28534cdb001f168b8caae55b0c (patch) | |
| tree | d77cfea92ccc7318f7ac82b75a72821d06b5dc75 /block | |
| parent | 522ece32d214bd4b086821c4350c2aebe5587878 (diff) | |
| download | qemu-e688df6bc4549f28534cdb001f168b8caae55b0c.zip qemu-e688df6bc4549f28534cdb001f168b8caae55b0c.tar.gz qemu-e688df6bc4549f28534cdb001f168b8caae55b0c.tar.bz2 | |
Include qapi/error.h exactly where needed
This cleanup makes the number of objects depending on qapi/error.h
drop from 1910 (out of 4743) to 1612 in my "build everything" tree.
While there, separate #include from file comment with a blank line,
and drop a useless comment on why qemu/osdep.h is included first.
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-5-armbru@redhat.com>
[Semantic conflict with commit 34e304e975 resolved, OSX breakage fixed]
Diffstat (limited to 'block')
| -rw-r--r-- | block/block-backend.c | 1 | ||||
| -rw-r--r-- | block/iscsi.c | 1 | ||||
| -rw-r--r-- | block/qapi.c | 1 | ||||
| -rw-r--r-- | block/qcow2-cluster.c | 1 | ||||
| -rw-r--r-- | block/qcow2.c | 2 | ||||
| -rw-r--r-- | block/quorum.c | 1 | ||||
| -rw-r--r-- | block/write-threshold.c | 2 |
7 files changed, 7 insertions, 2 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index f66349c..532893c 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -18,6 +18,7 @@ #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qemu/id.h" #include "trace.h" #include "migration/misc.h" diff --git a/block/iscsi.c b/block/iscsi.c index 6a1c537..9a1bf43 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -38,6 +38,7 @@ #include "qemu/iov.h" #include "qemu/uuid.h" #include "qmp-commands.h" +#include "qapi/error.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 fc10f0a..4fc9fd8 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -29,6 +29,7 @@ #include "block/write-threshold.h" #include "qmp-commands.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/types.h" #include "sysemu/block-backend.h" diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index a3fec27..3a979bc 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include <zlib.h> -#include "qapi/error.h" #include "qemu-common.h" #include "block/block_int.h" #include "block/qcow2.h" diff --git a/block/qcow2.c b/block/qcow2.c index 1f80961..7645b3c 100644 --- a/block/qcow2.c +++ b/block/qcow2.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 "block/block_int.h" #include "sysemu/block-backend.h" @@ -28,6 +29,7 @@ #include <zlib.h> #include "block/qcow2.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/types.h" diff --git a/block/quorum.c b/block/quorum.c index 272f9a5..ec427c3 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "block/block_int.h" +#include "qapi/error.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" diff --git a/block/write-threshold.c b/block/write-threshold.c index 0bd1a01..db3de0f 100644 --- a/block/write-threshold.c +++ b/block/write-threshold.c @@ -16,9 +16,9 @@ #include "block/write-threshold.h" #include "qemu/notify.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qmp-commands.h" - uint64_t bdrv_write_threshold_get(const BlockDriverState *bs) { return bs->write_threshold_offset; |