diff options
| author | Isaku Yamahata | 2012-11-14 21:54:01 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2012-11-26 16:35:35 +0100 |
| commit | 9011a1a7bbf00deeada3447143bbde7e0a685297 (patch) | |
| tree | 127a5a47b1b68df40c9dcac68ecc8402ba457018 /hw/pc_piix.c | |
| parent | Merge remote-tracking branch 'qemu-kvm/uq/master' into staging (diff) | |
| download | qemu-9011a1a7bbf00deeada3447143bbde7e0a685297.tar.gz qemu-9011a1a7bbf00deeada3447143bbde7e0a685297.tar.xz qemu-9011a1a7bbf00deeada3447143bbde7e0a685297.zip | |
pc, pc_piix: split out pc nic initialization
Factor out pc nic initialization.
This simplifies the pc initialization and will reduce the code
duplication of q35 pc initialization.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index cfa839c8b4..910d417002 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -234,14 +234,7 @@ static void pc_init1(MemoryRegion *system_memory, /* init basic PC hardware */ pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled()); - for(i = 0; i < nb_nics; i++) { - NICInfo *nd = &nd_table[i]; - - if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0)) - pc_init_ne2k_isa(isa_bus, nd); - else - pci_nic_init_nofail(nd, "e1000", NULL); - } + pc_nic_init(isa_bus, pci_bus); ide_drive_get(hd, MAX_IDE_BUS); if (pci_enabled) { |