From patchwork Wed Oct 21 13:25:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 36582 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 17141B7B91 for ; Thu, 22 Oct 2009 01:27:54 +1100 (EST) Received: from localhost ([127.0.0.1]:34230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0cAI-0004pt-C1 for incoming@patchwork.ozlabs.org; Wed, 21 Oct 2009 10:27:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0bCe-00087I-Dz for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:12 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N0bCZ-00081h-VE for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:11 -0400 Received: from [199.232.76.173] (port=55739 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0bCZ-00081M-Ee for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60024) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N0bCZ-0007T2-27 for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:07 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9LDQ6IY031548 for ; Wed, 21 Oct 2009 09:26:06 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-113.ams2.redhat.com [10.36.9.113]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n9LDQ0mg030918; Wed, 21 Oct 2009 09:26:01 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 2DE077011C; Wed, 21 Oct 2009 15:25:44 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 21 Oct 2009 15:25:43 +0200 Message-Id: <1256131543-28416-23-git-send-email-kraxel@redhat.com> In-Reply-To: <1256131543-28416-1-git-send-email-kraxel@redhat.com> References: <1256131543-28416-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 22/22] pc.c: only load e1000 rom. 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 The other pxe roms are loaded by the drivers individual drivers now. Signed-off-by: Gerd Hoffmann --- hw/pc.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 408d6d6..4cd8ec6 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1163,6 +1163,11 @@ static void pc_init1(ram_addr_t ram_size, rom_add_option(option_rom[i]); } +#if 1 + /* + * Needed for the e1000 rom only. The rom doesn't do proper BEV + * and thus we can't load it unconditionally. + */ for (i = 0; i < nb_nics; i++) { char nic_oprom[1024]; const char *model = nd_table[i].model; @@ -1172,10 +1177,12 @@ static void pc_init1(ram_addr_t ram_size, if (model == NULL) model = "e1000"; + if (strcmp(model,"e1000") != 0) + continue; snprintf(nic_oprom, sizeof(nic_oprom), "pxe-%s.bin", model); - rom_add_option(nic_oprom); } +#endif cpu_irq = qemu_allocate_irqs(pic_irq_request, NULL, 1); i8259 = i8259_init(cpu_irq[0]);