[v1,05/13] pc, pc_piix: split out pc nic initialization

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.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Jason Baron <jbaron@redhat.com>
---
 hw/pc.c      |   15 +++++++++++++++
 hw/pc.h      |    1 +
 hw/pc_piix.c |    9 +--------
 3 files changed, 17 insertions(+), 8 deletions(-)

Jason Baron <jbaron@redhat.com> writes:

> 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.
>
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
> Signed-off-by: Jason Baron <jbaron@redhat.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

> ---
>  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 a02b397..cb7fa68 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1104,6 +1104,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 e7993ca..d6639a6 100644
> --- a/hw/pc.h
> +++ b/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,
>                    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 85529b2..acb1e92 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) {
> -- 
> 1.7.1

On Mon, Oct 29, 2012 at 10:11:26PM -0400, Jason Baron wrote:
> 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.
> 
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
> Signed-off-by: Jason Baron <jbaron@redhat.com>

Thanks, applied.

> ---
>  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 a02b397..cb7fa68 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1104,6 +1104,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 e7993ca..d6639a6 100644
> --- a/hw/pc.h
> +++ b/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,
>                    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 85529b2..acb1e92 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) {
> -- 
> 1.7.1