From patchwork Sat Sep 17 19:28:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 115160 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 59866B70DC for ; Sun, 18 Sep 2011 05:28:49 +1000 (EST) Received: from localhost ([::1]:39071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R50Z6-0003a0-VY for incoming@patchwork.ozlabs.org; Sat, 17 Sep 2011 15:28:40 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R50Yz-0003Zu-Pt for qemu-devel@nongnu.org; Sat, 17 Sep 2011 15:28:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R50Yy-0007vd-Km for qemu-devel@nongnu.org; Sat, 17 Sep 2011 15:28:33 -0400 Received: from mail-qy0-f173.google.com ([209.85.216.173]:34719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R50Yy-0007vZ-EB for qemu-devel@nongnu.org; Sat, 17 Sep 2011 15:28:32 -0400 Received: by qyc1 with SMTP id 1so1346430qyc.4 for ; Sat, 17 Sep 2011 12:28:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; bh=ODEyMBwtYDI97TbhLWQpZxKvzoiQovouWESfQTte0sg=; b=YpALYo9a4RxZx2cVQQNKirFINWfOOg+lTRAKjqHbBsuzogt5Df4rXa4uZygeAlqQ7W bns/tVMcneKhBsRfor5h67GCLiiCmbjR6AsxBvS6iP/HMGJd3QH/EuIYrRpoJFEaYf1o HxuArFBqgzLceKPzq00go9LZi3KinxRV1d4jc= Received: by 10.224.8.210 with SMTP id i18mr627838qai.259.1316287712084; Sat, 17 Sep 2011 12:28:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.6.129 with HTTP; Sat, 17 Sep 2011 12:28:12 -0700 (PDT) From: Blue Swirl Date: Sat, 17 Sep 2011 19:28:12 +0000 Message-ID: To: Avi Kivity , qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.216.173 Subject: [Qemu-devel] [PATCH] sun4u: don't set up isa_mem_base 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 Since we use memory API in sun4u.c, after 71579cae30b53c910cd6c47ab4e683f647d36519, setting up isa_mem_base puts vga.chain4 outside of the physical address space. Fix by removing obsolete isa_mem_base set up. Signed-off-by: Blue Swirl --- hw/sun4u.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index 32e6ab9..6afb0e7 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -763,7 +763,6 @@ static void sun4uv_init(ram_addr_t RAM_size, irq = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS); pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, irq, &pci_bus2, &pci_bus3); - isa_mem_base = APB_PCI_IO_BASE; pci_vga_init(pci_bus); // XXX Should be pci_bus3