PXE: Use consistent naming for PXE ROMs

And add missing ROMs to tarbin build target.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

diff --git a/Makefile b/Makefile
index fa93be5ed7ccf2a84b46e6d5a8bbc407777d380a..9df4fff630d89f7af2905ceec02b3b8c49a15313 100644 (file)
--- 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-e1000.rom pxe-eepro100.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-e1000.rom \
+       $(datadir)/pxe-eepro100.rom \
+       $(datadir)/pxe-ne2k_pci.rom \
+       $(datadir)/pxe-pcnet.rom \
+       $(datadir)/pxe-rtl8139.rom \
+       $(datadir)/pxe-virtio.rom \
        $(docdir)/qemu-doc.html \
        $(docdir)/qemu-tech.html \
        $(mandir)/man1/qemu.1 \

diff --git a/configure b/configure
index ae97e11a97ec1446c02355c746d9712dd6fcc9ed..813ef7a7a2a046f939c18e186c61dfb9fa9173f8 100755 (executable)
--- a/configure
+++ b/configure
@@ -3445,7 +3445,7 @@ FILES="Makefile tests/Makefile"
 FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
 FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
 FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
-for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
+for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.rom $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
     FILES="$FILES pc-bios/`basename $bios_file`"
 done
 mkdir -p $DIRS

diff --git a/hw/e1000.c b/hw/e1000.c
index fe3e812610eeaeb73760a631a22be60c4ff06580..f160bfc2ab945030df69feacc8bef5c6f4e50c96 100644 (file)
--- 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 edf48f61d1000f4cb632358dd24b1605a7d32f4c..369ad7f84062e7d113a70321f2f7ce4a061aeb14 100644 (file)
--- 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 5966359852f101f1aa32233e193c846b552a1775..b668ad1070cd418cf3200ae5a9e125ba6eb2ed59 100644 (file)
--- 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 339a4019679778e1bd493ed89d3d3bb09b5c2c84..40ee29d38b1c9d8292f81743807e0c3d82384e4a 100644 (file)
--- 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 d5459336e505c6eedeff4ed50f6f57144e81721a..8790a00afb46c1d0dddbd5941c1ff5abc50e604d 100644 (file)
--- 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 555f23f1da5dd5ab81de2d825f1b5a54309044c3..c19629d5073e43d15f7fc722738fee8dd00521f9 100644 (file)
--- 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),

diff --git a/pc-bios/gpxe-eepro100-80861209.rom b/pc-bios/gpxe-eepro100-80861209.rom
deleted file mode 100644 (file)
index 2ca59ec..0000000
Binary files a/pc-bios/gpxe-eepro100-80861209.rom and /dev/null differ

diff --git a/pc-bios/pxe-e1000.bin b/pc-bios/pxe-e1000.bin
deleted file mode 100644 (file)
index 7ac744e..0000000
Binary files a/pc-bios/pxe-e1000.bin and /dev/null differ

diff --git a/pc-bios/pxe-e1000.rom b/pc-bios/pxe-e1000.rom
new file mode 100644 (file)
index 0000000..7ac744e
Binary files /dev/null and b/pc-bios/pxe-e1000.rom differ

diff --git a/pc-bios/pxe-eepro100.rom b/pc-bios/pxe-eepro100.rom
new file mode 100644 (file)
index 0000000..2ca59ec
Binary files /dev/null and b/pc-bios/pxe-eepro100.rom differ

diff --git a/pc-bios/pxe-ne2k_pci.bin b/pc-bios/pxe-ne2k_pci.bin
deleted file mode 100644 (file)
index 5cb68ab..0000000
Binary files a/pc-bios/pxe-ne2k_pci.bin and /dev/null differ

diff --git a/pc-bios/pxe-ne2k_pci.rom b/pc-bios/pxe-ne2k_pci.rom
new file mode 100644 (file)
index 0000000..5cb68ab
Binary files /dev/null and b/pc-bios/pxe-ne2k_pci.rom differ

diff --git a/pc-bios/pxe-pcnet.bin b/pc-bios/pxe-pcnet.bin
deleted file mode 100644 (file)
index 7a54bab..0000000
Binary files a/pc-bios/pxe-pcnet.bin and /dev/null differ

diff --git a/pc-bios/pxe-pcnet.rom b/pc-bios/pxe-pcnet.rom
new file mode 100644 (file)
index 0000000..7a54bab
Binary files /dev/null and b/pc-bios/pxe-pcnet.rom differ

diff --git a/pc-bios/pxe-rtl8139.bin b/pc-bios/pxe-rtl8139.bin
deleted file mode 100644 (file)
index db7d76d..0000000
Binary files a/pc-bios/pxe-rtl8139.bin and /dev/null differ

diff --git a/pc-bios/pxe-rtl8139.rom b/pc-bios/pxe-rtl8139.rom
new file mode 100644 (file)
index 0000000..db7d76d
Binary files /dev/null and b/pc-bios/pxe-rtl8139.rom differ

diff --git a/pc-bios/pxe-virtio.bin b/pc-bios/pxe-virtio.bin
deleted file mode 100644 (file)
index 6dde514..0000000
Binary files a/pc-bios/pxe-virtio.bin and /dev/null differ

diff --git a/pc-bios/pxe-virtio.rom b/pc-bios/pxe-virtio.rom
new file mode 100644 (file)
index 0000000..6dde514
Binary files /dev/null and b/pc-bios/pxe-virtio.rom differ