From patchwork Wed Mar 16 09:29:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 87201 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8E97FB6FE9 for ; Wed, 16 Mar 2011 20:47:19 +1100 (EST) Received: from localhost ([127.0.0.1]:45893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pzn8x-0000qv-J4 for incoming@patchwork.ozlabs.org; Wed, 16 Mar 2011 05:35:51 -0400 Received: from [140.186.70.92] (port=34403 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pzn34-0006EO-AX for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:29:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pzn31-0006EG-0w for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:29:45 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:37358) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pzn30-0006BZ-Nj for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:29:42 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 291CD1892D; Wed, 16 Mar 2011 18:29:42 +0900 (JST) Received: (nullmailer pid 18369 invoked by uid 1000); Wed, 16 Mar 2011 09:29:37 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2011 18:29:28 +0900 Message-Id: X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 210.128.90.3 Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 17/26] pc, pc_piix: split out pc nic initialization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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 39c7cf0..dc771a6 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1167,6 +1167,21 @@ void pc_basic_device_init(qemu_irq *isa_irq, fdctrl_init_isa(fd); } +void pc_nic_init(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(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 0ee4b89..b70c5f4 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -144,6 +144,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, const char *boot_device, BusState *ide0, BusState *ide1, ISADevice *s); +void pc_nic_init(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 1ac69ff..8ee7cab 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -115,14 +115,7 @@ static void pc_init1(ram_addr_t ram_size, /* init basic PC hardware */ pc_basic_device_init(isa_irq, &rtc_state); - 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(nd); - else - pci_nic_init_nofail(nd, "e1000", NULL); - } + pc_nic_init(pci_bus); ide_drive_get(hd, MAX_IDE_BUS); if (pci_enabled) {