Patchwork [v2,5/5] pci: use uint8_t for devfn_min

login
register
mail settings
Submitter Isaku Yamahata
Date Jan. 27, 2011, 6:56 a.m.
Message ID <4dfae7d2e88a4459b24dfc60d07bfb5e55963545.1296111201.git.yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/80603/
State New
Headers show

Comments

Isaku Yamahata - Jan. 27, 2011, 6:56 a.m.
use uint8_t for devfn_min instead of int.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 hw/pci.c           |    6 +++---
 hw/pci.h           |    6 +++---
 hw/pci_internals.h |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
Michael S. Tsirkin - Jan. 27, 2011, 7:32 a.m.
On Thu, Jan 27, 2011 at 03:56:39PM +0900, Isaku Yamahata wrote:
> use uint8_t for devfn_min instead of int.
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

Applied, thanks.

> ---
>  hw/pci.c           |    6 +++---
>  hw/pci.h           |    6 +++---
>  hw/pci_internals.h |    2 +-
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/hw/pci.c b/hw/pci.c
> index e25bf7a..6725f50 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -256,7 +256,7 @@ int pci_find_domain(const PCIBus *bus)
>  }
>  
>  void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
> -                         const char *name, int devfn_min)
> +                         const char *name, uint8_t devfn_min)
>  {
>      qbus_create_inplace(&bus->qbus, &pci_bus_info, parent, name);
>      assert(PCI_FUNC(devfn_min) == 0);
> @@ -269,7 +269,7 @@ void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
>      vmstate_register(NULL, -1, &vmstate_pcibus, bus);
>  }
>  
> -PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min)
> +PCIBus *pci_bus_new(DeviceState *parent, const char *name, uint8_t devfn_min)
>  {
>      PCIBus *bus;
>  
> @@ -303,7 +303,7 @@ void pci_bus_set_mem_base(PCIBus *bus, target_phys_addr_t base)
>  
>  PCIBus *pci_register_bus(DeviceState *parent, const char *name,
>                           pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
> -                         void *irq_opaque, int devfn_min, int nirq)
> +                         void *irq_opaque, uint8_t devfn_min, int nirq)
>  {
>      PCIBus *bus;
>  
> diff --git a/hw/pci.h b/hw/pci.h
> index 2266a47..2af709a 100644
> --- a/hw/pci.h
> +++ b/hw/pci.h
> @@ -230,14 +230,14 @@ typedef enum {
>  typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev,
>                                PCIHotplugState state);
>  void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
> -                         const char *name, int devfn_min);
> -PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min);
> +                         const char *name, uint8_t devfn_min);
> +PCIBus *pci_bus_new(DeviceState *parent, const char *name, uint8_t devfn_min);
>  void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
>                    void *irq_opaque, int nirq);
>  void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug, DeviceState *dev);
>  PCIBus *pci_register_bus(DeviceState *parent, const char *name,
>                           pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
> -                         void *irq_opaque, int devfn_min, int nirq);
> +                         void *irq_opaque, uint8_t devfn_min, int nirq);
>  void pci_device_reset(PCIDevice *dev);
>  void pci_bus_reset(PCIBus *bus);
>  
> diff --git a/hw/pci_internals.h b/hw/pci_internals.h
> index efaefcd..fbe1866 100644
> --- a/hw/pci_internals.h
> +++ b/hw/pci_internals.h
> @@ -16,7 +16,7 @@ extern struct BusInfo pci_bus_info;
>  
>  struct PCIBus {
>      BusState qbus;
> -    int devfn_min;
> +    uint8_t devfn_min;
>      pci_set_irq_fn set_irq;
>      pci_map_irq_fn map_irq;
>      pci_hotplug_fn hotplug;
> -- 
> 1.7.1.1

Patch

diff --git a/hw/pci.c b/hw/pci.c
index e25bf7a..6725f50 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -256,7 +256,7 @@  int pci_find_domain(const PCIBus *bus)
 }
 
 void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
-                         const char *name, int devfn_min)
+                         const char *name, uint8_t devfn_min)
 {
     qbus_create_inplace(&bus->qbus, &pci_bus_info, parent, name);
     assert(PCI_FUNC(devfn_min) == 0);
@@ -269,7 +269,7 @@  void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
     vmstate_register(NULL, -1, &vmstate_pcibus, bus);
 }
 
-PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min)
+PCIBus *pci_bus_new(DeviceState *parent, const char *name, uint8_t devfn_min)
 {
     PCIBus *bus;
 
@@ -303,7 +303,7 @@  void pci_bus_set_mem_base(PCIBus *bus, target_phys_addr_t base)
 
 PCIBus *pci_register_bus(DeviceState *parent, const char *name,
                          pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
-                         void *irq_opaque, int devfn_min, int nirq)
+                         void *irq_opaque, uint8_t devfn_min, int nirq)
 {
     PCIBus *bus;
 
diff --git a/hw/pci.h b/hw/pci.h
index 2266a47..2af709a 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -230,14 +230,14 @@  typedef enum {
 typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev,
                               PCIHotplugState state);
 void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
-                         const char *name, int devfn_min);
-PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min);
+                         const char *name, uint8_t devfn_min);
+PCIBus *pci_bus_new(DeviceState *parent, const char *name, uint8_t devfn_min);
 void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
                   void *irq_opaque, int nirq);
 void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug, DeviceState *dev);
 PCIBus *pci_register_bus(DeviceState *parent, const char *name,
                          pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
-                         void *irq_opaque, int devfn_min, int nirq);
+                         void *irq_opaque, uint8_t devfn_min, int nirq);
 void pci_device_reset(PCIDevice *dev);
 void pci_bus_reset(PCIBus *bus);
 
diff --git a/hw/pci_internals.h b/hw/pci_internals.h
index efaefcd..fbe1866 100644
--- a/hw/pci_internals.h
+++ b/hw/pci_internals.h
@@ -16,7 +16,7 @@  extern struct BusInfo pci_bus_info;
 
 struct PCIBus {
     BusState qbus;
-    int devfn_min;
+    uint8_t devfn_min;
     pci_set_irq_fn set_irq;
     pci_map_irq_fn map_irq;
     pci_hotplug_fn hotplug;