We rebase fw_cfg_init() to the new function for compatibility with current callers.
Signed-off-by: Laszlo Ersek <ler...@redhat.com> --- Notes: v3: - new in v3 [Drew Jones] include/hw/nvram/fw_cfg.h | 3 +++ hw/nvram/fw_cfg.c | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 56e1ed7..fd7c35c 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -77,8 +77,11 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, FWCfgReadCallback callback, void *callback_opaque, void *data, size_t len); void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data, size_t len); +FWCfgState *fw_cfg_init_data_memwidth(uint32_t ctl_port, uint32_t data_port, + hwaddr ctl_addr, hwaddr data_addr, + uint32_t data_memwidth); FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, hwaddr crl_addr, hwaddr data_addr); FWCfgState *fw_cfg_find(void); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 6073f16..55b7f41 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -560,20 +560,20 @@ static void fw_cfg_machine_ready(struct Notifier *n, void *data) FWCfgState *s = container_of(n, FWCfgState, machine_ready); qemu_register_reset(fw_cfg_machine_reset, s); } -FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, - hwaddr ctl_addr, hwaddr data_addr) +FWCfgState *fw_cfg_init_data_memwidth(uint32_t ctl_port, uint32_t data_port, + hwaddr ctl_addr, hwaddr data_addr, + uint32_t data_memwidth) { DeviceState *dev; SysBusDevice *d; FWCfgState *s; dev = qdev_create(NULL, TYPE_FW_CFG); qdev_prop_set_uint32(dev, "ctl_iobase", ctl_port); qdev_prop_set_uint32(dev, "data_iobase", data_port); - qdev_prop_set_uint32(dev, "data_memwidth", - fw_cfg_data_mem_ops.valid.max_access_size); + qdev_prop_set_uint32(dev, "data_memwidth", data_memwidth); d = SYS_BUS_DEVICE(dev); s = FW_CFG(dev); @@ -602,8 +602,15 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, return s; } +FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, + hwaddr ctl_addr, hwaddr data_addr) +{ + return fw_cfg_init_data_memwidth(ctl_port, data_port, ctl_addr, data_addr, + fw_cfg_data_mem_ops.valid.max_access_size); +} + static void fw_cfg_initfn(Object *obj) { SysBusDevice *sbd = SYS_BUS_DEVICE(obj); FWCfgState *s = FW_CFG(obj); -- 1.8.3.1