From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Fri, 14 May 2010 07:29:14 +0000 (+0900)
Subject: pc: split out pci device init from pc_init1() into pc_pci_device_init()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e3a5cf425032e03930a650788332e3d0ff8fc9c7;p=qemu.git

pc: split out pci device init from pc_init1() into pc_pci_device_init()

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>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/hw/pc.c b/hw/pc.c
index d820a516a0..5c8a11b71f 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);
     }
 }