From patchwork Wed Aug 20 06:53:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Knut Omang X-Patchwork-Id: 381553 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 0A3DA14013B for ; Wed, 20 Aug 2014 16:55:02 +1000 (EST) Received: from localhost ([::1]:54258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJznQ-0003iR-0D for incoming@patchwork.ozlabs.org; Wed, 20 Aug 2014 02:55:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJzm5-0001km-Dx for qemu-devel@nongnu.org; Wed, 20 Aug 2014 02:53:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJzly-00032v-C3 for qemu-devel@nongnu.org; Wed, 20 Aug 2014 02:53:37 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:49709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJzly-00032m-5Q for qemu-devel@nongnu.org; Wed, 20 Aug 2014 02:53:30 -0400 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s7K6rKr4000475 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 20 Aug 2014 06:53:21 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s7K6rIbn029505 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Wed, 20 Aug 2014 06:53:19 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s7K6rIOp028052; Wed, 20 Aug 2014 06:53:18 GMT Received: from [10.175.255.98] (/10.175.255.98) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 19 Aug 2014 23:53:17 -0700 Message-ID: <1408517593.25437.102.camel@ori.omang.mine.nu> From: Knut Omang To: qemu-devel@nongnu.org Date: Wed, 20 Aug 2014 08:53:13 +0200 X-Mailer: Evolution 3.8.5 (3.8.5-2.fc19) Mime-Version: 1.0 X-Source-IP: acsinet21.oracle.com [141.146.126.237] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 156.151.31.81 Cc: Marcel Apfelbaum , Alexey Kardashevskiy , Juan Quintela , Markus Armbruster , Gonglei , "Michael S.Tsirkin" , Igor Mammedov , Paolo Bonzini Subject: [Qemu-devel] [PATCH 2/3] ioh3420: Provide a unique bus name and an interrupt mapping function 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 A unique bus name is necessary to be able to refer to each instance from the command line and monitors. Signed-off-by: Knut Omang --- hw/pci-bridge/ioh3420.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c index 7cd87fc..8f6c8b0 100644 --- a/hw/pci-bridge/ioh3420.c +++ b/hw/pci-bridge/ioh3420.c @@ -95,6 +95,9 @@ static int ioh3420_initfn(PCIDevice *d) PCIEPort *p = PCIE_PORT(d); PCIESlot *s = PCIE_SLOT(d); int rc; + char tmp[100]; + sprintf(tmp, "pcie_port.%d", s->slot); + pci_bridge_map_irq(br, g_strdup(tmp), pci_swizzle_map_irq_fn); rc = pci_bridge_initfn(d, TYPE_PCIE_BUS); if (rc < 0) { @@ -154,6 +157,7 @@ static void ioh3420_exitfn(PCIDevice *d) pcie_cap_exit(d); msi_uninit(d); pci_bridge_exitfn(d); + g_free((char*)br->bus_name); } PCIESlot *ioh3420_init(PCIBus *bus, int devfn, bool multifunction,