From patchwork Thu Nov 12 05:58:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 38218 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 80E50B7093 for ; Thu, 12 Nov 2009 17:57:53 +1100 (EST) Received: from localhost ([127.0.0.1]:42585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8Tcr-0000zL-KX for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2009 01:57:50 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8Snt-0000bh-Dv for qemu-devel@nongnu.org; Thu, 12 Nov 2009 01:05:09 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8Snk-0000Tn-Ez for qemu-devel@nongnu.org; Thu, 12 Nov 2009 01:05:05 -0500 Received: from [199.232.76.173] (port=53906 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8Snj-0000Sj-62 for qemu-devel@nongnu.org; Thu, 12 Nov 2009 01:04:59 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:53593) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8Sni-0001E0-D9 for qemu-devel@nongnu.org; Thu, 12 Nov 2009 01:04:58 -0500 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id 474234A40F; Thu, 12 Nov 2009 15:04:54 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1N8Shl-0006cN-1i; Thu, 12 Nov 2009 14:58:49 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Thu, 12 Nov 2009 14:58:41 +0900 Message-Id: <1258005528-25383-14-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1258005528-25383-1-git-send-email-yamahata@valinux.co.jp> References: <1258005528-25383-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 13/20] pci: move typedef, PCIHostState, PCIExpressHost to qemu-common.h. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch moves two typedefs, PCIHostState and PCIExpressHost to qemu-common.h for consistency as PCIBus and PCIDevice are typedefed in qemu-common.h. Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin --- hw/pci_host.h | 4 ++-- hw/pcie_host.h | 4 ++-- qemu-common.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/pci_host.h b/hw/pci_host.h index cf3a339..a006687 100644 --- a/hw/pci_host.h +++ b/hw/pci_host.h @@ -30,11 +30,11 @@ #include "sysbus.h" -typedef struct { +struct PCIHostState { SysBusDevice busdev; uint32_t config_reg; PCIBus *bus; -} PCIHostState; +}; void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len); uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len); diff --git a/hw/pcie_host.h b/hw/pcie_host.h index a7771c9..7754ac9 100644 --- a/hw/pcie_host.h +++ b/hw/pcie_host.h @@ -24,7 +24,7 @@ #include "pci_host.h" -typedef struct { +struct PCIExpressHost { PCIHostState pci; /* express part */ @@ -37,7 +37,7 @@ typedef struct { /* result of cpu_register_io_memory() to map MMCONFIG area */ int mmio_index; -} PCIExpressHost; +}; int pcie_host_init(PCIExpressHost *e); void pcie_host_mmcfg_unmap(PCIExpressHost *e); diff --git a/qemu-common.h b/qemu-common.h index b779cfe..8ecac61 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -198,6 +198,8 @@ typedef struct i2c_bus i2c_bus; typedef struct i2c_slave i2c_slave; typedef struct SMBusDevice SMBusDevice; typedef struct QEMUTimer QEMUTimer; +typedef struct PCIHostState PCIHostState; +typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIBus PCIBus; typedef struct PCIDevice PCIDevice; typedef struct SerialState SerialState;