| Message ID | 08949b8f792aa21b41db02438cce15aca325df31.1349749915.git.jbaron@redhat.com |
|---|---|
| State | New |
| Headers | show |
Il 09/10/2012 05:30, Jason Baron ha scritto: > From: Isaku Yamahata <yamahata@valinux.co.jp> > > Factor out pc nic initialization. > This simplifies the pc initialization and will reduce the code > duplication of q35 pc initialization. > > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> > Signed-off-by: Jason Baron <jbaron@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> > --- > hw/pc.c | 15 +++++++++++++++ > hw/pc.h | 1 + > hw/pc_piix.c | 9 +-------- > 3 files changed, 17 insertions(+), 8 deletions(-) > > diff --git a/hw/pc.c b/hw/pc.c > index 7e7e0e2..fef39ba 100644 > --- a/hw/pc.c > +++ b/hw/pc.c > @@ -1123,6 +1123,21 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, > *floppy = fdctrl_init_isa(isa_bus, fd); > } > > +void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus) > +{ > + int i; > + > + for (i = 0; i < nb_nics; i++) { > + NICInfo *nd = &nd_table[i]; > + > + if (!pci_bus || (nd->model && strcmp(nd->model, "ne2k_isa") == 0)) { > + pc_init_ne2k_isa(isa_bus, nd); > + } else { > + pci_nic_init_nofail(nd, "e1000", NULL); > + } > + } > +} > + > void pc_pci_device_init(PCIBus *pci_bus) > { > int max_bus; > diff --git a/hw/pc.h b/hw/pc.h > index e4db071..d0feb20 100644 > --- a/hw/pc.h > +++ b/hw/pc.h > @@ -125,6 +125,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, > const char *boot_device, > ISADevice *floppy, BusState *ide0, BusState *ide1, > ISADevice *s); > +void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus); > void pc_pci_device_init(PCIBus *pci_bus); > > typedef void (*cpu_set_smm_t)(int smm, void *arg); > diff --git a/hw/pc_piix.c b/hw/pc_piix.c > index fd5898f..87ca60b 100644 > --- a/hw/pc_piix.c > +++ b/hw/pc_piix.c > @@ -233,14 +233,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) { >
diff --git a/hw/pc.c b/hw/pc.c index 7e7e0e2..fef39ba 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1123,6 +1123,21 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, *floppy = fdctrl_init_isa(isa_bus, fd); } +void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus) +{ + int i; + + for (i = 0; i < nb_nics; i++) { + NICInfo *nd = &nd_table[i]; + + if (!pci_bus || (nd->model && strcmp(nd->model, "ne2k_isa") == 0)) { + pc_init_ne2k_isa(isa_bus, nd); + } else { + pci_nic_init_nofail(nd, "e1000", NULL); + } + } +} + void pc_pci_device_init(PCIBus *pci_bus) { int max_bus; diff --git a/hw/pc.h b/hw/pc.h index e4db071..d0feb20 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -125,6 +125,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, const char *boot_device, ISADevice *floppy, BusState *ide0, BusState *ide1, ISADevice *s); +void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_pci_device_init(PCIBus *pci_bus); typedef void (*cpu_set_smm_t)(int smm, void *arg); diff --git a/hw/pc_piix.c b/hw/pc_piix.c index fd5898f..87ca60b 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -233,14 +233,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) {