diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-08-12 07:23:31 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-08-16 13:31:51 +0200 |
| commit | ec150c7e09071bcf51bfaa8071fe23efb6df69f7 (patch) | |
| tree | 1226162aa31d0fc73ee0ed389fe3719d79ff7201 /include/hw/block | |
| parent | f8f2eac4e5de8ce8ef17591ee1b84904437be25b (diff) | |
| download | qemu-ec150c7e09071bcf51bfaa8071fe23efb6df69f7.zip qemu-ec150c7e09071bcf51bfaa8071fe23efb6df69f7.tar.gz qemu-ec150c7e09071bcf51bfaa8071fe23efb6df69f7.tar.bz2 | |
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/block')
| -rw-r--r-- | include/hw/block/fdc.h | 2 | ||||
| -rw-r--r-- | include/hw/block/flash.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 8cece84..f4fe2f4 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -1,6 +1,8 @@ #ifndef HW_FDC_H #define HW_FDC_H +#include "exec/hwaddr.h" +#include "hw/irq.h" #include "qapi/qapi-types-block.h" /* fdc.c */ diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h index 1acaf7d..83a75f3 100644 --- a/include/hw/block/flash.h +++ b/include/hw/block/flash.h @@ -4,6 +4,7 @@ /* NOR flash devices */ #include "exec/memory.h" +#include "migration/vmstate.h" /* pflash_cfi01.c */ |