On Sat, Sep 8, 2012 at 11:26 AM, Aurelien Jarno <aurel...@aurel32.net> wrote:
> This better explains what is this function about. Adjust all callers.
>
> Cc: Richard Henderson <r...@twiddle.net>
> Cc: Alexander Graf <ag...@suse.de>
> Cc: Andreas Färber <andreas.faer...@web.de>
> Cc: David Gibson <da...@gibson.dropbear.id.au>
> Cc: Blue Swirl <blauwir...@gmail.com>
Acked-by: Blue Swirl <blauwir...@gmail.com>
> Cc: Anthony Liguori <aligu...@us.ibm.com>
> Signed-off-by: Aurelien Jarno <aurel...@aurel32.net>
> ---
> hw/alpha_pci.c | 2 +-
> hw/mips_malta.c | 2 +-
> hw/pc.c | 2 +-
> hw/ppc_newworld.c | 2 +-
> hw/ppc_oldworld.c | 2 +-
> hw/ppc_prep.c | 2 +-
> hw/spapr.c | 2 +-
> hw/sun4u.c | 2 +-
> hw/vga-pci.c | 6 +++---
> hw/vga-pci.h | 2 +-
> 10 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/hw/alpha_pci.c b/hw/alpha_pci.c
> index ea546f8..0352e72 100644
> --- a/hw/alpha_pci.c
> +++ b/hw/alpha_pci.c
> @@ -128,6 +128,6 @@ void alpha_pci_vga_setup(PCIBus *pci_bus)
> /* If VGA is enabled at all, and one of the above didn't work, then
> fallback to Standard VGA. */
> if (vga_interface_type != VGA_NONE) {
> - pci_vga_init(pci_bus);
> + pci_std_vga_init(pci_bus);
> }
> }
> diff --git a/hw/mips_malta.c b/hw/mips_malta.c
> index ad23f26..c39dee5 100644
> --- a/hw/mips_malta.c
> +++ b/hw/mips_malta.c
> @@ -992,7 +992,7 @@ void mips_malta_init (ram_addr_t ram_size,
> } else if (vmsvga_enabled) {
> pci_vmsvga_init(pci_bus);
> } else if (std_vga_enabled) {
> - pci_vga_init(pci_bus);
> + pci_std_vga_init(pci_bus);
> }
> }
>
> diff --git a/hw/pc.c b/hw/pc.c
> index 112739a..8736a30 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1041,7 +1041,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus
> *pci_bus)
> #endif
> } else if (std_vga_enabled) {
> if (pci_bus) {
> - dev = pci_vga_init(pci_bus);
> + dev = pci_std_vga_init(pci_bus);
> } else {
> dev = isa_vga_init(isa_bus);
> }
> diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
> index e95cfe8..84af948 100644
> --- a/hw/ppc_newworld.c
> +++ b/hw/ppc_newworld.c
> @@ -330,7 +330,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
> machine_arch = ARCH_MAC99;
> }
> /* init basic PC hardware */
> - pci_vga_init(pci_bus);
> + pci_std_vga_init(pci_bus);
>
> escc_mem = escc_init(0, pic[0x25], pic[0x24],
> serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);
> diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
> index 1dcd8a6..8267eb4 100644
> --- a/hw/ppc_oldworld.c
> +++ b/hw/ppc_oldworld.c
> @@ -250,7 +250,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
> pci_bus = pci_grackle_init(0xfec00000, pic,
> get_system_memory(),
> get_system_io());
> - pci_vga_init(pci_bus);
> + pci_std_vga_init(pci_bus);
>
> escc_mem = escc_init(0, pic[0x0f], pic[0x10], serial_hds[0],
> serial_hds[1], ESCC_CLOCK, 4);
> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
> index 592b7b2..1fa7609 100644
> --- a/hw/ppc_prep.c
> +++ b/hw/ppc_prep.c
> @@ -611,7 +611,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
> memory_region_add_subregion(sysmem, 0x80000000, PPC_io_memory);
>
> /* init basic PC hardware */
> - pci_vga_init(pci_bus);
> + pci_std_vga_init(pci_bus);
>
> if (serial_hds[0])
> serial_isa_init(isa_bus, 0, serial_hds[0]);
> diff --git a/hw/spapr.c b/hw/spapr.c
> index c34b767..80735d6 100644
> --- a/hw/spapr.c
> +++ b/hw/spapr.c
> @@ -590,7 +590,7 @@ static int spapr_vga_init(PCIBus *pci_bus)
> {
> switch (vga_interface_type) {
> case VGA_STD:
> - pci_vga_init(pci_bus);
> + pci_std_vga_init(pci_bus);
> return 1;
> case VGA_NONE:
> return 0;
> diff --git a/hw/sun4u.c b/hw/sun4u.c
> index 07cd042..cca090f 100644
> --- a/hw/sun4u.c
> +++ b/hw/sun4u.c
> @@ -821,7 +821,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
> ivec_irqs = qemu_allocate_irqs(cpu_set_ivec_irq, env, IVEC_MAX);
> pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs,
> &pci_bus2,
> &pci_bus3, &pbm_irqs);
> - pci_vga_init(pci_bus);
> + pci_std_vga_init(pci_bus);
>
> // XXX Should be pci_bus3
> isa_bus = pci_ebus_init(pci_bus, -1, pbm_irqs);
> diff --git a/hw/vga-pci.c b/hw/vga-pci.c
> index 9abbada..992ffd9 100644
> --- a/hw/vga-pci.c
> +++ b/hw/vga-pci.c
> @@ -47,7 +47,7 @@ static const VMStateDescription vmstate_vga_pci = {
> }
> };
>
> -static int pci_vga_initfn(PCIDevice *dev)
> +static int pci_std_vga_initfn(PCIDevice *dev)
> {
> PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, dev);
> VGACommonState *s = &d->vga;
> @@ -70,7 +70,7 @@ static int pci_vga_initfn(PCIDevice *dev)
> return 0;
> }
>
> -DeviceState *pci_vga_init(PCIBus *bus)
> +DeviceState *pci_std_vga_init(PCIBus *bus)
> {
> return &pci_create_simple(bus, -1, "VGA")->qdev;
> }
> @@ -86,7 +86,7 @@ static void vga_class_init(ObjectClass *klass, void *data)
> PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
>
> k->no_hotplug = 1;
> - k->init = pci_vga_initfn;
> + k->init = pci_std_vga_initfn;
> k->romfile = "vgabios-stdvga.bin";
> k->vendor_id = PCI_VENDOR_ID_QEMU;
> k->device_id = PCI_DEVICE_ID_QEMU_VGA;
> diff --git a/hw/vga-pci.h b/hw/vga-pci.h
> index 49abf13..d111cdc 100644
> --- a/hw/vga-pci.h
> +++ b/hw/vga-pci.h
> @@ -4,7 +4,7 @@
> #include "qemu-common.h"
>
> /* vga-pci.c */
> -DeviceState *pci_vga_init(PCIBus *bus);
> +DeviceState *pci_std_vga_init(PCIBus *bus);
>
> /* cirrus_vga.c */
> DeviceState *pci_cirrus_vga_init(PCIBus *bus);
> --
> 1.7.10.4
>
