From patchwork Fri Nov 13 04:29:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 38306 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 8908DB7BC1 for ; Fri, 13 Nov 2009 15:36:58 +1100 (EST) Received: from localhost ([127.0.0.1]:35972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8nu2-0000Iz-TL for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2009 23:36:54 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8ntN-0000Gu-Jm for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8ntK-0000Db-1H for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:13 -0500 Received: from [199.232.76.173] (port=50444 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8ntJ-0000DX-Nd for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:09 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:35510) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8ntI-0002dF-UJ for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:09 -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 0A9234A411; Fri, 13 Nov 2009 13:36:01 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1N8nnI-0000wC-Gh; Fri, 13 Nov 2009 13:29:56 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Fri, 13 Nov 2009 13:29:38 +0900 Message-Id: <1258086596-3584-3-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1258086596-3584-1-git-send-email-yamahata@valinux.co.jp> References: <1258086596-3584-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 V2 02/20] pci: move pci_data_{read, write}() declaration from pci.h to pci_host.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 Now pci host stuff has been moved from pci.[hc] to pci_host.[hc] so the declaration of pci_data_{read, write}() should be in pci_host.h This patch moves them from pci.h to pci_host.h for consistency. Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin --- hw/pci.h | 2 -- hw/pci_host.h | 3 +++ hw/sh_pci.c | 1 + hw/versatile_pci.c | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/pci.h b/hw/pci.h index 9a56d0d..d3378d3 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -293,8 +293,6 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, const char *default_devaddr); PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model, const char *default_devaddr); -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); int pci_bus_num(PCIBus *s); void pci_for_each_device(PCIBus *bus, int bus_num, void (*fn)(PCIBus *bus, PCIDevice *d)); PCIBus *pci_find_host_bus(int domain); diff --git a/hw/pci_host.h b/hw/pci_host.h index e5e877f..7cfa693 100644 --- a/hw/pci_host.h +++ b/hw/pci_host.h @@ -36,6 +36,9 @@ typedef struct { 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); + /* for mmio */ int pci_host_config_register_io_memory(PCIHostState *s); int pci_host_config_register_io_memory_noswap(PCIHostState *s); diff --git a/hw/sh_pci.c b/hw/sh_pci.c index 4277b01..7bdc8db 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c @@ -24,6 +24,7 @@ #include "hw.h" #include "sh.h" #include "pci.h" +#include "pci_host.h" #include "bswap.h" typedef struct { diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index a0d7d07..153c651 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c @@ -9,6 +9,7 @@ #include "sysbus.h" #include "pci.h" +#include "pci_host.h" typedef struct { SysBusDevice busdev;