[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/43] fw_cfg: interface to trigger callback on read
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 16/43] fw_cfg: interface to trigger callback on read |
Date: |
Mon, 14 Oct 2013 17:58:55 +0300 |
Reviewed-by: Gerd Hoffmann <address@hidden>
Tested-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/nvram/fw_cfg.h | 4 ++++
hw/nvram/fw_cfg.c | 33 ++++++++++++++++++++++++++++-----
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index f60dd67..2ab0fc2 100644
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -60,6 +60,7 @@ typedef struct FWCfgFiles {
} FWCfgFiles;
typedef void (*FWCfgCallback)(void *opaque, uint8_t *data);
+typedef void (*FWCfgReadCallback)(void *opaque, uint32_t offset);
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);
@@ -70,6 +71,9 @@ void fw_cfg_add_callback(FWCfgState *s, uint16_t key,
FWCfgCallback callback,
void *callback_opaque, void *data, size_t len);
void fw_cfg_add_file(FWCfgState *s, const char *filename, void *data,
size_t len);
+void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
+ FWCfgReadCallback callback, void
*callback_opaque,
+ void *data, size_t len);
FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
hwaddr crl_addr, hwaddr data_addr);
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index d0820e5..f5dc3ea 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -42,6 +42,7 @@ typedef struct FWCfgEntry {
uint8_t *data;
void *callback_opaque;
FWCfgCallback callback;
+ FWCfgReadCallback read_callback;
} FWCfgEntry;
struct FWCfgState {
@@ -249,8 +250,12 @@ static uint8_t fw_cfg_read(FWCfgState *s)
if (s->cur_entry == FW_CFG_INVALID || !e->data || s->cur_offset >= e->len)
ret = 0;
- else
+ else {
+ if (e->read_callback) {
+ e->read_callback(e->callback_opaque, s->cur_offset);
+ }
ret = e->data[s->cur_offset++];
+ }
trace_fw_cfg_read(s, ret);
return ret;
@@ -381,7 +386,10 @@ static const VMStateDescription vmstate_fw_cfg = {
}
};
-void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len)
+static void fw_cfg_add_bytes_read_callback(FWCfgState *s, uint16_t key,
+ FWCfgReadCallback callback,
+ void *callback_opaque,
+ void *data, size_t len)
{
int arch = !!(key & FW_CFG_ARCH_LOCAL);
@@ -391,6 +399,13 @@ void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void
*data, size_t len)
s->entries[arch][key].data = data;
s->entries[arch][key].len = (uint32_t)len;
+ s->entries[arch][key].read_callback = callback;
+ s->entries[arch][key].callback_opaque = callback_opaque;
+}
+
+void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len)
+{
+ fw_cfg_add_bytes_read_callback(s, key, NULL, NULL, data, len);
}
void fw_cfg_add_string(FWCfgState *s, uint16_t key, const char *value)
@@ -444,8 +459,9 @@ void fw_cfg_add_callback(FWCfgState *s, uint16_t key,
FWCfgCallback callback,
s->entries[arch][key].callback = callback;
}
-void fw_cfg_add_file(FWCfgState *s, const char *filename,
- void *data, size_t len)
+void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
+ FWCfgReadCallback callback, void
*callback_opaque,
+ void *data, size_t len)
{
int i, index;
size_t dsize;
@@ -459,7 +475,8 @@ void fw_cfg_add_file(FWCfgState *s, const char *filename,
index = be32_to_cpu(s->files->count);
assert(index < FW_CFG_FILE_SLOTS);
- fw_cfg_add_bytes(s, FW_CFG_FILE_FIRST + index, data, len);
+ fw_cfg_add_bytes_read_callback(s, FW_CFG_FILE_FIRST + index,
+ callback, callback_opaque, data, len);
pstrcpy(s->files->f[index].name, sizeof(s->files->f[index].name),
filename);
@@ -477,6 +494,12 @@ void fw_cfg_add_file(FWCfgState *s, const char *filename,
s->files->count = cpu_to_be32(index+1);
}
+void fw_cfg_add_file(FWCfgState *s, const char *filename,
+ void *data, size_t len)
+{
+ fw_cfg_add_file_callback(s, filename, NULL, NULL, data, len);
+}
+
static void fw_cfg_machine_ready(struct Notifier *n, void *data)
{
size_t len;
--
MST
- [Qemu-devel] [PULL 07/43] hw/vmxnet3: set interrupts using pci irq wrappers, (continued)
- [Qemu-devel] [PULL 07/43] hw/vmxnet3: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 08/43] hw/vfio: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 10/43] hw/pcie: AER and hot-plug events must use device's interrupt, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 09/43] hw: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 11/43] hw/pci: removed irq field from PCIDevice, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 12/43] cleanup object.h: include error.h directly, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 13/43] qom: cleanup struct Error references, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 14/43] qom: add pointer to int property helpers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 15/43] pci: fix up w64 size calculation helper, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 16/43] fw_cfg: interface to trigger callback on read,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 17/43] loader: support for unmapped ROM blobs, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 18/43] pcie_host: expose UNMAPPED macro, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 19/43] pcie_host: expose address format, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 20/43] q35: use macro for MCFG property name, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 21/43] q35: expose mmcfg size as a property, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 23/43] acpi: add rules to compile ASL source, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 25/43] acpi: ssdt pcihp: updat generated file, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 22/43] i386: add ACPI table files from seabios, Michael S. Tsirkin, 2013/10/14