From patchwork Tue Nov 3 21:40:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Gabriel L. Somlo" X-Patchwork-Id: 539613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6642F1402D7 for ; Wed, 4 Nov 2015 08:41:24 +1100 (AEDT) Received: from localhost ([::1]:51138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtjKU-00031u-4n for incoming@patchwork.ozlabs.org; Tue, 03 Nov 2015 16:41:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtjJz-00029j-53 for qemu-devel@nongnu.org; Tue, 03 Nov 2015 16:40:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtjJu-0002Sn-2c for qemu-devel@nongnu.org; Tue, 03 Nov 2015 16:40:51 -0500 Received: from relay-06.andrew.cmu.edu ([128.2.157.21]:36072 helo=relay.andrew.cmu.edu) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtjJt-0002SO-TR for qemu-devel@nongnu.org; Tue, 03 Nov 2015 16:40:46 -0500 Received: from HEDWIG.ini.cmu.edu (HEDWIG.INI.CMU.EDU [128.2.16.51]) by relay.andrew.cmu.edu (8.14.8/8.14.8) with ESMTP id tA3LegZD018988; Tue, 3 Nov 2015 16:40:42 -0500 From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Tue, 3 Nov 2015 16:40:39 -0500 Message-Id: <1446586842-21793-4-git-send-email-somlo@cmu.edu> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1446586842-21793-1-git-send-email-somlo@cmu.edu> References: <1446586842-21793-1-git-send-email-somlo@cmu.edu> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.74 on 128.2.157.21 X-MIME-Autoconverted: from 8bit to quoted-printable by relay.andrew.cmu.edu id tA3LegZD018988 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 128.2.157.21 Cc: peter.maydell@linaro.org, jordan.l.justen@intel.com, kraxel@redhat.com, pbonzini@redhat.com, markmb@redhat.com, lersek@redhat.com Subject: [Qemu-devel] [PATCH v4 3/6] fw_cfg: remove offset argument from callback prototype X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Cc: Gerd Hoffmann Cc: Marc Marí Signed-off-by: Gabriel Somlo Reviewed-by: Laszlo Ersek --- 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 6e6414b..c2d3a0a 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 a1cfaa4..664eaf6 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: