From patchwork Wed Mar 19 23:36:00 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: 331920 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 9AA812C00A0 for ; Thu, 20 Mar 2014 10:37:36 +1100 (EST) Received: from localhost ([::1]:44290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQQ3C-00083m-BO for incoming@patchwork.ozlabs.org; Wed, 19 Mar 2014 19:37:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQQ2V-0007rg-Nt for qemu-devel@nongnu.org; Wed, 19 Mar 2014 19:36:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQQ2P-0005sx-Ms for qemu-devel@nongnu.org; Wed, 19 Mar 2014 19:36:51 -0400 Received: from mout.web.de ([212.227.15.14]:61324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQQ2P-0005ss-DF; Wed, 19 Mar 2014 19:36:45 -0400 Received: from envy.de ([84.148.52.217]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0M89jd-1XM6zV0csb-00vhXw; Thu, 20 Mar 2014 00:36:12 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 20 Mar 2014 00:36:00 +0100 Message-Id: <1395272166-687-2-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1395272166-687-1-git-send-email-andreas.faerber@web.de> References: <1395272166-687-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:LGmeGovzSszwxhoTHeZqHDsREBUhnrRXeroDmenbsAkGHczMRwN a4IAn6TUpGM5WkAtCCdWnVR5E5lzbErCOsyHX+ViPYlpv3+O3oJRRKfIbbR7A3QN18FYpsX DumuwTcCxz7XkPv+CRPRqthAa7iZcTPVZ+Mq9ULlxQj/JwBMOLIE+DVILRdGAOA9Wu/4euJ Rz6W2zM7bopzE5wHyyzcQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.14 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org Subject: [Qemu-devel] [PULL for-2.0 1/7] raven: Rename intack region to pci_intack 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 Regions added subsequently will also have the pci_ prefix. Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber --- hw/pci-host/prep.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 94fdffa..84d50ca 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -52,9 +52,9 @@ typedef struct RavenPCIState { typedef struct PRePPCIState { PCIHostState parent_obj; - MemoryRegion intack; qemu_irq irq[PCI_NUM_PINS]; PCIBus pci_bus; + MemoryRegion pci_intack; RavenPCIState pci_dev; } PREPPCIState; @@ -148,8 +148,9 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) memory_region_init_io(&h->mmcfg, OBJECT(s), &PPC_PCIIO_ops, s, "pciio", 0x00400000); memory_region_add_subregion(address_space_mem, 0x80800000, &h->mmcfg); - memory_region_init_io(&s->intack, OBJECT(s), &PPC_intack_ops, s, "pci-intack", 1); - memory_region_add_subregion(address_space_mem, 0xbffffff0, &s->intack); + memory_region_init_io(&s->pci_intack, OBJECT(s), &PPC_intack_ops, s, + "pci-intack", 1); + memory_region_add_subregion(address_space_mem, 0xbffffff0, &s->pci_intack); /* TODO Remove once realize propagates to child devices. */ object_property_set_bool(OBJECT(&s->pci_dev), true, "realized", errp);