[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/22] pc.c: only load e1000 rom.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 22/22] pc.c: only load e1000 rom. |
Date: |
Wed, 21 Oct 2009 15:25:43 +0200 |
The other pxe roms are loaded by the drivers individual drivers now.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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]);
--
1.6.2.5
- [Qemu-devel] [PATCH 06/22] ne2k_isa: use qdev properties for configuration., (continued)
- [Qemu-devel] [PATCH 06/22] ne2k_isa: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 11/22] pcnet: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 10/22] e1000: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 13/22] rtl8139: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 14/22] virtio: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 12/22] pcnet: split away lance.c (sparc32 code)., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 21/22] kill dead nic unplug code., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 19/22] musicpal: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 17/22] xilinx_ethlite: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 22/22] pc.c: only load e1000 rom.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 15/22] eepro100: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 16/22] smc91c111: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 18/22] stellaris_enet: use qdev properties for configuration., Gerd Hoffmann, 2009/10/21
- [Qemu-devel] [PATCH 20/22] zap DeviceState->nd, Gerd Hoffmann, 2009/10/21