Re: [Qemu-devel] [PATCH v2 3/4] fw_cfg: remove offset argument from callback prototype

[Laszlo Ersek]

On 10/28/15 18:20, Gabriel L. Somlo wrote:
> 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 <address@hidden>
> Cc: Gerd Hoffmann <address@hidden>
> Cc: Marc Marí <address@hidden>
> Signed-off-by: Gabriel Somlo <address@hidden>
> ---
>  hw/arm/virt-acpi-build.c  | 2 +-
>  hw/i386/acpi-build.c      | 2 +-
>  hw/nvram/fw_cfg.c         | 2 +-
>  include/hw/nvram/fw_cfg.h | 3 +--
>  4 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 1aaff1f..4eed24d 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -626,7 +626,7 @@ static void acpi_ram_update(MemoryRegion *mr, GArray 
> *data)
>      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;
>      AcpiBuildTables tables;
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 95e0c65..29e30ce 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1818,7 +1818,7 @@ static void acpi_ram_update(MemoryRegion *mr, GArray 
> *data)
>      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;
>      AcpiBuildTables tables;
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index 31fa5c8..5de6dbc 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -266,7 +266,7 @@ static int fw_cfg_select(FWCfgState *s, uint16_t key)
>          arch = !!(key & FW_CFG_ARCH_LOCAL);
>          e = &s->entries[arch][key & FW_CFG_ENTRY_MASK];
>          if (e->read_callback) {
> -            e->read_callback(e->callback_opaque, s->cur_offset);
> +            e->read_callback(e->callback_opaque);
>          }
>      }
>  
> diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> index 47ff118..6c459f3 100644
> --- a/include/hw/nvram/fw_cfg.h
> +++ b/include/hw/nvram/fw_cfg.h
> @@ -70,8 +70,7 @@ typedef struct FWCfgDmaAccess {
>      uint64_t address;
>  } QEMU_PACKED FWCfgDmaAccess;
>  
> -typedef void (*FWCfgCallback)(void *opaque, uint8_t *data);
> -typedef void (*FWCfgReadCallback)(void *opaque, uint32_t offset);
> +typedef void (*FWCfgReadCallback)(void *opaque);
>  
>  /**
>   * fw_cfg_add_bytes:
> 

Reviewed-by: Laszlo Ersek <address@hidden>