From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Wed, 25 Mar 2009 11:25:32 +0000 (+0000)
Subject: ioemu: make more of passthrough.c and piix4acpi.c static
X-Git-Tag: xen-3.4.0-rc2~29
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6a19a189217acbde4bbdcc6eccae621b5705473a;p=qemu-xen-3.4-testing.git

ioemu: make more of passthrough.c and piix4acpi.c static

Make more of passthrough.c and piix4acpi.c static

Signed-off-by: Simon Horman <horms@verge.net.au>
---

diff --git a/hw/pass-through.c b/hw/pass-through.c
index f5cdcdd3..260cb8d6 100644
--- a/hw/pass-through.c
+++ b/hw/pass-through.c
@@ -935,8 +935,8 @@ int bdf_to_slot(char *bdf_str)
 }
 
 /* Being called each time a mmio region has been updated */
-void pt_iomem_map(PCIDevice *d, int i, uint32_t e_phys, uint32_t e_size,
-                  int type)
+static void pt_iomem_map(PCIDevice *d, int i, uint32_t e_phys, uint32_t e_size,
+                         int type)
 {
     struct pt_dev *assigned_device  = (struct pt_dev *)d;
     uint32_t old_ebase = assigned_device->bases[i].e_physbase;
@@ -994,8 +994,8 @@ void pt_iomem_map(PCIDevice *d, int i, uint32_t e_phys, uint32_t e_size,
 }
 
 /* Being called each time a pio region has been updated */
-void pt_ioport_map(PCIDevice *d, int i,
-                   uint32_t e_phys, uint32_t e_size, int type)
+static void pt_ioport_map(PCIDevice *d, int i,
+                          uint32_t e_phys, uint32_t e_size, int type)
 {
     struct pt_dev *assigned_device  = (struct pt_dev *)d;
     uint32_t old_ebase = assigned_device->bases[i].e_physbase;
@@ -1040,8 +1040,8 @@ void pt_ioport_map(PCIDevice *d, int i,
 }
 
 /* find emulate register group entry */
-struct pt_reg_grp_tbl* pt_find_reg_grp(
-        struct pt_dev *ptdev, uint32_t address)
+static struct pt_reg_grp_tbl* pt_find_reg_grp(struct pt_dev *ptdev,
+                                              uint32_t address)
 {
     struct pt_reg_grp_tbl* reg_grp_entry = NULL;
 
@@ -1061,8 +1061,8 @@ out:
 }
 
 /* find emulate register entry */
-struct pt_reg_tbl* pt_find_reg(
-        struct pt_reg_grp_tbl* reg_grp, uint32_t address)
+static struct pt_reg_tbl* pt_find_reg(struct pt_reg_grp_tbl* reg_grp,
+                                      uint32_t address)
 {
     struct pt_reg_tbl* reg_entry = NULL;
     struct pt_reg_info_tbl* reg = NULL;
@@ -1625,7 +1625,7 @@ static void pt_unregister_regions(struct pt_dev *assigned_device)
 
 }
 
-uint8_t find_cap_offset(struct pci_dev *pci_dev, uint8_t cap)
+static uint8_t find_cap_offset(struct pci_dev *pci_dev, uint8_t cap)
 {
     int id;
     int max_cap = 48;
@@ -1655,7 +1655,7 @@ uint8_t find_cap_offset(struct pci_dev *pci_dev, uint8_t cap)
     return 0;
 }
 
-uint32_t find_ext_cap_offset(struct pci_dev *pci_dev, uint32_t cap)
+static uint32_t find_ext_cap_offset(struct pci_dev *pci_dev, uint32_t cap)
 {
     uint32_t header = 0;
     int max_cap = 480;
@@ -1794,7 +1794,7 @@ static void pt_bar_mapping(struct pt_dev *ptdev, int io_enable, int mem_enable)
 }
 
 /* check power state transition */
-int check_power_state(struct pt_dev *ptdev)
+static int check_power_state(struct pt_dev *ptdev)
 {
     struct pt_pm_info *pm_state = ptdev->pm_state;
     PCIDevice *d = &ptdev->dev;
@@ -1865,7 +1865,7 @@ static void pt_aer_reg_restore(struct pt_dev *ptdev)
 }
 
 /* reset Interrupt and I/O resource  */
-void pt_reset_interrupt_and_io_mapping(struct pt_dev *ptdev)
+static void pt_reset_interrupt_and_io_mapping(struct pt_dev *ptdev)
 {
     PCIDevice *d = &ptdev->dev;
     PCIIORegion *r;
@@ -2056,7 +2056,7 @@ out:
     pm_state->pm_timer = NULL;
 }
 
-void pt_default_power_transition(void *opaque)
+static void pt_default_power_transition(void *opaque)
 {
     struct pt_dev *ptdev = opaque;
     struct pt_pm_info *pm_state = ptdev->pm_state;
@@ -3611,7 +3611,7 @@ static int pt_pmcsr_reg_restore(struct pt_dev *ptdev,
     return 0;
 }
 
-struct pt_dev * register_real_device(PCIBus *e_bus,
+static struct pt_dev * register_real_device(PCIBus *e_bus,
         const char *e_dev_name, int e_devfn, uint8_t r_bus, uint8_t r_dev,
         uint8_t r_func, uint32_t machine_irq, struct pci_access *pci_access,
         char *opt)
@@ -3796,7 +3796,7 @@ out:
     return assigned_device;
 }
 
-int unregister_real_device(int slot)
+static int unregister_real_device(int slot)
 {
     struct php_dev *php_dev;
     struct pci_dev *pci_dev;
diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c
index 4d80e08f..b4a0c1a3 100644
--- a/hw/piix4acpi.c
+++ b/hw/piix4acpi.c
@@ -72,7 +72,7 @@ typedef struct GPEState {
 
 } GPEState;
 
-GPEState gpe_state;
+static GPEState gpe_state;
 
 typedef struct PHPSlots {
     uint8_t status[NR_PCI_DEV]; /* Apaptor stats */
@@ -82,7 +82,7 @@ typedef struct PHPSlots {
                                  * PSTB in ASL */
 } PHPSlots;
 
-PHPSlots php_slots;
+static PHPSlots php_slots;
 int s3_shutdown_flag;
 static qemu_irq sci_irq;