summaryrefslogtreecommitdiff
path: root/hw/e1000.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-12-18 12:01:07 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-18 11:26:34 -0600
commitc2039bd0ffce8807e0eaac55254fde790825fa92 (patch)
treec3c35a7b5592ae1b882292e768e743129c8f9866 /hw/e1000.c
parentec7efac4a967c650ae1cd8cebe28e7c69cbe3864 (diff)
downloadqemu-c2039bd0ffce8807e0eaac55254fde790825fa92.zip
Support PCI based option rom loading
Currently, we preload option roms into the option rom space in memory. This prevents DDIM from functioning correctly which severely limits the number of roms we can support. This patch introduces a pci_add_option_rom() which registers the PCI_ROM_ADDRESS bar which points to our option rom. It also converts over the cirrus vga adapter, the rtl8139, virtio, and the e1000 to use this new mechanism. The result is that PXE boot functions even with three unique types of cards. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/e1000.c')
-rw-r--r--hw/e1000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/e1000.c b/hw/e1000.c
index 8566fe3276..f7956010f1 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -1125,7 +1125,7 @@ static int pci_e1000_init(PCIDevice *pci_dev)
if (!pci_dev->qdev.hotplugged) {
static int loaded = 0;
if (!loaded) {
- rom_add_option("pxe-e1000.bin");
+ pci_add_option_rom(&d->dev, "pxe-e1000.bin");
loaded = 1;
}
}