From patchwork Thu Mar 14 22:01:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 227813 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 986352C00DB for ; Fri, 15 Mar 2013 09:02:40 +1100 (EST) Received: from localhost ([::1]:36214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGEQ-0003D9-Od for incoming@patchwork.ozlabs.org; Thu, 14 Mar 2013 18:02:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGD0-0001JU-2A for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGGCy-0001pP-Fz for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13302) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGCy-0001pI-9T for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:08 -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 r2EM164i008207 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Mar 2013 18:01:07 -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 r2EM154V006344; Thu, 14 Mar 2013 18:01:05 -0400 To: mst@redhat.com From: Alex Williamson Date: Thu, 14 Mar 2013 16:01:05 -0600 Message-ID: <20130314220105.10566.91902.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 2/7] pci: Move PCI and PCIE type defines 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 Move these so that we can reference them from a more common header instead of including pci_bus.h everywhere. Signed-off-by: Alex Williamson --- hw/pci/pci.h | 5 +++++ hw/pci/pci_bus.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci.h b/hw/pci/pci.h index d837a65..37fb522 100644 --- a/hw/pci/pci.h +++ b/hw/pci/pci.h @@ -339,6 +339,11 @@ typedef enum { typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev, PCIHotplugState state); + +#define TYPE_PCI_BUS "PCI" +#define PCI_BUS(obj) OBJECT_CHECK(PCIBus, (obj), TYPE_PCI_BUS) +#define TYPE_PCIE_BUS "PCIE" + void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, const char *name, MemoryRegion *address_space_mem, diff --git a/hw/pci/pci_bus.h b/hw/pci/pci_bus.h index 6d3155f..6ee443c 100644 --- a/hw/pci/pci_bus.h +++ b/hw/pci/pci_bus.h @@ -8,10 +8,6 @@ * use accessor functions in pci.h, pci_bridge.h */ -#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; PCIDMAContextFunc dma_context_fn;