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 /net | |
parent | 522ece32d214bd4b086821c4350c2aebe5587878 (diff) |
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 'net')
-rw-r--r-- | net/filter-replay.c | 1 | ||||
-rw-r--r-- | net/filter-rewriter.c | 1 | ||||
-rw-r--r-- | net/net.c | 2 | ||||
-rw-r--r-- | net/vhost-user.c | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/net/filter-replay.c b/net/filter-replay.c index cff65f86e5..09e68fd8f5 100644 --- a/net/filter-replay.c +++ b/net/filter-replay.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "clients.h" -#include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/iov.h" diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 2be388f539..3ea3798276 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -15,7 +15,6 @@ #include "net/filter.h" #include "net/net.h" #include "qemu-common.h" -#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qapi-visit.h" @@ -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 "net/net.h" @@ -43,6 +44,7 @@ #include "qemu/iov.h" #include "qemu/main-loop.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" diff --git a/net/vhost-user.c b/net/vhost-user.c index c23927c912..fd766504ab 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -13,6 +13,7 @@ #include "net/vhost_net.h" #include "net/vhost-user.h" #include "chardev/char-fe.h" +#include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qmp-commands.h" |