vga: rename isa_vga_init() to isa_std_vga_init()

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

Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 967a76e533017c4dff346f1f925671a64fee3e1e..2115f7f3d4bbacbdc1696811b2e0523c06112624 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -281,7 +281,7 @@ void mips_r4k_init (ram_addr_t ram_size,
         }
     }
 
-    isa_vga_init(isa_bus);
+    isa_std_vga_init(isa_bus);
 
     if (nd_table[0].used)
         isa_ne2000_init(isa_bus, 0x300, 9, &nd_table[0]);

diff --git a/hw/pc.c b/hw/pc.c
index 33fee622d5b130b3b53820aab4bf9cd434e49699..78805f625e0a898f8900e4ea2f8b7d57b6bc3840 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1016,7 +1016,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
         if (pci_bus) {
             dev = pci_std_vga_init(pci_bus);
         } else {
-            dev = isa_vga_init(isa_bus);
+            dev = isa_std_vga_init(isa_bus);
         }
     }
 

diff --git a/hw/pc.h b/hw/pc.h
index e4db0715b81e8248d0f1cf76179b4f9afa4d8dd8..77c38d6091d297e96b83fe6c00d3d2009ff33cb6 100644 (file)
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -176,7 +176,7 @@ enum vga_retrace_method {
 
 extern enum vga_retrace_method vga_retrace_method;
 
-static inline DeviceState *isa_vga_init(ISABus *bus)
+static inline DeviceState *isa_std_vga_init(ISABus *bus)
 {
     ISADevice *dev;