From patchwork Tue Jan 5 06:27:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V11, 17/27] pc: split out pci device init from pc_init1() into pc_pci_device_init() Date: Mon, 04 Jan 2010 20:27:40 -0000 From: Isaku Yamahata X-Patchwork-Id: 42174 Message-Id: <1262672870-22607-18-git-send-email-yamahata@valinux.co.jp> To: qemu-devel@nongnu.org, kraxel@redhat.com Cc: yamahata@valinux.co.jp Split out pci device initialization from pc_init1() into pc_pci_device_init(). and removed unnecessary braces. Signed-off-by: Isaku Yamahata --- hw/pc.c | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index dbff7b7..7ce1fdb 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1189,6 +1189,24 @@ 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 i; + int max_bus; + + max_bus = drive_get_max_bus(IF_SCSI); + for (i = 0; i <= max_bus; i++) { + pci_create_simple(pci_bus, -1, "lsi53c895a"); + } + + /* Add virtio console devices */ + for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) { + if (virtcon_hds[i]) { + pci_create_simple(pci_bus, -1, "virtio-console-pci"); + } + } +} + /* PC hardware initialisation */ static void pc_init1(ram_addr_t ram_size, const char *boot_device, @@ -1308,22 +1326,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"); - } - } - - /* Add virtio console devices */ - if (pci_enabled) { - for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) { - if (virtcon_hds[i]) { - pci_create_simple(pci_bus, -1, "virtio-console-pci"); - } - } + pc_pci_device_init(pci_bus); } rom_load_fw(fw_cfg);