summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin2013-05-13 15:27:06 +0200
committerMichael S. Tsirkin2013-06-02 17:14:14 +0200
commit45936c8b79012da4c8986c20af4afcc9cd14bb8e (patch)
treed8bfdda3a0340b2d967d94812c739e0c0e16ced5
parentrefer to FWCfgState explicitly (diff)
downloadqemu-45936c8b79012da4c8986c20af4afcc9cd14bb8e.tar.gz
qemu-45936c8b79012da4c8986c20af4afcc9cd14bb8e.tar.xz
qemu-45936c8b79012da4c8986c20af4afcc9cd14bb8e.zip
fw_cfg: move typedef to qemu/typedefs.h
Less header dependencies this way. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--include/hw/i386/pc.h1
-rw-r--r--include/hw/nvram/fw_cfg.h2
-rw-r--r--include/qemu/typedefs.h1
3 files changed, 2 insertions, 2 deletions
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 <stddef.h>
#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);
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 93aae81a82..afe4ec76e1 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -61,5 +61,6 @@ typedef struct EventNotifier EventNotifier;
typedef struct VirtIODevice VirtIODevice;
typedef struct QEMUSGList QEMUSGList;
typedef struct SHPCDevice SHPCDevice;
+typedef struct FWCfgState FWCfgState;
#endif /* QEMU_TYPEDEFS_H */