From: Laszlo Ersek <lersek@redhat.com>
To: "Gabriel L. Somlo" <somlo@cmu.edu>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, markmb@redhat.com, pbonzini@redhat.com,
kraxel@redhat.com, jordan.l.justen@intel.com
Subject: Re: [Qemu-devel] [PATCH v2 3/4] fw_cfg: remove offset argument from callback prototype
Date: Mon, 2 Nov 2015 15:17:58 +0100 [thread overview]
Message-ID: <56377096.60302@redhat.com> (raw)
In-Reply-To: <1446052836-31737-4-git-send-email-somlo@cmu.edu>
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 <lersek@redhat.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Marc Marí <markmb@redhat.com>
> Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
> ---
> 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 <lersek@redhat.com>
next prev parent reply other threads:[~2015-11-02 14:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-28 17:20 [Qemu-devel] [PATCH v2 0/4] fw_cfg: spec update, read optimization, misc. cleanup Gabriel L. Somlo
2015-10-28 17:20 ` [Qemu-devel] [PATCH v2 1/4] fw_cfg: move internal function call docs to header file Gabriel L. Somlo
2015-11-02 13:41 ` Laszlo Ersek
2015-11-02 20:36 ` Gabriel L. Somlo
2015-11-02 20:44 ` Laszlo Ersek
2015-10-28 17:20 ` [Qemu-devel] [PATCH v2 2/4] fw_cfg: amend callback behavior spec to once per select Gabriel L. Somlo
2015-11-02 14:16 ` Laszlo Ersek
2015-11-02 21:00 ` Gabriel L. Somlo
2015-10-28 17:20 ` [Qemu-devel] [PATCH v2 3/4] fw_cfg: remove offset argument from callback prototype Gabriel L. Somlo
2015-11-02 14:17 ` Laszlo Ersek [this message]
2015-10-28 17:20 ` [Qemu-devel] [PATCH v2 4/4] fw_cfg: streamline (non-DMA) read operations Gabriel L. Somlo
2015-11-02 14:38 ` Laszlo Ersek
2015-11-02 16:41 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56377096.60302@redhat.com \
--to=lersek@redhat.com \
--cc=jordan.l.justen@intel.com \
--cc=kraxel@redhat.com \
--cc=markmb@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=somlo@cmu.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).