From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QxhQd-0002Ps-Qc for qemu-devel@nongnu.org; Sun, 28 Aug 2011 11:37:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QxhQc-0005JJ-Hg for qemu-devel@nongnu.org; Sun, 28 Aug 2011 11:37:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QxhQc-0005JE-70 for qemu-devel@nongnu.org; Sun, 28 Aug 2011 11:37:42 -0400 Message-ID: <4E5A60C1.3050900@redhat.com> Date: Sun, 28 Aug 2011 18:37:37 +0300 From: Avi Kivity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PULL] sh_pci fix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , Anthony Liguori 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. 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); -- error compiling committee.c: too many arguments to function