mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vga: rename pci_vga_init() into pci_std_vga_init()

Browse Source 
This better explains what is this function about. Adjust all callers.

Cc: Alexander Graf <agraf@suse.de>
Cc: Andreas Färber <andreas.faerber@web.de>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Acked-by: Richard Henderson <rth@twiddle.net>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
Acked-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2012-09-08 11:38:41 +02:00
parent 626cd050e2
commit a1e472119a
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/alpha_pci.c
View File

@ -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 /* If VGA is enabled at all, and one of the above didn't work, then
fallback to Standard VGA. */ fallback to Standard VGA. */
if (vga_interface_type != VGA_NONE) { if (vga_interface_type != VGA_NONE) {
pci_vga_init(pci_bus); pci_std_vga_init(pci_bus);
} }
} }

2
hw/mips_malta.c
View File

@ -992,7 +992,7 @@ void mips_malta_init (ram_addr_t ram_size,
} else if (vmsvga_enabled) { } else if (vmsvga_enabled) {
pci_vmsvga_init(pci_bus); pci_vmsvga_init(pci_bus);
} else if (std_vga_enabled) { } else if (std_vga_enabled) {
pci_vga_init(pci_bus); pci_std_vga_init(pci_bus);
} }
} }

2
hw/pc.c
View File

@ -1014,7 +1014,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
#endif #endif
} else if (std_vga_enabled) { } else if (std_vga_enabled) {
if (pci_bus) { if (pci_bus) {
dev = pci_vga_init(pci_bus); dev = pci_std_vga_init(pci_bus);
} else { } else {
dev = isa_vga_init(isa_bus); dev = isa_vga_init(isa_bus);
} }

2
hw/ppc_newworld.c
View File

@ -330,7 +330,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
machine_arch = ARCH_MAC99; machine_arch = ARCH_MAC99;
} }
/* init basic PC hardware */ /* init basic PC hardware */
pci_vga_init(pci_bus); pci_std_vga_init(pci_bus);
escc_mem = escc_init(0, pic[0x25], pic[0x24], escc_mem = escc_init(0, pic[0x25], pic[0x24],
serial_hds[0], serial_hds[1], ESCC_CLOCK, 4); serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);

2
hw/ppc_oldworld.c
View File

@ -250,7 +250,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
pci_bus = pci_grackle_init(0xfec00000, pic, pci_bus = pci_grackle_init(0xfec00000, pic,
get_system_memory(), get_system_memory(),
get_system_io()); 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], escc_mem = escc_init(0, pic[0x0f], pic[0x10], serial_hds[0],
serial_hds[1], ESCC_CLOCK, 4); serial_hds[1], ESCC_CLOCK, 4);

2
hw/ppc_prep.c
View File

@ -611,7 +611,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
memory_region_add_subregion(sysmem, 0x80000000, PPC_io_memory); memory_region_add_subregion(sysmem, 0x80000000, PPC_io_memory);
/* init basic PC hardware */ /* init basic PC hardware */
pci_vga_init(pci_bus); pci_std_vga_init(pci_bus);
if (serial_hds[0]) if (serial_hds[0])
serial_isa_init(isa_bus, 0, serial_hds[0]); serial_isa_init(isa_bus, 0, serial_hds[0]);

2
hw/spapr.c
View File

@ -590,7 +590,7 @@ static int spapr_vga_init(PCIBus *pci_bus)
{ {
switch (vga_interface_type) { switch (vga_interface_type) {
case VGA_STD: case VGA_STD:
pci_vga_init(pci_bus); pci_std_vga_init(pci_bus);
return 1; return 1;
case VGA_NONE: case VGA_NONE:
return 0; return 0;

2
hw/sun4u.c
View File

@ -821,7 +821,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
ivec_irqs = qemu_allocate_irqs(cpu_set_ivec_irq, env, IVEC_MAX); 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_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &pci_bus2,
&pci_bus3, &pbm_irqs); &pci_bus3, &pbm_irqs);
pci_vga_init(pci_bus); pci_std_vga_init(pci_bus);
// XXX Should be pci_bus3 // XXX Should be pci_bus3
isa_bus = pci_ebus_init(pci_bus, -1, pbm_irqs); isa_bus = pci_ebus_init(pci_bus, -1, pbm_irqs);

6
hw/vga-pci.c
View File

@ -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); PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, dev);
VGACommonState *s = &d->vga; VGACommonState *s = &d->vga;
@ -70,7 +70,7 @@ static int pci_vga_initfn(PCIDevice *dev)
return 0; return 0;
} }
DeviceState *pci_vga_init(PCIBus *bus) DeviceState *pci_std_vga_init(PCIBus *bus)
{ {
return &pci_create_simple(bus, -1, "VGA")->qdev; 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); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->no_hotplug = 1; k->no_hotplug = 1;
k->init = pci_vga_initfn; k->init = pci_std_vga_initfn;
k->romfile = "vgabios-stdvga.bin"; k->romfile = "vgabios-stdvga.bin";
k->vendor_id = PCI_VENDOR_ID_QEMU; k->vendor_id = PCI_VENDOR_ID_QEMU;
k->device_id = PCI_DEVICE_ID_QEMU_VGA; k->device_id = PCI_DEVICE_ID_QEMU_VGA;

2
hw/vga-pci.h
View File

@ -4,7 +4,7 @@
#include "qemu-common.h" #include "qemu-common.h"
/* vga-pci.c */ /* vga-pci.c */
DeviceState *pci_vga_init(PCIBus *bus); DeviceState *pci_std_vga_init(PCIBus *bus);
/* cirrus_vga.c */ /* cirrus_vga.c */
DeviceState *pci_cirrus_vga_init(PCIBus *bus); DeviceState *pci_cirrus_vga_init(PCIBus *bus);