[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 04/13] fw_cfg: move typedef to qemu/typedefs.h
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH RFC 04/13] fw_cfg: move typedef to qemu/typedefs.h |
Date: |
Mon, 13 May 2013 23:00:50 +0300 |
Less header dependencies this way.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/pc.h | 1 -
include/hw/nvram/fw_cfg.h | 2 +-
include/qemu/typedefs.h | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index def52aa..1c2baaf 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -9,7 +9,6 @@
#include "net/net.h"
#include "exec/memory.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 3e4a334..f37714e 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 93aae81..afe4ec7 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 */
--
MST
- [Qemu-devel] [PATCH RFC 00/13] qemu: generate acpi tables for the guest, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 03/13] refer to FWCfgState explicitly, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 02/13] hw/i386/pc.c: move IO_APIC_DEFAULT_ADDRESS to include/hw/i386/apic.h, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 01/13] apic: rename apic specific bitopts, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 04/13] fw_cfg: move typedef to qemu/typedefs.h,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH RFC 06/13] acpi: add rules to compile ASL source, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 05/13] i386: add ACPI table files from seabios, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 08/13] range: add Range structure, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 13/13] pc: reuse guest info for legacy fw cfg, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 09/13] i386: add bios linker/loader, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 07/13] acpi: pre-compiled ASL files, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 10/13] i386: generate pc guest info, Michael S. Tsirkin, 2013/05/13