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 /ui | |
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 'ui')
-rw-r--r-- | ui/cocoa.m | 1 | ||||
-rw-r--r-- | ui/console.c | 2 | ||||
-rw-r--r-- | ui/gtk.c | 1 | ||||
-rw-r--r-- | ui/input.c | 1 | ||||
-rw-r--r-- | ui/spice-core.c | 1 | ||||
-rw-r--r-- | ui/vnc.c | 1 |
6 files changed, 7 insertions, 0 deletions
diff --git a/ui/cocoa.m b/ui/cocoa.m index 6be9848391..51db47cd71 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -31,6 +31,7 @@ #include "ui/console.h" #include "ui/input.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qmp-commands.h" #include "sysemu/blockdev.h" #include "qemu-version.h" diff --git a/ui/console.c b/ui/console.c index c4c95abed7..f678979f86 100644 --- a/ui/console.c +++ b/ui/console.c @@ -21,10 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" #include "hw/qdev-core.h" +#include "qapi/error.h" #include "qemu/timer.h" #include "qmp-commands.h" #include "chardev/char-fe.h" @@ -36,6 +36,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "ui/console.h" diff --git a/ui/input.c b/ui/input.c index ab22c8423f..a5f1cbb3ca 100644 --- a/ui/input.c +++ b/ui/input.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qmp-commands.h" #include "trace.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index 2baf0c7120..7a53db070c 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -30,6 +30,7 @@ #include "qemu-x509.h" #include "qemu/sockets.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" @@ -34,6 +34,7 @@ #include "qemu/timer.h" #include "qemu/acl.h" #include "qemu/config-file.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/types.h" #include "qmp-commands.h" |