From patchwork Fri Oct 9 06:28:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 35571 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 D7D83B7BA4 for ; Fri, 9 Oct 2009 18:04:32 +1100 (EST) Received: from localhost ([127.0.0.1]:35126 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw9Wg-0008JR-0i for incoming@patchwork.ozlabs.org; Fri, 09 Oct 2009 03:04:30 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mw90M-0004DG-Py for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:31:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mw90D-00042Y-3P for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:31:03 -0400 Received: from [199.232.76.173] (port=55776 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw90A-0003zj-H5 for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:30:56 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:36128) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mw907-0001Pq-87 for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:30:51 -0400 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id 4FCEF49E2B; Fri, 9 Oct 2009 15:30:40 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1Mw8yN-000472-2v; Fri, 09 Oct 2009 15:29:03 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Fri, 9 Oct 2009 15:28:54 +0900 Message-Id: <1255069742-15724-22-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1255069742-15724-1-git-send-email-yamahata@valinux.co.jp> References: <1255069742-15724-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 V5 21/29] pci_host: change the signature of pci_data_{read, write}. 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 change the first argument, void *opaque to PCIBus *s of the pci_data_{read, write}. They aren't used as direct callback so the argument type don't have to be void*. So change it to the right type. Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin --- hw/pci.h | 4 ++-- hw/pci_host.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/pci.h b/hw/pci.h index 7711ed4..5b8f5cf 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -272,8 +272,8 @@ void pci_dev_write_config(PCIDevice *pci_dev, uint32_t config_addr, uint32_t val, int len); uint32_t pci_dev_read_config(PCIDevice *pci_dev, uint32_t config_addr, int len); -void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len); -uint32_t pci_data_read(void *opaque, uint32_t addr, int len); +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.c b/hw/pci_host.c index d827b06..87933d9 100644 --- a/hw/pci_host.c +++ b/hw/pci_host.c @@ -52,16 +52,14 @@ static inline uint32_t pci_addr_to_config(uint32_t addr) return addr & 0xff; } -void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len) +void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len) { - PCIBus *s = opaque; pci_dev_write_config(pci_addr_to_dev(s, addr), pci_addr_to_config(addr), val, len); } -uint32_t pci_data_read(void *opaque, uint32_t addr, int len) +uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len) { - PCIBus *s = opaque; return pci_dev_read_config(pci_addr_to_dev(s, addr), pci_addr_to_config(addr), len); }