From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1Ls7-0002qY-7S for qemu-devel@nongnu.org; Wed, 17 Dec 2014 16:11:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1Ls0-0008IO-Rz for qemu-devel@nongnu.org; Wed, 17 Dec 2014 16:11:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60456) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1Ls0-0008IC-JI for qemu-devel@nongnu.org; Wed, 17 Dec 2014 16:10:56 -0500 From: Laszlo Ersek Date: Wed, 17 Dec 2014 22:10:09 +0100 Message-Id: <1418850613-26821-8-git-send-email-lersek@redhat.com> In-Reply-To: <1418850613-26821-1-git-send-email-lersek@redhat.com> References: <1418850613-26821-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH v5 07/11] fw_cfg_mem: expose the "data_width" property with fw_cfg_init_mem_wide() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org, rjones@redhat.com, drjones@redhat.com, lersek@redhat.com, pbonzini@redhat.com, agraf@suse.de We rebase fw_cfg_init_mem() to the new function for compatibility with current callers. Signed-off-by: Laszlo Ersek --- Notes: v5: - just rebased v4: - unchanged v3: - new in v3 [Drew Jones] include/hw/nvram/fw_cfg.h | 2 ++ hw/nvram/fw_cfg.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index a99586e..6d8a8ac 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -79,8 +79,10 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data, size_t len); FWCfgState *fw_cfg_init_io(uint32_t iobase); FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr); +FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, hwaddr data_addr, + uint32_t data_width); FWCfgState *fw_cfg_find(void); #endif /* NO_QEMU_PROTOS */ diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 80f846f..33ffd0f 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -667,21 +667,27 @@ FWCfgState *fw_cfg_init_io(uint32_t iobase) return fw_cfg_init1(dev); } -FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr) +FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, hwaddr data_addr, + uint32_t data_width) { DeviceState *dev; dev = qdev_create(NULL, TYPE_FW_CFG_MEM); qdev_prop_set_uint64(dev, "ctl_addr", ctl_addr); qdev_prop_set_uint64(dev, "data_addr", data_addr); - qdev_prop_set_uint32(dev, "data_width", - fw_cfg_data_mem_ops.valid.max_access_size); + qdev_prop_set_uint32(dev, "data_width", data_width); return fw_cfg_init1(dev); } +FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr) +{ + return fw_cfg_init_mem_wide(ctl_addr, data_addr, + fw_cfg_data_mem_ops.valid.max_access_size); +} + FWCfgState *fw_cfg_find(void) { return FW_CFG(object_resolve_path(FW_CFG_PATH, NULL)); -- 1.8.3.1