From patchwork Mon Feb 10 16:22:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 318808 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E26E62C00AF for ; Tue, 11 Feb 2014 03:23:11 +1100 (EST) Received: from localhost ([::1]:56370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCtdU-0006mF-Uz for incoming@patchwork.ozlabs.org; Mon, 10 Feb 2014 11:23:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCtct-0006YM-Cj for qemu-devel@nongnu.org; Mon, 10 Feb 2014 11:22:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCtcn-0007q8-C3 for qemu-devel@nongnu.org; Mon, 10 Feb 2014 11:22:31 -0500 Received: from mout.web.de ([212.227.15.4]:55836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCtcm-0007o6-Ss for qemu-devel@nongnu.org; Mon, 10 Feb 2014 11:22:25 -0500 Received: from envy.com ([195.135.221.2]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0MOipW-1WA7vl1Ypy-006Ahb for ; Mon, 10 Feb 2014 17:22:23 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 10 Feb 2014 17:22:16 +0100 Message-Id: <1392049338-23582-2-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1392049338-23582-1-git-send-email-andreas.faerber@web.de> References: <1392049338-23582-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:tUMO9hgTZmCf+yQ1smR4KSctTZgb/ApBPjvE4QLQK+Xj+1RYiAL CtvzRP8gDDgyUSgT9mmsCBTnhq8J26f0Dhaf6TbghtMxDuZcwKGsRM8fFvQoZck/xZvrhPc GU06mFH336H7CE6HcV/rEfg36jBHUZdKzE7x7IIYt+Y0XJB56oMFF7OW+CjneibEt2wkx3h ptUNSMs+lyNaxjEyhNFPw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.4 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Alexander Graf Subject: [Qemu-devel] [PULL 1/3] prep: Kill get_system_io() usage 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 From: Hervé Poussineau While ISA address space in prep machine is currently the one returned by get_system_io(), this depends of the implementation of i82378/raven devices, and this may not be the case forever. Use the right ISA address space when adding some more ports to it. We can use whatever ISA device on the right ISA bus, as all ISA devices on the same ISA bus share the same ISA address space. Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber --- hw/ppc/prep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index aad0f69..9f8538c 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -656,7 +656,7 @@ static void ppc_prep_init(QEMUMachineInitArgs *args) sysctrl->reset_irq = cpu->env.irq_inputs[PPC6xx_INPUT_HRESET]; portio_list_init(port_list, NULL, prep_portio_list, sysctrl, "prep"); - portio_list_add(port_list, get_system_io(), 0x0); + portio_list_add(port_list, isa_address_space_io(isa), 0x0); /* PowerPC control and status register group */ #if 0