fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hw/pci: Allow explicit function numbers in pci

Browse source 
Since there is no pch_gbe emulation, we could be using func other
than 0 when adding new devices to specific boards.

Signed-off-by: Chao-ying Fu <cfu@mips.com>
Signed-off-by: Djordje Todorovic <djordje.todorovic@htecgroup.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250901102850.1172983-13-djordje.todorovic@htecgroup.com>
[PMD: Compare with null character ('\0'), not '0']
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Djordje Todorovic 2025-06-18 12:27:49 +00:00 • committed by Philippe Mathieu-Daudé
parent 32ee080ccd
commit e74416713f
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hw/pci/pci.c
View file

@ -984,14 +984,15 @@ static int pci_parse_devaddr(const char *addr, int *domp, int *busp,
slot = val;
if (funcp != NULL) {
if (*e != '.')
if (funcp != NULL && *e != '\0') {
if (*e != '.') {
return -1;
}
p = e + 1;
val = strtoul(p, &e, 16);
if (e == p)
if (e == p) {
return -1;
}
func = val;
}
@ -2054,13 +2055,15 @@ bool pci_init_nic_in_slot(PCIBus *rootbus, const char *model,
int dom, busnr, devfn;
PCIDevice *pci_dev;
unsigned slot;
unsigned func;
PCIBus *bus;
if (!nd) {
return false;
}
if (!devaddr || pci_parse_devaddr(devaddr, &dom, &busnr, &slot, NULL) < 0) {
if (!devaddr || pci_parse_devaddr(devaddr, &dom, &busnr, &slot, &func) < 0) {
error_report("Invalid PCI device address %s for device %s",
devaddr, model);
exit(1);
@ -2071,7 +2074,7 @@ bool pci_init_nic_in_slot(PCIBus *rootbus, const char *model,
exit(1);
}
devfn = PCI_DEVFN(slot, 0);
devfn = PCI_DEVFN(slot, func);
bus = pci_find_bus_nr(rootbus, busnr);
if (!bus) {