From: Anthony Liguori <aligu...@us.ibm.com> Signed-off-by: Anthony Liguori <aligu...@us.ibm.com> Signed-off-by: Wanpeng Li <l...@linux.vnet.ibm.com>
--- hw/pc.c | 22 +++++++++++----------- hw/pc.h | 26 -------------------------- 2 files changed, 11 insertions(+), 37 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index d5a557e..5f93643 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -98,7 +98,7 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 }; static struct e820_table e820_table; struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; -void gsi_handler(void *opaque, int n, int level) +static void gsi_handler(void *opaque, int n, int level) { GSIState *s = opaque; @@ -116,7 +116,7 @@ static void ioport80_write(void *opaque, uint32_t addr, uint32_t data) /* MSDOS compatibility mode FPU exception support */ static qemu_irq ferr_irq; -void pc_register_ferr_irq(qemu_irq irq) +static void pc_register_ferr_irq(qemu_irq irq) { ferr_irq = irq; } @@ -339,7 +339,7 @@ static void pc_cmos_init_late(void *opaque) qemu_unregister_reset(pc_cmos_init_late, opaque); } -void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, +static void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, const char *boot_device, ISADevice *floppy, BusState *idebus0, BusState *idebus1, ISADevice *s) @@ -869,7 +869,7 @@ static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 }; static const int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc }; static const int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 }; -void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd) +static void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd) { static int nb_ne2k = 0; @@ -926,7 +926,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id) return dev; } -void pc_acpi_smi_interrupt(void *opaque, int irq, int level) +static void pc_acpi_smi_interrupt(void *opaque, int irq, int level) { CPUX86State *s = opaque; @@ -960,7 +960,7 @@ static CPUX86State *pc_new_cpu(const char *cpu_model) return env; } -void pc_cpus_init(const char *cpu_model) +static void pc_cpus_init(const char *cpu_model) { int i; @@ -978,7 +978,7 @@ void pc_cpus_init(const char *cpu_model) } } -void pc_memory_init(MemoryRegion *system_memory, +static void pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, @@ -1002,12 +1002,12 @@ void pc_memory_init(MemoryRegion *system_memory, } } -qemu_irq *pc_allocate_cpu_irq(void) +static qemu_irq *pc_allocate_cpu_irq(void) { return qemu_allocate_irqs(pic_irq_request, NULL, 1); } -DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) +static DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) { DeviceState *dev = NULL; @@ -1051,7 +1051,7 @@ static void cpu_request_exit(void *opaque, int irq, int level) } } -void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, +static void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **floppy, bool no_vmport) { @@ -1102,7 +1102,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, *floppy = fdctrl_init_isa(isa_bus, fd); } -void pc_pci_device_init(PCIBus *pci_bus) +static void pc_pci_device_init(PCIBus *pci_bus) { int max_bus; int bus; diff --git a/hw/pc.h b/hw/pc.h index 7348da2..89f78dd 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -80,8 +80,6 @@ typedef struct GSIState { qemu_irq ioapic_irq[IOAPIC_NUM_PINS]; } GSIState; -void gsi_handler(void *opaque, int n, int level); - /* vmport.c */ static inline void vmport_init(ISABus *bus) { @@ -103,30 +101,6 @@ void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out); /* pc.c */ extern int fd_bootchk; -void pc_register_ferr_irq(qemu_irq irq); -void pc_acpi_smi_interrupt(void *opaque, int irq, int level); - -void pc_cpus_init(const char *cpu_model); -void pc_memory_init(MemoryRegion *system_memory, - const char *kernel_filename, - const char *kernel_cmdline, - const char *initrd_filename, - ram_addr_t below_4g_mem_size, - ram_addr_t above_4g_mem_size, - MemoryRegion *rom_memory, - MemoryRegion **ram_memory); -qemu_irq *pc_allocate_cpu_irq(void); -DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); -void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, - ISADevice **floppy, - bool no_vmport); -void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); -void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, - const char *boot_device, - ISADevice *floppy, BusState *ide0, BusState *ide1, - ISADevice *s); -void pc_pci_device_init(PCIBus *pci_bus); - typedef void (*cpu_set_smm_t)(int smm, void *arg); void cpu_smm_register(cpu_set_smm_t callback, void *arg); -- 1.7.5.4