On 8. 8. 25. 18:29, Philippe Mathieu-Daudé wrote:
> CAUTION: This email originated from outside of the organization. Do
> not click links or open attachments unless you recognize the sender
> and know the content is safe.
>
>
> On 17/7/25 11:38, Djordje Todorovic wrote:
>> 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>
>> ---
>> hw/pci/pci.c | 15 +++++++++------
>> 1 file changed, 9 insertions(+), 6 deletions(-)
>>
>> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
>> index f5ab510697..23f7f02837 100644
>> --- a/hw/pci/pci.c
>> +++ b/hw/pci/pci.c
>> @@ -974,14 +974,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;
>> }
>> @@ -2045,13 +2046,15 @@ bool pci_init_nic_in_slot(PCIBus *rootbus,
>> const char *model,
>> int dom, busnr, devfn;
>> PCIDevice *pci_dev;
>> unsigned slot;
>> +
>
> [*]
>
>> PCIBus *bus;
>>
>> if (!nd) {
>> return false;
>> }
>>
>> - if (!devaddr || pci_parse_devaddr(devaddr, &dom, &busnr, &slot,
>> NULL) < 0) {
>> + unsigned func;
>
> Declare 'func' earlier in [*], otherwise LGTM.
>
>> + 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);
>> @@ -2062,7 +2065,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) {
>
Thank you! I will address this in v7.