mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fw_cfg: interface to trigger callback on read

Browse Source 
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2013-09-01 17:56:20 +03:00
parent 77d6f4ea76
commit d87072ceec
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/nvram/fw_cfg.c
View File

@ -42,6 +42,7 @@ typedef struct FWCfgEntry {
uint8_t *data; uint8_t *data;
void *callback_opaque; void *callback_opaque;
FWCfgCallback callback; FWCfgCallback callback;
FWCfgReadCallback read_callback;
} FWCfgEntry; } FWCfgEntry;
struct FWCfgState { 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) if (s->cur_entry == FW_CFG_INVALID || !e->data || s->cur_offset >= e->len)
ret = 0; ret = 0;
else else {
if (e->read_callback) {
e->read_callback(e->callback_opaque, s->cur_offset);
}
ret = e->data[s->cur_offset++]; ret = e->data[s->cur_offset++];
}
trace_fw_cfg_read(s, ret); trace_fw_cfg_read(s, ret);
return 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); 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].data = data;
s->entries[arch][key].len = (uint32_t)len; 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) 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; s->entries[arch][key].callback = callback;
} }
void fw_cfg_add_file(FWCfgState *s, const char *filename, void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
void *data, size_t len) FWCfgReadCallback callback, void *callback_opaque,
void *data, size_t len)
{ {
int i, index; int i, index;
size_t dsize; size_t dsize;
@ -459,7 +475,8 @@ void fw_cfg_add_file(FWCfgState *s, const char *filename,
index = be32_to_cpu(s->files->count); index = be32_to_cpu(s->files->count);
assert(index < FW_CFG_FILE_SLOTS); 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), pstrcpy(s->files->f[index].name, sizeof(s->files->f[index].name),
filename); filename);
@ -477,6 +494,12 @@ void fw_cfg_add_file(FWCfgState *s, const char *filename,
s->files->count = cpu_to_be32(index+1); 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) static void fw_cfg_machine_ready(struct Notifier *n, void *data)
{ {
size_t len; size_t len;

4
include/hw/nvram/fw_cfg.h
View File

@ -60,6 +60,7 @@ typedef struct FWCfgFiles {
} FWCfgFiles; } FWCfgFiles;
typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); 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_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_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 *callback_opaque, void *data, size_t len);
void fw_cfg_add_file(FWCfgState *s, const char *filename, void *data, void fw_cfg_add_file(FWCfgState *s, const char *filename, void *data,
size_t len); 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, FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
hwaddr crl_addr, hwaddr data_addr); hwaddr crl_addr, hwaddr data_addr);