Patchwork [16/26] pc: split out pci device init from pc_init1() into pc_pci_device_init()

login
register
mail settings
Submitter Isaku Yamahata
Date May 14, 2010, 7:29 a.m.
Message ID <ec6e34aac3a99e2c524801065fd617ff38ad6469.1273821065.git.yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/52593/
State New
Headers show

Comments

Isaku Yamahata - May 14, 2010, 7:29 a.m.
Split out pci device initialization from pc_init1() into pc_pci_device_init().
and removed unnecessary braces.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/pc.c |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

Patch

diff --git a/hw/pc.c b/hw/pc.c
index d820a51..5c8a11b 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -997,6 +997,17 @@  static void pc_basic_device_init(qemu_irq *isa_irq,
     *floppy_controller = fdctrl_init_isa(fd);
 }
 
+static void pc_pci_device_init(PCIBus *pci_bus)
+{
+    int max_bus;
+    int bus;
+
+    max_bus = drive_get_max_bus(IF_SCSI);
+    for (bus = 0; bus <= max_bus; bus++) {
+        pci_create_simple(pci_bus, -1, "lsi53c895a");
+    }
+}
+
 /* PC hardware initialisation */
 static void pc_init1(ram_addr_t ram_size,
                      const char *boot_device,
@@ -1116,13 +1127,7 @@  static void pc_init1(ram_addr_t ram_size,
     }
 
     if (pci_enabled) {
-	int max_bus;
-        int bus;
-
-        max_bus = drive_get_max_bus(IF_SCSI);
-	for (bus = 0; bus <= max_bus; bus++) {
-            pci_create_simple(pci_bus, -1, "lsi53c895a");
-        }
+        pc_pci_device_init(pci_bus);
     }
 }