diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | hw/e1000.c | 2 | ||||
| -rw-r--r-- | hw/eepro100.c | 2 | ||||
| -rw-r--r-- | hw/ne2000.c | 2 | ||||
| -rw-r--r-- | hw/pcnet-pci.c | 2 | ||||
| -rw-r--r-- | hw/rtl8139.c | 2 | ||||
| -rw-r--r-- | hw/virtio-pci.c | 2 | ||||
| -rw-r--r-- | pc-bios/pxe-e1000.rom (renamed from pc-bios/pxe-e1000.bin) | bin | 72192 -> 72192 bytes | |||
| -rw-r--r-- | pc-bios/pxe-eepro100.rom (renamed from pc-bios/gpxe-eepro100-80861209.rom) | bin | 56832 -> 56832 bytes | |||
| -rw-r--r-- | pc-bios/pxe-ne2k_pci.rom (renamed from pc-bios/pxe-ne2k_pci.bin) | bin | 56320 -> 56320 bytes | |||
| -rw-r--r-- | pc-bios/pxe-pcnet.rom (renamed from pc-bios/pxe-pcnet.bin) | bin | 56832 -> 56832 bytes | |||
| -rw-r--r-- | pc-bios/pxe-rtl8139.rom (renamed from pc-bios/pxe-rtl8139.bin) | bin | 56320 -> 56320 bytes | |||
| -rw-r--r-- | pc-bios/pxe-virtio.rom (renamed from pc-bios/pxe-virtio.bin) | bin | 56320 -> 56320 bytes |
14 files changed, 15 insertions, 15 deletions
@@ -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 \ @@ -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 @@ -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), diff --git a/pc-bios/pxe-e1000.bin b/pc-bios/pxe-e1000.rom Binary files differindex 7ac744e..7ac744e 100644 --- a/pc-bios/pxe-e1000.bin +++ b/pc-bios/pxe-e1000.rom diff --git a/pc-bios/gpxe-eepro100-80861209.rom b/pc-bios/pxe-eepro100.rom Binary files differindex 2ca59ec..2ca59ec 100644 --- a/pc-bios/gpxe-eepro100-80861209.rom +++ b/pc-bios/pxe-eepro100.rom diff --git a/pc-bios/pxe-ne2k_pci.bin b/pc-bios/pxe-ne2k_pci.rom Binary files differindex 5cb68ab..5cb68ab 100644 --- a/pc-bios/pxe-ne2k_pci.bin +++ b/pc-bios/pxe-ne2k_pci.rom diff --git a/pc-bios/pxe-pcnet.bin b/pc-bios/pxe-pcnet.rom Binary files differindex 7a54bab..7a54bab 100644 --- a/pc-bios/pxe-pcnet.bin +++ b/pc-bios/pxe-pcnet.rom diff --git a/pc-bios/pxe-rtl8139.bin b/pc-bios/pxe-rtl8139.rom Binary files differindex db7d76d..db7d76d 100644 --- a/pc-bios/pxe-rtl8139.bin +++ b/pc-bios/pxe-rtl8139.rom diff --git a/pc-bios/pxe-virtio.bin b/pc-bios/pxe-virtio.rom Binary files differindex 6dde514..6dde514 100644 --- a/pc-bios/pxe-virtio.bin +++ b/pc-bios/pxe-virtio.rom |
