From patchwork Mon Apr 11 19:37:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 90699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BE87EB6F18 for ; Tue, 12 Apr 2011 14:36:09 +1000 (EST) Received: from localhost ([::1]:53336 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9VKh-0006cH-49 for incoming@patchwork.ozlabs.org; Tue, 12 Apr 2011 00:36:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9SaG-00041j-G2 for qemu-devel@nongnu.org; Mon, 11 Apr 2011 21:40:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q9MvG-0003pz-Rk for qemu-devel@nongnu.org; Mon, 11 Apr 2011 15:37:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62151) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9MvG-0003pv-H5 for qemu-devel@nongnu.org; Mon, 11 Apr 2011 15:37:18 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3BJbDkd007276 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 11 Apr 2011 15:37:13 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p3BJbCaF017013; Mon, 11 Apr 2011 15:37:12 -0400 From: Alex Williamson To: anthony@codemonkey.ws, qemu-devel@nongnu.org Date: Mon, 11 Apr 2011 13:37:12 -0600 Message-ID: <20110411193609.21414.68958.stgit@s20.home> In-Reply-To: <20110411192841.21414.46756.stgit@s20.home> References: <20110411192841.21414.46756.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: alex.williamson@redhat.com, mcb30@ipxe.org, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v2 2/3] PXE: Use consistent naming for PXE ROMs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org And add missing ROMs to tarbin build target. Signed-off-by: Alex Williamson --- Makefile | 16 ++++++++-------- hw/e1000.c | 2 +- hw/eepro100.c | 2 +- hw/ne2000.c | 2 +- hw/pcnet-pci.c | 2 +- hw/rtl8139.c | 2 +- hw/virtio-pci.c | 2 +- pc-bios/gpxe-eepro100-80861209.rom | Bin pc-bios/pxe-e1000.bin | Bin pc-bios/pxe-e1000.rom | Bin pc-bios/pxe-eepro100.rom | Bin pc-bios/pxe-ne2k_pci.bin | Bin pc-bios/pxe-ne2k_pci.rom | Bin pc-bios/pxe-pcnet.bin | Bin pc-bios/pxe-pcnet.rom | Bin pc-bios/pxe-rtl8139.bin | Bin pc-bios/pxe-rtl8139.rom | Bin pc-bios/pxe-virtio.bin | Bin pc-bios/pxe-virtio.rom | Bin 19 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 pc-bios/gpxe-eepro100-80861209.rom delete mode 100644 pc-bios/pxe-e1000.bin create mode 100644 pc-bios/pxe-e1000.rom create mode 100644 pc-bios/pxe-eepro100.rom delete mode 100644 pc-bios/pxe-ne2k_pci.bin create mode 100644 pc-bios/pxe-ne2k_pci.rom delete mode 100644 pc-bios/pxe-pcnet.bin create mode 100644 pc-bios/pxe-pcnet.rom delete mode 100644 pc-bios/pxe-rtl8139.bin create mode 100644 pc-bios/pxe-rtl8139.rom delete mode 100644 pc-bios/pxe-virtio.bin create mode 100644 pc-bios/pxe-virtio.rom diff --git a/Makefile b/Makefile index fa93be5..2433524 100644 --- a/Makefile +++ b/Makefile @@ -177,10 +177,8 @@ ifdef INSTALL_BLOBS BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \ -gpxe-eepro100-80861209.rom \ -pxe-e1000.bin \ -pxe-ne2k_pci.bin pxe-pcnet.bin \ -pxe-rtl8139.bin pxe-virtio.bin \ +pxe-eepro100.rom pxe-e1000.rom pxe-ne2k_pci.rom \ +pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ multiboot.bin linuxboot.bin \ s390-zipl.rom \ @@ -326,10 +324,12 @@ tarbin: $(datadir)/openbios-sparc32 \ $(datadir)/openbios-sparc64 \ $(datadir)/openbios-ppc \ - $(datadir)/pxe-ne2k_pci.bin \ - $(datadir)/pxe-rtl8139.bin \ - $(datadir)/pxe-pcnet.bin \ - $(datadir)/pxe-e1000.bin \ + $(datadir)/pxe-ne2k_pci.rom \ + $(datadir)/pxe-rtl8139.rom \ + $(datadir)/pxe-pcnet.rom \ + $(datadir)/pxe-e1000.rom \ + $(datadir)/pxe-eepro100.rom \ + $(datadir)/pxe-virtio.rom \ $(docdir)/qemu-doc.html \ $(docdir)/qemu-tech.html \ $(mandir)/man1/qemu.1 \ diff --git a/hw/e1000.c b/hw/e1000.c index fe3e812..f160bfc 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1220,7 +1220,7 @@ static PCIDeviceInfo e1000_info = { .qdev.vmsd = &vmstate_e1000, .init = pci_e1000_init, .exit = pci_e1000_uninit, - .romfile = "pxe-e1000.bin", + .romfile = "pxe-e1000.rom", .qdev.props = (Property[]) { DEFINE_NIC_PROPERTIES(E1000State, conf), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/eepro100.c b/hw/eepro100.c index edf48f6..369ad7f 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -2054,7 +2054,7 @@ static void eepro100_register_devices(void) PCIDeviceInfo *pci_dev = &e100_devices[i].pci; /* 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->romfile = "pxe-eepro100.rom"; pci_dev->init = e100_nic_init; pci_dev->exit = pci_nic_uninit; pci_dev->qdev.props = e100_properties; diff --git a/hw/ne2000.c b/hw/ne2000.c index 5966359..b668ad1 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -742,7 +742,7 @@ static int pci_ne2000_init(PCIDevice *pci_dev) if (!pci_dev->qdev.hotplugged) { static int loaded = 0; if (!loaded) { - rom_add_option("pxe-ne2k_pci.bin", -1); + rom_add_option("pxe-ne2k_pci.rom", -1); loaded = 1; } } diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index 339a401..40ee29d 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -310,7 +310,7 @@ static int pci_pcnet_init(PCIDevice *pci_dev) if (!pci_dev->qdev.hotplugged) { static int loaded = 0; if (!loaded) { - rom_add_option("pxe-pcnet.bin", -1); + rom_add_option("pxe-pcnet.rom", -1); loaded = 1; } } diff --git a/hw/rtl8139.c b/hw/rtl8139.c index d545933..8790a00 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3484,7 +3484,7 @@ static PCIDeviceInfo rtl8139_info = { .qdev.vmsd = &vmstate_rtl8139, .init = pci_rtl8139_init, .exit = pci_rtl8139_uninit, - .romfile = "pxe-rtl8139.bin", + .romfile = "pxe-rtl8139.rom", .qdev.props = (Property[]) { DEFINE_NIC_PROPERTIES(RTL8139State, conf), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 555f23f..c19629d 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -877,7 +877,7 @@ static PCIDeviceInfo virtio_info[] = { .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_net_init_pci, .exit = virtio_net_exit_pci, - .romfile = "pxe-virtio.bin", + .romfile = "pxe-virtio.rom", .qdev.props = (Property[]) { DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, false),