diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-12-02 14:16:40 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-12-02 14:16:40 -0600 |
| commit | 19c71ff41c029517c11ae67d6fbcb093a5d1150f (patch) | |
| tree | c33443ac97aeb57341c2f24626cbc6d809fcdaca /hw/eepro100.c | |
| parent | 393f398b69f9baadc3f29d822a0b5b74ca63b919 (diff) | |
| parent | 0c600ce2a7a419c7247b2ac63327dea5daa3d5a2 (diff) | |
| download | focaccia-qemu-19c71ff41c029517c11ae67d6fbcb093a5d1150f.tar.gz focaccia-qemu-19c71ff41c029517c11ae67d6fbcb093a5d1150f.zip | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/eepro100.c')
| -rw-r--r-- | hw/eepro100.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/hw/eepro100.c b/hw/eepro100.c index 41d792ad24..f8a700a2b8 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -2048,17 +2048,9 @@ static void eepro100_register_devices(void) size_t i; for (i = 0; i < ARRAY_SIZE(e100_devices); i++) { PCIDeviceInfo *pci_dev = &e100_devices[i].pci; - switch (e100_devices[i].device_id) { - case PCI_DEVICE_ID_INTEL_82551IT: - pci_dev->romfile = "gpxe-eepro100-80861209.rom"; - break; - case PCI_DEVICE_ID_INTEL_82557: - pci_dev->romfile = "gpxe-eepro100-80861229.rom"; - break; - case 0x2449: - pci_dev->romfile = "gpxe-eepro100-80862449.rom"; - break; - } + /* We use the same rom file for all device ids. + QEMU fixes the device id during rom load. */ + pci_dev->romfile = "gpxe-eepro100-80861209.rom"; pci_dev->init = e100_nic_init; pci_dev->exit = pci_nic_uninit; pci_dev->qdev.props = e100_properties; |