Remove e1000 rom loading hack

The gPXE rom supports BEV properly.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/e1000.c b/hw/e1000.c
index a52433eee4c06182bc0bbfce4b80e1fca31aa4d8..028afd1504f95b8825c993bed6411d2436d8c12b 100644 (file)
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -1115,7 +1115,6 @@ static int pci_e1000_init(PCIDevice *pci_dev)
     vmstate_register(-1, &vmstate_e1000, d);
     e1000_reset(d);
 
-#if 0 /* rom bev support is broken -> can't load unconditionally */
     if (!pci_dev->qdev.hotplugged) {
         static int loaded = 0;
         if (!loaded) {
@@ -1123,7 +1122,6 @@ static int pci_e1000_init(PCIDevice *pci_dev)
             loaded = 1;
         }
     }
-#endif
     return 0;
 }
 

diff --git a/hw/pc.c b/hw/pc.c
index acae759e5ad2338f653d8c92bc2166d55878e448..bf4718e6829d6e339a1cf9b5decc38ae09cbc2b1 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1152,27 +1152,6 @@ 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;
-
-        if (!nd_table[i].bootable)
-            continue;
-
-        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]);
     isa_irq_state = qemu_mallocz(sizeof(*isa_irq_state));