diff options
| author | Djordje Todorovic <Djordje.Todorovic@htecgroup.com> | 2025-06-18 12:27:49 +0000 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-09-02 17:57:05 +0200 |
| commit | e74416713fe166a6f21cc5ee2000cfd0c248e1a7 (patch) | |
| tree | 25f530fdb43a1884f3a8a30deecf1ab99070026a | |
| parent | 32ee080ccdde8a90d5ee3b56e28f95ada35dee4c (diff) | |
| download | qemu-e74416713fe166a6f21cc5ee2000cfd0c248e1a7.zip qemu-e74416713fe166a6f21cc5ee2000cfd0c248e1a7.tar.gz qemu-e74416713fe166a6f21cc5ee2000cfd0c248e1a7.tar.bz2 | |
hw/pci: Allow explicit function numbers in pci
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>
| -rw-r--r-- | hw/pci/pci.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index c70b5ce..297196b 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -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) { |