From 4e9df06accd26cd1034fd6d3249c7fa15d92f631 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 31 Oct 2009 13:38:33 +0100 Subject: [PATCH] eepro100: Fix boot ROM support * Rename pxe-eepro100.bin to pxe-i82559er.bin. The other devices supported by eepro100.c need additional pxe boot ROM images. * Call rom_add_option during initialisation. The code won't work with two or more different eepro100 devices, because it only adds one option ROM, but this use case is perhaps never needed. Using this patch, model=i82559er at least works partially. For full support, more eepro100 patches are needed (will follow later, can be fetched from ar7 branch of QEMU). Signed-off-by: Stefan Weil Signed-off-by: Anthony Liguori --- hw/eepro100.c | 11 +++++++++++ pc-bios/{pxe-eepro100.bin => pxe-i82559er.bin} | Bin 2 files changed, 11 insertions(+) rename pc-bios/{pxe-eepro100.bin => pxe-i82559er.bin} (100%) diff --git a/hw/eepro100.c b/hw/eepro100.c index 25aabcf209..c5ec0be0d5 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -40,6 +40,7 @@ #include /* offsetof */ #include #include "hw.h" +#include "loader.h" /* rom_add_option */ #include "pci.h" #include "net.h" #include "eeprom93xx.h" @@ -1843,6 +1844,16 @@ static int nic_init(PCIDevice *pci_dev, uint32_t device) memcpy(s->vmstate, &vmstate_eepro100, sizeof(vmstate_eepro100)); s->vmstate->name = s->vc->model; vmstate_register(-1, s->vmstate, s); + + if (!pci_dev->qdev.hotplugged) { + static int loaded = 0; + if (!loaded) { + char fname[32]; + snprintf(fname, sizeof(fname), "pxe-%s.bin", s->vc->model); + rom_add_option(fname); + loaded = 1; + } + } return 0; } diff --git a/pc-bios/pxe-eepro100.bin b/pc-bios/pxe-i82559er.bin similarity index 100% rename from pc-bios/pxe-eepro100.bin rename to pc-bios/pxe-i82559er.bin