From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MwEDK-0006PF-Qc for qemu-devel@nongnu.org; Fri, 09 Oct 2009 08:04:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MwEDG-0006LU-AA for qemu-devel@nongnu.org; Fri, 09 Oct 2009 08:04:50 -0400 Received: from [199.232.76.173] (port=36935 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MwEDG-0006LR-7Z for qemu-devel@nongnu.org; Fri, 09 Oct 2009 08:04:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26099) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MwEDF-00013e-N6 for qemu-devel@nongnu.org; Fri, 09 Oct 2009 08:04:45 -0400 Date: Fri, 9 Oct 2009 14:02:39 +0200 From: "Michael S. Tsirkin" Message-ID: <20091009120239.GD12027@redhat.com> References: <1255069742-15724-1-git-send-email-yamahata@valinux.co.jp> <1255069742-15724-22-git-send-email-yamahata@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1255069742-15724-22-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH V5 21/29] pci_host: change the signature of pci_data_{read, write}. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: qemu-devel@nongnu.org On Fri, Oct 09, 2009 at 03:28:54PM +0900, Isaku Yamahata wrote: > 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); > } > -- > 1.6.0.2