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>
This commit is contained in:
parent
cab1e8f3e3
commit
9011a1a7bb
15
hw/pc.c
15
hw/pc.c
|
@ -1058,6 +1058,21 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
|
||||||
*floppy = fdctrl_init_isa(isa_bus, fd);
|
*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)
|
void pc_pci_device_init(PCIBus *pci_bus)
|
||||||
{
|
{
|
||||||
int max_bus;
|
int max_bus;
|
||||||
|
|
1
hw/pc.h
1
hw/pc.h
|
@ -98,6 +98,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
|
||||||
const char *boot_device,
|
const char *boot_device,
|
||||||
ISADevice *floppy, BusState *ide0, BusState *ide1,
|
ISADevice *floppy, BusState *ide0, BusState *ide1,
|
||||||
ISADevice *s);
|
ISADevice *s);
|
||||||
|
void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus);
|
||||||
void pc_pci_device_init(PCIBus *pci_bus);
|
void pc_pci_device_init(PCIBus *pci_bus);
|
||||||
|
|
||||||
typedef void (*cpu_set_smm_t)(int smm, void *arg);
|
typedef void (*cpu_set_smm_t)(int smm, void *arg);
|
||||||
|
|
|
@ -234,14 +234,7 @@ static void pc_init1(MemoryRegion *system_memory,
|
||||||
/* init basic PC hardware */
|
/* init basic PC hardware */
|
||||||
pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled());
|
pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled());
|
||||||
|
|
||||||
for(i = 0; i < nb_nics; i++) {
|
pc_nic_init(isa_bus, pci_bus);
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
ide_drive_get(hd, MAX_IDE_BUS);
|
ide_drive_get(hd, MAX_IDE_BUS);
|
||||||
if (pci_enabled) {
|
if (pci_enabled) {
|
||||||
|
|
Loading…
Reference in a new issue