diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-03-10 14:09:58 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-22 22:20:16 +0100 |
| commit | 6f061ea10f28c6cbe3ea588e84ef1f5fd27f0299 (patch) | |
| tree | 298955d833b2a9bd876759e391b0443cc26fd484 /pc-bios | |
| parent | c80f6e9caa7647b576966534aaa0dc8f1b480f2b (diff) | |
| download | qemu-6f061ea10f28c6cbe3ea588e84ef1f5fd27f0299.zip qemu-6f061ea10f28c6cbe3ea588e84ef1f5fd27f0299.tar.gz qemu-6f061ea10f28c6cbe3ea588e84ef1f5fd27f0299.tar.bz2 | |
fw_cfg: Split fw_cfg_keys.h off fw_cfg.h
Much of fw_cfg.h's contents is #ifndef NO_QEMU_PROTOS. This lets a
few places include it without satisfying the dependencies of the
suppressed code. If you somehow include it with NO_QEMU_PROTOS, any
future includes are ignored. Unnecessarily unclean.
Move the stuff not under NO_QEMU_PROTOS into its own header
fw_cfg_keys.h, and include it as appropriate. Tidy up the moved code
to please checkpatch.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/optionrom/optionrom.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pc-bios/optionrom/optionrom.h b/pc-bios/optionrom/optionrom.h index f1a9021..6c4c2c8 100644 --- a/pc-bios/optionrom/optionrom.h +++ b/pc-bios/optionrom/optionrom.h @@ -19,8 +19,7 @@ */ -#define NO_QEMU_PROTOS -#include "../../include/hw/nvram/fw_cfg.h" +#include "../../include/hw/nvram/fw_cfg_keys.h" #define BIOS_CFG_IOPORT_CFG 0x510 #define BIOS_CFG_IOPORT_DATA 0x511 |