summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-10-30 09:28:36 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-30 09:42:36 -0500
commit04095e5ff305fc25a214b52e005153af9d009d66 (patch)
treeb9883a4fb6bcb496823aaa45e1dd2a2823b8512b /hw/e1000.c
parentSwitch from etherboot to gPXE (diff)
downloadqemu-kvm-04095e5ff305fc25a214b52e005153af9d009d66.tar.gz
qemu-kvm-04095e5ff305fc25a214b52e005153af9d009d66.tar.bz2
qemu-kvm-04095e5ff305fc25a214b52e005153af9d009d66.zip
Remove e1000 rom loading hack
The gPXE rom supports BEV properly. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/e1000.c')
-rw-r--r--hw/e1000.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/e1000.c b/hw/e1000.c
index a52433eee..028afd150 100644
--- 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;
}