瀏覽代碼

fw_cfg: move typedef to qemu/typedefs.h

Less header dependencies this way.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Michael S. Tsirkin 12 年之前
父節點
當前提交
45936c8b79
共有 3 個文件被更改,包括 2 次插入2 次删除
  1. 0 1
      include/hw/i386/pc.h
  2. 1 1
      include/hw/nvram/fw_cfg.h
  3. 1 0
      include/qemu/typedefs.h

+ 0 - 1
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).  */
 

+ 1 - 1
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);

+ 1 - 0
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 */