PXE: Use consistent naming for PXE ROMs
And add missing ROMs to tarbin build target. Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
parent
31a44434f7
commit
5ee8ad71e1
16
Makefile
16
Makefile
|
@ -177,10 +177,8 @@ ifdef INSTALL_BLOBS
|
||||||
BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \
|
BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \
|
||||||
vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
|
vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
|
||||||
ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \
|
ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \
|
||||||
gpxe-eepro100-80861209.rom \
|
pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
|
||||||
pxe-e1000.bin \
|
pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
|
||||||
pxe-ne2k_pci.bin pxe-pcnet.bin \
|
|
||||||
pxe-rtl8139.bin pxe-virtio.bin \
|
|
||||||
bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
|
bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
|
||||||
multiboot.bin linuxboot.bin \
|
multiboot.bin linuxboot.bin \
|
||||||
s390-zipl.rom \
|
s390-zipl.rom \
|
||||||
|
@ -326,10 +324,12 @@ tarbin:
|
||||||
$(datadir)/openbios-sparc32 \
|
$(datadir)/openbios-sparc32 \
|
||||||
$(datadir)/openbios-sparc64 \
|
$(datadir)/openbios-sparc64 \
|
||||||
$(datadir)/openbios-ppc \
|
$(datadir)/openbios-ppc \
|
||||||
$(datadir)/pxe-ne2k_pci.bin \
|
$(datadir)/pxe-e1000.rom \
|
||||||
$(datadir)/pxe-rtl8139.bin \
|
$(datadir)/pxe-eepro100.rom \
|
||||||
$(datadir)/pxe-pcnet.bin \
|
$(datadir)/pxe-ne2k_pci.rom \
|
||||||
$(datadir)/pxe-e1000.bin \
|
$(datadir)/pxe-pcnet.rom \
|
||||||
|
$(datadir)/pxe-rtl8139.rom \
|
||||||
|
$(datadir)/pxe-virtio.rom \
|
||||||
$(docdir)/qemu-doc.html \
|
$(docdir)/qemu-doc.html \
|
||||||
$(docdir)/qemu-tech.html \
|
$(docdir)/qemu-tech.html \
|
||||||
$(mandir)/man1/qemu.1 \
|
$(mandir)/man1/qemu.1 \
|
||||||
|
|
|
@ -3445,7 +3445,7 @@ FILES="Makefile tests/Makefile"
|
||||||
FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
|
FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
|
||||||
FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
|
FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
|
||||||
FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
|
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`"
|
FILES="$FILES pc-bios/`basename $bios_file`"
|
||||||
done
|
done
|
||||||
mkdir -p $DIRS
|
mkdir -p $DIRS
|
||||||
|
|
|
@ -1220,7 +1220,7 @@ static PCIDeviceInfo e1000_info = {
|
||||||
.qdev.vmsd = &vmstate_e1000,
|
.qdev.vmsd = &vmstate_e1000,
|
||||||
.init = pci_e1000_init,
|
.init = pci_e1000_init,
|
||||||
.exit = pci_e1000_uninit,
|
.exit = pci_e1000_uninit,
|
||||||
.romfile = "pxe-e1000.bin",
|
.romfile = "pxe-e1000.rom",
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_NIC_PROPERTIES(E1000State, conf),
|
DEFINE_NIC_PROPERTIES(E1000State, conf),
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
|
|
|
@ -2054,7 +2054,7 @@ static void eepro100_register_devices(void)
|
||||||
PCIDeviceInfo *pci_dev = &e100_devices[i].pci;
|
PCIDeviceInfo *pci_dev = &e100_devices[i].pci;
|
||||||
/* We use the same rom file for all device ids.
|
/* We use the same rom file for all device ids.
|
||||||
QEMU fixes the device id during rom load. */
|
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->init = e100_nic_init;
|
||||||
pci_dev->exit = pci_nic_uninit;
|
pci_dev->exit = pci_nic_uninit;
|
||||||
pci_dev->qdev.props = e100_properties;
|
pci_dev->qdev.props = e100_properties;
|
||||||
|
|
|
@ -742,7 +742,7 @@ static int pci_ne2000_init(PCIDevice *pci_dev)
|
||||||
if (!pci_dev->qdev.hotplugged) {
|
if (!pci_dev->qdev.hotplugged) {
|
||||||
static int loaded = 0;
|
static int loaded = 0;
|
||||||
if (!loaded) {
|
if (!loaded) {
|
||||||
rom_add_option("pxe-ne2k_pci.bin", -1);
|
rom_add_option("pxe-ne2k_pci.rom", -1);
|
||||||
loaded = 1;
|
loaded = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -310,7 +310,7 @@ static int pci_pcnet_init(PCIDevice *pci_dev)
|
||||||
if (!pci_dev->qdev.hotplugged) {
|
if (!pci_dev->qdev.hotplugged) {
|
||||||
static int loaded = 0;
|
static int loaded = 0;
|
||||||
if (!loaded) {
|
if (!loaded) {
|
||||||
rom_add_option("pxe-pcnet.bin", -1);
|
rom_add_option("pxe-pcnet.rom", -1);
|
||||||
loaded = 1;
|
loaded = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3484,7 +3484,7 @@ static PCIDeviceInfo rtl8139_info = {
|
||||||
.qdev.vmsd = &vmstate_rtl8139,
|
.qdev.vmsd = &vmstate_rtl8139,
|
||||||
.init = pci_rtl8139_init,
|
.init = pci_rtl8139_init,
|
||||||
.exit = pci_rtl8139_uninit,
|
.exit = pci_rtl8139_uninit,
|
||||||
.romfile = "pxe-rtl8139.bin",
|
.romfile = "pxe-rtl8139.rom",
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_NIC_PROPERTIES(RTL8139State, conf),
|
DEFINE_NIC_PROPERTIES(RTL8139State, conf),
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
|
|
|
@ -877,7 +877,7 @@ static PCIDeviceInfo virtio_info[] = {
|
||||||
.qdev.size = sizeof(VirtIOPCIProxy),
|
.qdev.size = sizeof(VirtIOPCIProxy),
|
||||||
.init = virtio_net_init_pci,
|
.init = virtio_net_init_pci,
|
||||||
.exit = virtio_net_exit_pci,
|
.exit = virtio_net_exit_pci,
|
||||||
.romfile = "pxe-virtio.bin",
|
.romfile = "pxe-virtio.rom",
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
||||||
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, false),
|
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, false),
|
||||||
|
|
Loading…
Reference in New Issue