summaryrefslogtreecommitdiffstats
path: root/include/hw/char
diff options
context:
space:
mode:
authorMarkus Armbruster2019-08-12 07:23:31 +0200
committerMarkus Armbruster2019-08-16 13:31:51 +0200
commitec150c7e09071bcf51bfaa8071fe23efb6df69f7 (patch)
tree1226162aa31d0fc73ee0ed389fe3719d79ff7201 /include/hw/char
parentOpen 4.2 development tree (diff)
downloadqemu-ec150c7e09071bcf51bfaa8071fe23efb6df69f7.tar.gz
qemu-ec150c7e09071bcf51bfaa8071fe23efb6df69f7.tar.xz
qemu-ec150c7e09071bcf51bfaa8071fe23efb6df69f7.zip
include: Make headers more self-contained
Back in 2016, we discussed[1] rules for headers, and these were generally liked: 1. Have a carefully curated header that's included everywhere first. We got that already thanks to Peter: osdep.h. 2. Headers should normally include everything they need beyond osdep.h. If exceptions are needed for some reason, they must be documented in the header. If all that's needed from a header is typedefs, put those into qemu/typedefs.h instead of including the header. 3. Cyclic inclusion is forbidden. This patch gets include/ closer to obeying 2. It's actually extracted from my "[RFC] Baby steps towards saner headers" series[2], which demonstrates a possible path towards checking 2 automatically. It passes the RFC test there. [1] Message-ID: <87h9g8j57d.fsf@blackfin.pond.sub.org> https://lists.nongnu.org/archive/html/qemu-devel/2016-03/msg03345.html [2] Message-Id: <20190711122827.18970-1-armbru@redhat.com> https://lists.nongnu.org/archive/html/qemu-devel/2019-07/msg02715.html Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-Id: <20190812052359.30071-2-armbru@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'include/hw/char')
-rw-r--r--include/hw/char/escc.h1
-rw-r--r--include/hw/char/xilinx_uartlite.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/char/escc.h b/include/hw/char/escc.h
index 42aca83611..d5196c53e6 100644
--- a/include/hw/char/escc.h
+++ b/include/hw/char/escc.h
@@ -3,6 +3,7 @@
#include "chardev/char-fe.h"
#include "chardev/char-serial.h"
+#include "hw/sysbus.h"
#include "ui/input.h"
/* escc.c */
diff --git a/include/hw/char/xilinx_uartlite.h b/include/hw/char/xilinx_uartlite.h
index 634086b657..99d8bbf405 100644
--- a/include/hw/char/xilinx_uartlite.h
+++ b/include/hw/char/xilinx_uartlite.h
@@ -15,6 +15,8 @@
#ifndef XILINX_UARTLITE_H
#define XILINX_UARTLITE_H
+#include "hw/sysbus.h"
+
static inline DeviceState *xilinx_uartlite_create(hwaddr addr,
qemu_irq irq,
Chardev *chr)