From patchwork Thu Mar 14 22:00:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 227810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C2BFD2C00DA for ; Fri, 15 Mar 2013 09:01:29 +1100 (EST) Received: from localhost ([::1]:60973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGDI-0001KV-18 for incoming@patchwork.ozlabs.org; Thu, 14 Mar 2013 18:01:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGCw-0001EZ-47 for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGGCq-0001oO-Tz for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23896) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGCq-0001oJ-MX for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:00 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2EM10um011027 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Mar 2013 18:01:00 -0400 Received: from bling.home (ovpn-113-45.phx2.redhat.com [10.3.113.45]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2EM0xjM006241; Thu, 14 Mar 2013 18:00:59 -0400 To: mst@redhat.com From: Alex Williamson Date: Thu, 14 Mar 2013 16:00:59 -0600 Message-ID: <20130314220058.10566.49073.stgit@bling.home> In-Reply-To: <20130314215150.10566.37912.stgit@bling.home> References: <20130314215150.10566.37912.stgit@bling.home> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 1/7] pci: Create and register a new PCI Express TypeInfo 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 This will allow us to differentiate Express and Legacy buses. Signed-off-by: Alex Williamson --- hw/pci/pci.c | 6 ++++++ hw/pci/pci_bus.h | 1 + 2 files changed, 7 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index f24c389..e74b43d 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -75,6 +75,11 @@ static const TypeInfo pci_bus_info = { .class_init = pci_bus_class_init, }; +static const TypeInfo pcie_bus_info = { + .name = TYPE_PCIE_BUS, + .parent = TYPE_PCI_BUS, +}; + static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num); static void pci_update_mappings(PCIDevice *d); static void pci_set_irq(void *opaque, int irq_num, int level); @@ -2231,6 +2236,7 @@ static const TypeInfo pci_device_type_info = { static void pci_register_types(void) { type_register_static(&pci_bus_info); + type_register_static(&pcie_bus_info); type_register_static(&pci_device_type_info); } diff --git a/hw/pci/pci_bus.h b/hw/pci/pci_bus.h index aef559a..6d3155f 100644 --- a/hw/pci/pci_bus.h +++ b/hw/pci/pci_bus.h @@ -10,6 +10,7 @@ #define TYPE_PCI_BUS "PCI" #define PCI_BUS(obj) OBJECT_CHECK(PCIBus, (obj), TYPE_PCI_BUS) +#define TYPE_PCIE_BUS "PCIE" struct PCIBus { BusState qbus;