[Qemu-devel] [PATCH V6 22/32] pci_host: change the signature of pci_data_{read, write}.

[Isaku Yamahata]

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 <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
---
 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 b16f8f8..4f4266d 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -265,8 +265,8 @@ 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(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 351ade4..f4518dc 100644
--- a/hw/pci_host.c
+++ b/hw/pci_host.c
@@ -52,9 +52,8 @@ static inline uint32_t pci_addr_to_config(uint32_t addr)
     return addr & (PCI_CONFIG_SPACE_SIZE - 1);
 }
 
-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;
     PCIDevice *pci_dev = pci_addr_to_dev(s, addr);
     uint32_t config_addr = pci_addr_to_config(addr);
 
@@ -66,9 +65,8 @@ void pci_data_write(void *opaque, uint32_t addr, uint32_t 
val, int len)
     pci_dev->config_write(pci_dev, 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;
     PCIDevice *pci_dev = pci_addr_to_dev(s, addr);
     uint32_t config_addr = pci_addr_to_config(addr);
     uint32_t val;
-- 
1.6.0.2