From 45936c8b79012da4c8986c20af4afcc9cd14bb8e Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Mon, 13 May 2013 16:27:06 +0300 Subject: fw_cfg: move typedef to qemu/typedefs.h Less header dependencies this way. Signed-off-by: Michael S. Tsirkin --- include/hw/i386/pc.h | 1 - include/hw/nvram/fw_cfg.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'include/hw') diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index fa3bf24c78..b4c8a74ef7 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -8,7 +8,6 @@ #include "hw/block/fdc.h" #include "net/net.h" #include "hw/i386/ioapic.h" -#include "hw/nvram/fw_cfg.h" /* PC-style peripherals (also used by other machines). */ diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 3e4a3347e8..f37714ee9b 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -6,6 +6,7 @@ #include #include "exec/hwaddr.h" +#include "qemu/typedefs.h" #endif #define FW_CFG_SIGNATURE 0x00 @@ -60,7 +61,6 @@ typedef struct FWCfgFiles { typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); -typedef struct FWCfgState FWCfgState; void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len); void fw_cfg_add_string(FWCfgState *s, uint16_t key, const char *value); void fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value); -- cgit v1.2.3