[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V8 16/18] pc: split out pci device init from pc_init
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH V8 16/18] pc: split out pci device init from pc_init1() into pc_pci_device_init() |
Date: |
Fri, 4 Dec 2009 14:51:03 +0900 |
Split out pci device initialization from pc_init1() into pc_pci_device_init().
and removed unnecessary braces.
Signed-off-by: Isaku Yamahata <address@hidden>
---
hw/pc.c | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 10fd337..4d51c48 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1179,6 +1179,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,
@@ -1294,22 +1312,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);
}
}
--
1.6.5.4
- [Qemu-devel] [PATCH V8 14/18] pc: split out vga initialization from pc_init1() into pc_vga_init()., (continued)
- [Qemu-devel] [PATCH V8 14/18] pc: split out vga initialization from pc_init1() into pc_vga_init()., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 08/18] pc: remove a global variable, floppy_controller., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 13/18] pc: split out memory allocation from pc_init1() into pc_memory_init(), Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 17/18] pc: split out piix specific part from pc.c into pc_piix.c, Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 09/18] pc: remove a global variable, RTCState *rtc_state., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 15/18] pc: split out basic device init from pc_init1() into pc_basic_device_init(), Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 12/18] pc: split out cpu initialization from pc_init1() into pc_cpus_init()., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 04/18] acpi: split acpi.c into the common part and the piix4 part., Isaku Yamahata, 2009/12/04
- [Qemu-devel] [PATCH V8 16/18] pc: split out pci device init from pc_init1() into pc_pci_device_init(),
Isaku Yamahata <=
- [Qemu-devel] [PATCH V8 10/18] pc: introduce a function to allocate cpu irq., Isaku Yamahata, 2009/12/04
- Re: [Qemu-devel] [PATCH V8 00/18] split out piix specific part from pc emulator, Anthony Liguori, 2009/12/04