diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-02-08 16:02:11 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-24 13:36:05 -0600 |
| commit | 9ebe95fb606a8d6bebe29de3efc9b506c6428c62 (patch) | |
| tree | 40c47acc0fb21e547368661009f10a681976e170 /hw/pcnet-pci.c | |
| parent | 5bc62e01cd22ea1f56bde94b0616c46f8af2676e (diff) | |
| download | qemu-9ebe95fb606a8d6bebe29de3efc9b506c6428c62.zip qemu-9ebe95fb606a8d6bebe29de3efc9b506c6428c62.tar.gz qemu-9ebe95fb606a8d6bebe29de3efc9b506c6428c62.tar.bz2 | |
nic: zap obsolote romloading bits from ne2k + pcnet
These days one just needs to specify the romfile in PCiDeviceInfo and
everything magically works. It also allows to disable pxe rom loading
via "romfile=<emptystring>" like it is possible for all other nics.
[ v2: rebased & adapted to qom changes ]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pcnet-pci.c')
| -rw-r--r-- | hw/pcnet-pci.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index 3682609..34d73aa 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -330,14 +330,6 @@ static int pci_pcnet_init(PCIDevice *pci_dev) s->phys_mem_write = pci_physical_memory_write; s->dma_opaque = pci_dev; - if (!pci_dev->qdev.hotplugged) { - static int loaded = 0; - if (!loaded) { - rom_add_option("pxe-pcnet.rom", -1); - loaded = 1; - } - } - return pcnet_common_init(&pci_dev->qdev, s, &net_pci_pcnet_info); } @@ -360,6 +352,7 @@ static void pcnet_class_init(ObjectClass *klass, void *data) k->init = pci_pcnet_init; k->exit = pci_pcnet_uninit; + k->romfile = "pxe-pcnet.rom", k->vendor_id = PCI_VENDOR_ID_AMD; k->device_id = PCI_DEVICE_ID_AMD_LANCE; k->revision = 0x10; |