pci: allow loading roms via fw_cfg.
This patch adds a pci bus property 'rombar' which specifies whenever the pci rom should be loaded via pci rom bar (default) or via fw_cfg. The later can be used for compatibility with older qemu versions where no pci rom bar is present. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
8832cb805d
commit
88169ddf82
15
hw/pci.c
15
hw/pci.c
|
@ -64,6 +64,7 @@ static struct BusInfo pci_bus_info = {
|
||||||
.props = (Property[]) {
|
.props = (Property[]) {
|
||||||
DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1),
|
DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1),
|
||||||
DEFINE_PROP_STRING("romfile", PCIDevice, romfile),
|
DEFINE_PROP_STRING("romfile", PCIDevice, romfile),
|
||||||
|
DEFINE_PROP_UINT32("rombar", PCIDevice, rom_bar, 1),
|
||||||
DEFINE_PROP_END_OF_LIST()
|
DEFINE_PROP_END_OF_LIST()
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -1501,6 +1502,20 @@ static int pci_add_option_rom(PCIDevice *pdev)
|
||||||
if (strlen(pdev->romfile) == 0)
|
if (strlen(pdev->romfile) == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
if (!pdev->rom_bar) {
|
||||||
|
/*
|
||||||
|
* Load rom via fw_cfg instead of creating a rom bar,
|
||||||
|
* for 0.11 compatibility.
|
||||||
|
*/
|
||||||
|
int class = pci_get_word(pdev->config + PCI_CLASS_DEVICE);
|
||||||
|
if (class == 0x0300) {
|
||||||
|
rom_add_vga(pdev->romfile);
|
||||||
|
} else {
|
||||||
|
rom_add_option(pdev->romfile);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
path = qemu_find_file(QEMU_FILE_TYPE_BIOS, pdev->romfile);
|
path = qemu_find_file(QEMU_FILE_TYPE_BIOS, pdev->romfile);
|
||||||
if (path == NULL) {
|
if (path == NULL) {
|
||||||
path = qemu_strdup(pdev->romfile);
|
path = qemu_strdup(pdev->romfile);
|
||||||
|
|
1
hw/pci.h
1
hw/pci.h
|
@ -177,6 +177,7 @@ struct PCIDevice {
|
||||||
/* Location of option rom */
|
/* Location of option rom */
|
||||||
char *romfile;
|
char *romfile;
|
||||||
ram_addr_t rom_offset;
|
ram_addr_t rom_offset;
|
||||||
|
uint32_t rom_bar;
|
||||||
};
|
};
|
||||||
|
|
||||||
PCIDevice *pci_register_device(PCIBus *bus, const char *name,
|
PCIDevice *pci_register_device(PCIBus *bus, const char *name,
|
||||||
|
|
Loading…
Reference in a new issue