Merge commit '898829d5c731516c96f9e3cc3cdcbe36cd494fd4' into stable-0.12-merge

* commit '898829d5c731516c96f9e3cc3cdcbe36cd494fd4':
  pci romfiles: add property, add default to PCIDeviceInfo

Conflicts:
	hw/pci.h

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/hw/pci.h b/hw/pci.h
index 3ddc7b56d..5d82cce4e 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -269,6 +269,7 @@ struct PCIDevice {
     int32_t version_id;
 
     /* Location of option rom */
+    char *romfile;
     ram_addr_t rom_offset;
 
     /* How much space does an MSIX table need. */
@@ -298,8 +299,6 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
                             pcibus_t size, int type,
                             PCIMapIORegionFunc *map_func);
 
-int pci_add_option_rom(PCIDevice *pdev, const char *name);
-
 int pci_enable_capability_support(PCIDevice *pci_dev,
                                   uint32_t config_start,
                                   PCICapConfigReadFunc *config_read,
@@ -442,6 +441,9 @@ typedef struct {
 
     /* pcie stuff */
     int is_express;   /* is this device pci express? */
+
+    /* rom bar */
+    const char *romfile;
 } PCIDeviceInfo;
 
 void pci_qdev_register(PCIDeviceInfo *info);