|
 |
9ae3a8 |
From c2e580f1f3137d8517894ba6d5cd6d7f85682587 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <c2e580f1f3137d8517894ba6d5cd6d7f85682587.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 17 Dec 2013 15:17:13 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 10/56] fw_cfg: move typedef to qemu/typedefs.h
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1387293161-4085-11-git-send-email-mst@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56315
|
|
|
9ae3a8 |
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 10/57] fw_cfg: move typedef to qemu/typedefs.h
|
|
|
9ae3a8 |
Bugzilla: 1034876
|
|
|
9ae3a8 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Less header dependencies this way.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 45936c8b79012da4c8986c20af4afcc9cd14bb8e)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/hw/i386/pc.h | 1 -
|
|
|
9ae3a8 |
include/hw/nvram/fw_cfg.h | 2 +-
|
|
|
9ae3a8 |
include/qemu/typedefs.h | 1 +
|
|
|
9ae3a8 |
3 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/hw/i386/pc.h | 1 -
|
|
|
9ae3a8 |
include/hw/nvram/fw_cfg.h | 2 +-
|
|
|
9ae3a8 |
include/qemu/typedefs.h | 1 +
|
|
|
9ae3a8 |
3 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
|
|
|
9ae3a8 |
index 4175c1b..2cf7baa 100644
|
|
|
9ae3a8 |
--- a/include/hw/i386/pc.h
|
|
|
9ae3a8 |
+++ b/include/hw/i386/pc.h
|
|
|
9ae3a8 |
@@ -9,7 +9,6 @@
|
|
|
9ae3a8 |
#include "net/net.h"
|
|
|
9ae3a8 |
#include "exec/memory.h"
|
|
|
9ae3a8 |
#include "hw/i386/ioapic.h"
|
|
|
9ae3a8 |
-#include "hw/nvram/fw_cfg.h"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* PC-style peripherals (also used by other machines). */
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
|
|
|
9ae3a8 |
index 48a8aa4..f60dd67 100644
|
|
|
9ae3a8 |
--- a/include/hw/nvram/fw_cfg.h
|
|
|
9ae3a8 |
+++ b/include/hw/nvram/fw_cfg.h
|
|
|
9ae3a8 |
@@ -6,6 +6,7 @@
|
|
|
9ae3a8 |
#include <stddef.h>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#include "exec/hwaddr.h"
|
|
|
9ae3a8 |
+#include "qemu/typedefs.h"
|
|
|
9ae3a8 |
#endif
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#define FW_CFG_SIGNATURE 0x00
|
|
|
9ae3a8 |
@@ -60,7 +61,6 @@ typedef struct FWCfgFiles {
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
typedef void (*FWCfgCallback)(void *opaque, uint8_t *data);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-typedef struct FWCfgState FWCfgState;
|
|
|
9ae3a8 |
void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len);
|
|
|
9ae3a8 |
void fw_cfg_add_string(FWCfgState *s, uint16_t key, const char *value);
|
|
|
9ae3a8 |
void fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value);
|
|
|
9ae3a8 |
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
|
|
|
9ae3a8 |
index 2e7d942..a332d88 100644
|
|
|
9ae3a8 |
--- a/include/qemu/typedefs.h
|
|
|
9ae3a8 |
+++ b/include/qemu/typedefs.h
|
|
|
9ae3a8 |
@@ -63,6 +63,7 @@ typedef struct EventNotifier EventNotifier;
|
|
|
9ae3a8 |
typedef struct VirtIODevice VirtIODevice;
|
|
|
9ae3a8 |
typedef struct QEMUSGList QEMUSGList;
|
|
|
9ae3a8 |
typedef struct SHPCDevice SHPCDevice;
|
|
|
9ae3a8 |
+typedef struct FWCfgState FWCfgState;
|
|
|
9ae3a8 |
typedef struct Range Range;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#endif /* QEMU_TYPEDEFS_H */
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|