openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fw_cfg: remove offset argument from callback prototype 

Read callbacks are now only invoked at item selection, before any
data is read. As such, the value of the offset argument passed to
the callback will always be 0. Also, the two callback instances
currently in use both leave their offset argument unused.

This patch removes the offset argument from the fw_cfg read callback
prototype, and from the currently available instances. The unused
(write) callback prototype is also removed (write support was removed
earlier, in commit 023e3148).

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Marc Marí <markmb@redhat.com>
Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 1446733972-1602-4-git-send-email-somlo@cmu.edu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gabriel L. Somlo 2015-11-05 09:32:49 -05:00 committed by Gerd Hoffmann
parent 3bef7e8aab
commit 3f8752b4e5
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/virt-acpi-build.c
View File

@ -631,7 +631,7 @@ static void acpi_ram_update(MemoryRegion *mr, GArray *data)
memory_region_set_dirty(mr, 0, size); memory_region_set_dirty(mr, 0, size);
} }
static void virt_acpi_build_update(void *build_opaque, uint32_t offset) static void virt_acpi_build_update(void *build_opaque)
{ {
AcpiBuildState *build_state = build_opaque; AcpiBuildState *build_state = build_opaque;
AcpiBuildTables tables; AcpiBuildTables tables;

2
hw/i386/acpi-build.c
View File

@ -1818,7 +1818,7 @@ static void acpi_ram_update(MemoryRegion *mr, GArray *data)
memory_region_set_dirty(mr, 0, size); memory_region_set_dirty(mr, 0, size);
} }
static void acpi_build_update(void *build_opaque, uint32_t offset) static void acpi_build_update(void *build_opaque)
{ {
AcpiBuildState *build_state = build_opaque; AcpiBuildState *build_state = build_opaque;
AcpiBuildTables tables; AcpiBuildTables tables;

2
hw/nvram/fw_cfg.c
View File

@ -266,7 +266,7 @@ static int fw_cfg_select(FWCfgState *s, uint16_t key)
arch = !!(key & FW_CFG_ARCH_LOCAL); arch = !!(key & FW_CFG_ARCH_LOCAL);
e = &s->entries[arch][key & FW_CFG_ENTRY_MASK]; e = &s->entries[arch][key & FW_CFG_ENTRY_MASK];
if (e->read_callback) { if (e->read_callback) {
e->read_callback(e->callback_opaque, s->cur_offset); e->read_callback(e->callback_opaque);
} }
} }

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

@ -70,8 +70,7 @@ typedef struct FWCfgDmaAccess {
uint64_t address; uint64_t address;
} QEMU_PACKED FWCfgDmaAccess; } QEMU_PACKED FWCfgDmaAccess;
typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); typedef void (*FWCfgReadCallback)(void *opaque);
typedef void (*FWCfgReadCallback)(void *opaque, uint32_t offset);
/** /**
* fw_cfg_add_bytes: * fw_cfg_add_bytes: