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/ne2000.c | |
| parent | 5bc62e01cd22ea1f56bde94b0616c46f8af2676e (diff) | |
| download | focaccia-qemu-9ebe95fb606a8d6bebe29de3efc9b506c6428c62.tar.gz focaccia-qemu-9ebe95fb606a8d6bebe29de3efc9b506c6428c62.zip | |
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/ne2000.c')
| -rw-r--r-- | hw/ne2000.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/hw/ne2000.c b/hw/ne2000.c index bb84fd1f93..71452e1f2e 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -763,14 +763,6 @@ static int pci_ne2000_init(PCIDevice *pci_dev) object_get_typename(OBJECT(pci_dev)), pci_dev->qdev.id, s); qemu_format_nic_info_str(&s->nic->nc, s->c.macaddr.a); - if (!pci_dev->qdev.hotplugged) { - static int loaded = 0; - if (!loaded) { - rom_add_option("pxe-ne2k_pci.rom", -1); - loaded = 1; - } - } - add_boot_device_path(s->c.bootindex, &pci_dev->qdev, "/ethernet-phy@0"); return 0; @@ -798,6 +790,7 @@ static void ne2000_class_init(ObjectClass *klass, void *data) k->init = pci_ne2000_init; k->exit = pci_ne2000_exit; + k->romfile = "pxe-ne2k_pci.rom", k->vendor_id = PCI_VENDOR_ID_REALTEK; k->device_id = PCI_DEVICE_ID_REALTEK_8029; k->class_id = PCI_CLASS_NETWORK_ETHERNET; |