Patchwork [V5,21/29] pci_host: change the signature of pci_data_{read, write}.

login
register
mail settings
Submitter Isaku Yamahata
Date Oct. 9, 2009, 6:28 a.m.
Message ID <1255069742-15724-22-git-send-email-yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/35571/
State Under Review
Headers show

Comments

Isaku Yamahata - Oct. 9, 2009, 6:28 a.m.
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 <yamahata@valinux.co.jp>
---
 hw/pci.h      |    4 ++--
 hw/pci_host.c |    6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)
Michael S. Tsirkin - Oct. 9, 2009, 12:02 p.m.
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 <yamahata@valinux.co.jp>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  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

Patch

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);
 }