From patchwork Sun Aug 28 15:37:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 111909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D1AC7B6F83 for ; Mon, 29 Aug 2011 01:37:51 +1000 (EST) Received: from localhost ([::1]:53082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QxhQi-0002Py-DD for incoming@patchwork.ozlabs.org; Sun, 28 Aug 2011 11:37:48 -0400 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 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7SFbe20010231 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 28 Aug 2011 11:37:40 -0400 Received: from balrog.usersys.redhat.com (dhcp-1-24.tlv.redhat.com [10.35.1.24]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7SFbcR4014018; Sun, 28 Aug 2011 11:37:39 -0400 Message-ID: <4E5A60C1.3050900@redhat.com> Date: Sun, 28 Aug 2011 18:37:37 +0300 From: Avi Kivity User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20110816 Thunderbird/6.0 MIME-Version: 1.0 To: qemu-devel , Anthony Liguori X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL] sh_pci fix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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(-) isa_mmio_setup(&s->isa, 0x40000); sysbus_init_mmio_cb2(dev, sh_pci_map, sh_pci_unmap); 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);