From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41180)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Y1Z6L-0006NH-EH
	for qemu-devel@nongnu.org; Thu, 18 Dec 2014 06:18:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Y1Z6F-0003Vf-5X
	for qemu-devel@nongnu.org; Thu, 18 Dec 2014 06:18:37 -0500
Received: from mx1.redhat.com ([209.132.183.28]:53792)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Y1Z6E-0003UQ-UL
	for qemu-devel@nongnu.org; Thu, 18 Dec 2014 06:18:31 -0500
Message-ID: <5492B7FD.2010903@redhat.com>
Date: Thu, 18 Dec 2014 12:18:21 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1418850613-26821-1-git-send-email-lersek@redhat.com>
	<1418850613-26821-2-git-send-email-lersek@redhat.com>
In-Reply-To: <1418850613-26821-2-git-send-email-lersek@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v5 01/11] fw_cfg: hard separation between
 the MMIO and I/O port mappings
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Laszlo Ersek <lersek@redhat.com>, peter.maydell@linaro.org, qemu-devel@nongnu.org, rjones@redhat.com, drjones@redhat.com, agraf@suse.de



On 17/12/2014 22:10, Laszlo Ersek wrote:
> +static Property fw_cfg_mem_properties[] = {
> +    DEFINE_PROP_UINT64("ctl_addr", FWCfgMemState, ctl_addr, -1),
> +    DEFINE_PROP_UINT64("data_addr", FWCfgMemState, data_addr, -1),
> +    DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void fw_cfg_mem_realize(DeviceState *dev, Error **errp)
> +{
> +    FWCfgMemState *s = FW_CFG_MEM(dev);
> +    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> +
> +    memory_region_init_io(&s->ctl_iomem, OBJECT(s), &fw_cfg_ctl_mem_ops,
> +                          FW_CFG(s), "fwcfg.ctl", FW_CFG_SIZE);
> +    sysbus_init_mmio(sbd, &s->ctl_iomem);
> +    sysbus_mmio_map(sbd, 0, s->ctl_addr);
> +
> +    memory_region_init_io(&s->data_iomem, OBJECT(s), &fw_cfg_data_mem_ops,
> +                          FW_CFG(s), "fwcfg.data", FW_CFG_DATA_SIZE);
> +    sysbus_init_mmio(sbd, &s->data_iomem);
> +    sysbus_mmio_map(sbd, 1, s->data_addr);
> +}

Strictly speaking sysbus_mmio_map should be called by the caller, as in
the old fw_cfg_init---which lets you drop the properties too.

Doesn't prevent merging this series.

Paolo