Revision 844e78ef hw/pc.c

b/hw/pc.c
1163 1163
        rom_add_option(option_rom[i]);
1164 1164
    }
1165 1165

  
1166
#if 1
1167
    /*
1168
     * Needed for the e1000 rom only.  The rom doesn't do proper BEV
1169
     * and thus we can't load it unconditionally.
1170
     */
1166 1171
    for (i = 0; i < nb_nics; i++) {
1167 1172
        char nic_oprom[1024];
1168 1173
        const char *model = nd_table[i].model;
......
1172 1177

  
1173 1178
        if (model == NULL)
1174 1179
            model = "e1000";
1180
        if (strcmp(model,"e1000") != 0)
1181
            continue;
1175 1182
        snprintf(nic_oprom, sizeof(nic_oprom), "pxe-%s.bin", model);
1176

  
1177 1183
        rom_add_option(nic_oprom);
1178 1184
    }
1185
#endif
1179 1186

  
1180 1187
    cpu_irq = qemu_allocate_irqs(pic_irq_request, NULL, 1);
1181 1188
    i8259 = i8259_init(cpu_irq[0]);

Also available in: Unified diff