From e688df6bc4549f28534cdb001f168b8caae55b0c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 1 Feb 2018 12:18:31 +0100 Subject: Include qapi/error.h exactly where needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Markus Armbruster Message-Id: <20180201111846.21846-5-armbru@redhat.com> [Semantic conflict with commit 34e304e975 resolved, OSX breakage fixed] --- hw/char/mcf_uart.c | 1 - hw/char/virtio-console.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/char') diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 56fa402b58..faae083e78 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -11,7 +11,6 @@ #include "hw/m68k/mcf.h" #include "chardev/char-fe.h" #include "exec/address-spaces.h" -#include "qapi/error.h" typedef struct { SysBusDevice parent_obj; diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 172c72d06c..4be5d4ee52 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -16,6 +16,7 @@ #include "trace.h" #include "hw/virtio/virtio-serial.h" #include "qapi-event.h" +#include "qapi/error.h" #define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport" #define VIRTIO_CONSOLE(obj) \ -- cgit v1.2.3