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>
This commit is contained in:
Markus Armbruster authored and Paolo Bonzini committed 2016-03-22 22:20:16 +01:00
1 parent c80f6e9caa
commit 6f061ea10f
6 files changed
+51 -57

No files matched your search

+1 -2
View File
@@ -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