>From dfbe5a62db3da79d3d8b73634915471921f6e8ee Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann
Date: Tue, 15 Dec 2009 11:04:31 +0100 Subject: [PATCH] pci: add romfile property Add romfile as bus property to pci, load the file into the rom bar when specified. --- hw/cirrus_vga.c | 4 +++- hw/e1000.c | 8 ++------ hw/pci.c | 19 ++++++++++++++++--- hw/pci.h | 3 +-- hw/rtl8139.c | 8 ++------ hw/virtio-pci.c | 8 ++------ pc-bios/bios.bin | Bin 131072 -> 131072 bytes 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index b08d2ae..b2886c4 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3211,7 +3211,9 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) } /* ROM BIOS */ - pci_add_option_rom((PCIDevice *)d, VGABIOS_CIRRUS_FILENAME); + if (dev->rom_filename == NULL) { + dev->rom_filename = qemu_strdup(VGABIOS_CIRRUS_FILENAME); + } return 0; } diff --git a/hw/e1000.c b/hw/e1000.c index f795601..021f666 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1122,12 +1122,8 @@ static int pci_e1000_init(PCIDevice *pci_dev) qemu_format_nic_info_str(&d->nic->nc, macaddr); - if (!pci_dev->qdev.hotplugged) { - static int loaded = 0; - if (!loaded) { - pci_add_option_rom(&d->dev, "pxe-e1000.bin"); - loaded = 1; - } + if (pci_dev->rom_filename == NULL) { + pci_dev->rom_filename = qemu_strdup("pxe-e1000.bin"); } return 0; } diff --git a/hw/pci.c b/hw/pci.c index dbdfdbf..3ff7d0c 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -63,12 +63,14 @@ static struct BusInfo pci_bus_info = { .print_dev = pcibus_dev_print, .props = (Property[]) { DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), + DEFINE_PROP_STRING("romfile", PCIDevice, rom_filename), DEFINE_PROP_END_OF_LIST() } }; static void pci_update_mappings(PCIDevice *d); static void pci_set_irq(void *opaque, int irq_num, int level); +static int pci_add_option_rom(PCIDevice *pdev); target_phys_addr_t pci_mem_base; static uint16_t pci_default_sub_vendor_id = PCI_SUBVENDOR_ID_REDHAT_QUMRANET; @@ -1387,6 +1389,7 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base) rc = info->init(pci_dev); if (rc != 0) return rc; + pci_add_option_rom(pci_dev); if (qdev->hotplugged) bus->hotplug(pci_dev, 1); return 0; @@ -1470,18 +1473,28 @@ static void pci_map_option_rom(PCIDevice *pdev, int region_num, pcibus_t addr, p } /* Add an option rom for the device */ -int pci_add_option_rom(PCIDevice *pdev, const char *name) +static int pci_add_option_rom(PCIDevice *pdev) { int size; char *path; void *ptr; - path = qemu_find_file(QEMU_FILE_TYPE_BIOS, name); + if (!pdev->rom_filename) + return 0; + if (strlen(pdev->rom_filename) == 0) + return 0; + + path = qemu_find_file(QEMU_FILE_TYPE_BIOS, pdev->rom_filename); if (path == NULL) { - path = qemu_strdup(name); + path = qemu_strdup(pdev->rom_filename); } size = get_image_size(path); + if (size < 0) { + qemu_error("%s: failed to find romfile \"%s\"\n", __FUNCTION__, + pdev->rom_filename); + return -1; + } if (size & (size - 1)) { size = 1 << qemu_fls(size); } diff --git a/hw/pci.h b/hw/pci.h index 89b3f55..c27e800 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -245,6 +245,7 @@ struct PCIDevice { int32_t version_id; /* Location of option rom */ + char *rom_filename; ram_addr_t rom_offset; }; @@ -257,8 +258,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_add_capability(PCIDevice *pci_dev, uint8_t cap_id, uint8_t cap_size); void pci_del_capability(PCIDevice *pci_dev, uint8_t cap_id, uint8_t cap_size); diff --git a/hw/rtl8139.c b/hw/rtl8139.c index 2cee97b..d096711 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3354,12 +3354,8 @@ static int pci_rtl8139_init(PCIDevice *dev) rtl8139_get_next_tctr_time(s,qemu_get_clock(vm_clock))); #endif /* RTL8139_ONBOARD_TIMER */ - if (!dev->qdev.hotplugged) { - static int loaded = 0; - if (!loaded) { - pci_add_option_rom(&s->dev, "pxe-rtl8139.bin"); - loaded = 1; - } + if (dev->rom_filename == NULL) { + dev->rom_filename = qemu_strdup("pxe-rtl8139.bin"); } return 0; } diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 85f14a2..e38fe70 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -519,12 +519,8 @@ static int virtio_net_init_pci(PCIDevice *pci_dev) /* make the actual value visible */ proxy->nvectors = vdev->nvectors; - if (!pci_dev->qdev.hotplugged) { - static int loaded = 0; - if (!loaded) { - pci_add_option_rom(pci_dev, "pxe-virtio.bin"); - loaded = 1; - } + if (pci_dev->rom_filename == NULL) { + pci_dev->rom_filename = qemu_strdup("pxe-virtio.bin"); } return 0; } diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index 29495801950660c19630444e410ff30d673e46af..4e7ae7efeb5964454d263a8b6482206c9d7bc358 100644 GIT binary patch literal 131072 zcmeFadwf*Y)i-`-=1ejP6V3pG28}w{i3SBtEVhIMJGnu)=|BJht%#86U=U(5LqJh8 zo&)#d_)?Rz9wbx#IM-a4s8U{2BXc*8ipkYA6fQA7L0~!W23}_h8FrZ;T address@hidden&@iB3K*NBB0SyBh1~d$47|<}FVL-!xh5-!&8U{2BXc*8ipkYA6 zfQA7L0~!W23}_h8FrZ;address@hidden&@iB3K*NBB0SyBh1~d$47|<}FVL-!x zh5-!&8U{2BXc*8ipkYA6fQA7L0~!W23}_h8FrZ;address@hidden&@iB3K*NBB z0SyBh1~d$47|<}FVL-!xh5-!&8U{2BXc*8ipkYA6fQA7L0~!W23}_h8FrZ;T!+?eX address@hidden&@iB3K*NBB0SyBh1~d$47|<}FVL-!xh5-!&8U{2BXc*8ipkYA6fQA7L z0~!W23}_h8FrZ;address@hidden&@iB3K*NBB0SyBh1~d$47|<}FVL-!xh5-!& z8U{2BXc*8ipkYA6fQA7L0~!W23}_h8FrZ;address@hidden&@iB3K*NBB0SyBh z1~d$47|<}FVL-!xh5-!&8U{2BXc*8ipkYA6fQA7L0~!W23}_h8FrZ;T!+?eX4Fehm address@hidden&@iB3K*NBBf&aG{aBaIZU=VZ^&KgF}b$&;Uk*h+9t#df~!dol7%0*n4v*v z`IB%;dc9?f(3RWcO>PkzPRgAF-BEMyX|IWYwd=a2*Y96c;address@hidden zdjC?3RQoD|address@hidden)$2F^xqPW4J5eSUqsfViwzeGeFPlFo5Af61|f<$waMqv> zL1o#8z!ldU$W{Tp!37e(&Be;F|2oHh2Qf&fRkQE$7uqKic|%hw$nUMO{}s&=u>th9 zy$2!xJN9#U!Daew`zr`!!TMUro-D2}5$pD~Dtfs!TW+sDUViLxa1Qy1Az&VTpik~J z)D?V(K(O-3)k`(+BWJEbs`24H&@R;;z&p;address@hidden&iY;qF)iyr%}rR~2$6O?nkmG3 z$YBx=1xhl9aZRfhs&09&8cA^7bW~mco )S#ux_#Um*q{hDvX1`K&bd?KB zFA;2E5onlp0x!q9*BQ6RU_ZjPOYpe(9yz4)jOSS>@*P0A_Mh7Sxl4{cvu+fyl?vBc zl)z54Jc0JQpf`(E|BR#pj-m+wN!5c%C|ZD;B{jCsLwoT1VBUO^t{ME9is#9N;35;D zZ_KY>V9$(u&ebA61|>t8`!QC_?8zxGBTq%y8Km27>VqXs-kAXp^Qs5S+ReV;%ZPAn zrfBv7`)address@hidden(O>zf-IqF(tVo*?Yu4U(6{HD-W>?*#mH8I31X7 address@hidden>address@hidden)~)mwy6Z=sX9y15c8ztzhM5ENA#m130N& z3cLwf9vv4)&pRj~@()NY!bzkb0pCuNRKt`O3kiDmSAVhDpLa!Rd5udSRp3Lw!aP!F zhpn>Eo(RV{(3FYwyMiZ72qhshnNmi)66ey8qNJMWNst;Lu`Xl3mCMmtZzZr3x46!( z<;h)Aa??C>048!=p|21_a7inwm7!y-1W+(address@hidden|address@hidden z((4Vo6E7~4hNSl>RVF37+i2J&Oot}I$I#YgsD>AjPI4x0U1$Gox1k&oF4#4OOkr=> z(-3IJ4 q~H-t(mwjQA0KLH5sx+{?E|x-2G+k| zpGU8k?ep=H8lTi>_enMXLgC!gE8f0B$aB=uiw06A1Kw2C=>address@hidden@!Xy_!~ zP^nhIh}75EXQ|cB#w&L!7Pub+C(5&brv+{evgE>}mJWb`6Ilcp-4Gaddress@hidden&address@hidden(mxut zDG2KX%rq;6S|&b}vk>@ve}|-5H(L0X2 7?2}Pzg!+7>g2K!3TnOLA|4OA%fqA(pO6$Bk(b~PO5zhAK;>Q zOO1E)z0%`i-B0dDoG*&;7uc_ELD=PAcC!l`D#mTCuwuE`uQDkz{M;address@hidden zci{_iGMBx08$t}KG`cse`*N!RTX`-hJ%j|fzz2_tz!xDQj>bB8t{sD1=WL<2wccu% zYX6BEa0bI#k4Y*kwz}s?ykzc<>_U7qnR?}Eod+O)q?$kB1Mb&Vb3z;j(oS8XlaDqW zwGAFPCOnsm+~jf)4~~YMjtA}3qp3)CQeX-KdLcSnEvp)brZDmA<(-JG_wS Rssqc7d>K#CT!S)*TK6skqQ{lkwES#l*}v?V?70>WH=bb`lrj address@hidden)#PKEU#Zjc}gj&jNi6EC611LGVo!cGC{bMgdctL6gKh+;NfkQ8|ut7)S address@hidden;j(lKaI_S*EW>uyS)w;;1aDFGBC?*|address@hidden>&S=S#6jgl z=*&ESw4>~dIq#~R*?pdb`cW9KGa-yBqMhznsq%OC#bV1A z`=6ss&_eVcdsVWlSgQ4*J!XKuwRzUy)3zLLU|UoM;F2E zMz0ibJ>address@hidden&address@hidden z+(j*GxAOcy;w}|v?1Z6dO#PlK=vyWzgwYP=5TN9p