From 6f061ea10f28c6cbe3ea588e84ef1f5fd27f0299 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 10 Mar 2016 14:09:58 +0100 Subject: 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 Signed-off-by: Paolo Bonzini --- pc-bios/optionrom/optionrom.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pc-bios') diff --git a/pc-bios/optionrom/optionrom.h b/pc-bios/optionrom/optionrom.h index f1a9021ec1..6c4c2c82f4 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 -- cgit v1.2.3