From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:39600)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Qy3CR-0002XX-Bi
	for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:52:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Qy3CL-0000pw-RE
	for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:52:31 -0400
Received: from mail-gw0-f45.google.com ([74.125.83.45]:55673)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Qy3CL-0000po-Np
	for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:52:25 -0400
Received: by gwb19 with SMTP id 19so5529847gwb.4
	for <qemu-devel@nongnu.org>; Mon, 29 Aug 2011 07:52:25 -0700 (PDT)
Message-ID: <4E5BA7A5.5080008@codemonkey.ws>
Date: Mon, 29 Aug 2011 09:52:21 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <4E5A60C1.3050900@redhat.com>
In-Reply-To: <4E5A60C1.3050900@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PULL] sh_pci fix
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: Avi Kivity <avi@redhat.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

On 08/28/2011 10:37 AM, Avi Kivity wrote:
> Anthony, please pull from
>
> git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/urgent
>
> to receive a fix for boundless recursion in the sh target, due to a bug
> in the memory API conversion.

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Avi Kivity (1):
> sh_pci: Fix sh_pci memory alias confusion
>
> hw/sh_pci.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/hw/sh_pci.c b/hw/sh_pci.c
> index 76061bb..36f3930 100644
> --- a/hw/sh_pci.c
> +++ b/hw/sh_pci.c
> @@ -150,7 +150,7 @@ static int sh_pci_init_device(SysBusDevice *dev)
> PCI_DEVFN(0, 0), 4);
> memory_region_init_io(&s->memconfig_p4, &sh_pci_reg_ops, s,
> "sh_pci", 0x224);
> - memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_a7,
> + memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_p4,
> 0, 0x224);
> isa_mmio_setup(&s->isa, 0x40000);
> sysbus_init_mmio_cb2(dev, sh_pci_map, sh_pci_unmap);
>