Simon Horman
2009-Mar-16 01:31 UTC
[Xen-devel] [patch] 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>
---
hw/pass-through.c | 30 +++++++++++++++---------------
hw/piix4acpi.c | 4 ++--
2 files changed, 17 insertions(+), 17 deletions(-)
Index: ioemu-remote/hw/pass-through.c
==================================================================---
ioemu-remote.orig/hw/pass-through.c 2009-03-16 12:04:30.000000000 +1100
+++ ioemu-remote/hw/pass-through.c 2009-03-16 12:13:07.000000000 +1100
@@ -934,8 +934,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;
@@ -993,8 +993,8 @@ void pt_iomem_map(PCIDevice *d, int i, u
}
/* 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;
@@ -1039,8 +1039,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;
@@ -1060,8 +1060,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;
@@ -1607,7 +1607,7 @@ static void pt_unregister_regions(struct
}
-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;
@@ -1637,7 +1637,7 @@ uint8_t find_cap_offset(struct pci_dev *
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;
@@ -1775,7 +1775,7 @@ static void pt_bar_mapping(struct pt_dev
}
/* 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;
@@ -1846,7 +1846,7 @@ static void pt_aer_reg_restore(struct pt
}
/* 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;
@@ -2036,7 +2036,7 @@ out:
qemu_free_timer(pm_state->pm_timer);
}
-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;
@@ -3552,7 +3552,7 @@ static int pt_pmcsr_reg_restore(struct p
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)
@@ -3718,7 +3718,7 @@ out:
return assigned_device;
}
-int unregister_real_device(int php_slot)
+static int unregister_real_device(int php_slot)
{
struct php_dev *php_dev;
struct pci_dev *pci_dev;
Index: ioemu-remote/hw/piix4acpi.c
==================================================================---
ioemu-remote.orig/hw/piix4acpi.c 2009-03-16 12:13:35.000000000 +1100
+++ ioemu-remote/hw/piix4acpi.c 2009-03-16 12:16:11.000000000 +1100
@@ -72,14 +72,14 @@ typedef struct GPEState {
} GPEState;
-GPEState gpe_state;
+static GPEState gpe_state;
typedef struct PHPSlots {
uint8_t status[PHP_SLOT_LEN]; /* Apaptor stats */
uint8_t plug_evt; /* slot|event slot:0-no event;1-1st.
event:0-remove;1-add */
} PHPSlots;
-PHPSlots php_slots;
+static PHPSlots php_slots;
int s3_shutdown_flag;
static qemu_irq sci_irq;
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel