diff options
author | 2010-01-08 15:25:41 +0100 | |
---|---|---|
committer | 2010-01-12 14:48:27 -0600 | |
commit | 027866ce23606b2aa4851efe4060d41354261582 (patch) | |
tree | 7a1834ec7c95a6c14631d72c29f43684058c7df4 /hw | |
parent | roms: rework rom loading via fw (diff) | |
download | qemu-kvm-027866ce23606b2aa4851efe4060d41354261582.tar.gz qemu-kvm-027866ce23606b2aa4851efe4060d41354261582.tar.bz2 qemu-kvm-027866ce23606b2aa4851efe4060d41354261582.zip |
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>
(cherry picked from commit 88169ddf82853ca892ce7bee279579c8a0ac03e5)
Diffstat (limited to 'hw')
-rw-r--r-- | hw/pci.c | 15 | ||||
-rw-r--r-- | hw/pci.h | 1 |
2 files changed, 16 insertions, 0 deletions
@@ -64,6 +64,7 @@ static struct BusInfo pci_bus_info = { .props = (Property[]) { DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), DEFINE_PROP_STRING("romfile", PCIDevice, romfile), + DEFINE_PROP_UINT32("rombar", PCIDevice, rom_bar, 1), DEFINE_PROP_END_OF_LIST() } }; @@ -1464,6 +1465,20 @@ static int pci_add_option_rom(PCIDevice *pdev) if (strlen(pdev->romfile) == 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); if (path == NULL) { path = qemu_strdup(pdev->romfile); @@ -246,6 +246,7 @@ struct PCIDevice { /* Location of option rom */ char *romfile; ram_addr_t rom_offset; + uint32_t rom_bar; }; PCIDevice *pci_register_device(PCIBus *bus, const char *name, |