From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQH4r-0007EG-Q5 for qemu-devel@nongnu.org; Mon, 22 Oct 2012 08:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQH4q-0000nA-Hh for qemu-devel@nongnu.org; Mon, 22 Oct 2012 08:25:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQH4q-0000mx-4H for qemu-devel@nongnu.org; Mon, 22 Oct 2012 08:25:52 -0400 Date: Mon, 22 Oct 2012 15:27:56 +0200 From: "Michael S. Tsirkin" Message-ID: <20121022132756.GA17625@redhat.com> References: <3af1dc43a71d0e4570e9c2eb92fdc5cb0e34a9e9.1350677361.git.jbaron@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3af1dc43a71d0e4570e9c2eb92fdc5cb0e34a9e9.1350677361.git.jbaron@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 05/26] pc, pc_piix: split out pc nic initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Baron Cc: agraf@suse.de, aliguori@us.ibm.com, juzhang@redhat.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org, 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 On Fri, Oct 19, 2012 at 04:43:29PM -0400, Jason Baron wrote: > 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 Anthony could you pls review/ack this patch? > --- > 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 6c0722d..2c60ff6 100644 > --- a/hw/pc.c > +++ b/hw/pc.c > @@ -1100,6 +1100,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 9923d96..62d14e3 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 82364ab..705211a 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) { > -- > 1.7.1