From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTHD0-0004gb-5x for qemu-devel@nongnu.org; Tue, 30 Oct 2012 15:10:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTHCu-0001dy-7j for qemu-devel@nongnu.org; Tue, 30 Oct 2012 15:10:42 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:57525) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTHCt-0001dp-L3 for qemu-devel@nongnu.org; Tue, 30 Oct 2012 15:10:36 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 31 Oct 2012 00:40:30 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q9UJA9JR61931560 for ; Wed, 31 Oct 2012 00:40:09 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q9V0dvTK000649 for ; Wed, 31 Oct 2012 11:39:59 +1100 From: Anthony Liguori In-Reply-To: References: Date: Tue, 30 Oct 2012 14:09:52 -0500 Message-ID: <87390vvksf.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH v1 05/13] pc, pc_piix: split out pc nic initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Baron , qemu-devel@nongnu.org Cc: juzhang@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, agraf@suse.de, armbru@redhat.com, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, kraxel@redhat.com Jason Baron writes: > From: Isaku Yamahata > > Factor out pc nic initialization. > This simplifies the pc initialization and will reduce the code > duplication of q35 pc initialization. > > Reviewed-by: Paolo Bonzini > Signed-off-by: Isaku Yamahata > Signed-off-by: Jason Baron Reviewed-by: Anthony Liguori 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