From patchwork Wed Oct 21 13:25:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [22/22] pc.c: only load e1000 rom. Date: Wed, 21 Oct 2009 03:25:43 -0000 From: Gerd Hoffmann X-Patchwork-Id: 36582 Message-Id: <1256131543-28416-23-git-send-email-kraxel@redhat.com> To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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]);