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 --- tests/boot-order-test.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/boot-order-test.c') diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c index 210964a00c..a6d8bd5cbf 100644 --- a/tests/boot-order-test.c +++ b/tests/boot-order-test.c @@ -15,9 +15,7 @@ #include "libqos/fw_cfg.h" #include "libqtest.h" -#define NO_QEMU_PROTOS -#include "hw/nvram/fw_cfg.h" -#undef NO_QEMU_PROTOS +#include "hw/nvram/fw_cfg_keys.h" typedef struct { const char *args; -- cgit v1.2.3