From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQAZ-0004D2-Vy for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:19:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqQAU-0000KR-5f for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:19:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQAT-0000K8-VG for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:19:14 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0QEJC5L023693 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 26 Jan 2012 09:19:12 -0500 From: Gerd Hoffmann Date: Thu, 26 Jan 2012 15:19:09 +0100 Message-Id: <1327587549-10850-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] nic: zap obsolote romloading bits from ne2k + pcnet List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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=" like it is possible for all other nics. Signed-off-by: Gerd Hoffmann --- hw/ne2000.c | 9 +-------- hw/pcnet-pci.c | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/hw/ne2000.c b/hw/ne2000.c index 62e082f..83328bb 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -763,14 +763,6 @@ static int pci_ne2000_init(PCIDevice *pci_dev) pci_dev->qdev.info->name, 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; @@ -792,6 +784,7 @@ static PCIDeviceInfo ne2000_info = { .qdev.vmsd = &vmstate_pci_ne2000, .init = pci_ne2000_init, .exit = pci_ne2000_exit, + .romfile = "pxe-ne2k_pci.rom", .vendor_id = PCI_VENDOR_ID_REALTEK, .device_id = PCI_DEVICE_ID_REALTEK_8029, .class_id = PCI_CLASS_NETWORK_ETHERNET, diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index 4e164da..2f333e2 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); } @@ -355,6 +347,7 @@ static PCIDeviceInfo pcnet_info = { .qdev.vmsd = &vmstate_pci_pcnet, .init = pci_pcnet_init, .exit = pci_pcnet_uninit, + .romfile = "pxe-pcnet.rom", .vendor_id = PCI_VENDOR_ID_AMD, .device_id = PCI_DEVICE_ID_AMD_LANCE, .revision = 0x10, -- 1.7.1