From nobody Sun Sep 28 16:35:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=htecgroup.com); dmarc=pass(p=reject dis=none) header.from=htecgroup.com ARC-Seal: i=2; a=rsa-sha256; t=1758705774; cv=pass; d=zohomail.com; s=zohoarc; b=Ge0JVKVdLZfwucRTNqern+gI7cB3QAX7Re2LJNjU2+KFq9Iriaj++LJNMlsd9fC9TQ4/I2KLkSP8MkWZBZDkUbIsRca6zmOBBW8s7fMHzRv8E7fx3ZGJlBRMcE5CoVfg7ai+0X6dMusHjt52u+eGtCUY4+AR8vN8vu779489Fu4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758705774; h=Content-ID:Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=eC2z39Vf+7MGFSTzi8JX8b8fP2AzHsqmMcAR/iHhppY=; b=ejIDk9YGnxWaNDGha+u/MnNHmLNQmstIxA7ry3D6EDGsiNTXgX2HukKvvzI0F1cQEkahFSHL8upxMcMaYizUO8wfZAAMA1SkRyAkpz4D3mw1sI0H5xOvIDKcVHzcTy+/ycgPGf/sulY/lBiW8GUsJik0C35fH1qu3BKcSpTTT44= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=htecgroup.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758705774500848.9602332739993; Wed, 24 Sep 2025 02:22:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v1LeX-0003ng-6i; Wed, 24 Sep 2025 05:19:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v1LeV-0003k9-DV; Wed, 24 Sep 2025 05:19:07 -0400 Received: from mail-northeuropeazlp170120005.outbound.protection.outlook.com ([2a01:111:f403:c200::5] helo=DUZPR83CU001.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v1LeT-00030I-DC; Wed, 24 Sep 2025 05:19:07 -0400 Received: from AS4PR09MB6518.eurprd09.prod.outlook.com (2603:10a6:20b:4fb::5) by VI0PR09MB7826.eurprd09.prod.outlook.com (2603:10a6:800:21b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.20; Wed, 24 Sep 2025 09:18:21 +0000 Received: from AS4PR09MB6518.eurprd09.prod.outlook.com ([fe80::ad50:891a:847c:580a]) by AS4PR09MB6518.eurprd09.prod.outlook.com ([fe80::ad50:891a:847c:580a%4]) with mapi id 15.20.9160.008; Wed, 24 Sep 2025 09:18:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Fq/Jd6SgbNlXX1I8W9VR1fjXq7cfOMY0D/FA8O+1+fzwZQ+fbhvYxtATXKvKHRdAeq4jAkCCYhJOOgx/JdpJauVGK+pk0/y8rW3V0uDKrP5Jt6aUfPJIrfc6XhjbWdPIt6rSPgvgIoz66/00AWwM8j69CIpN6kfoOlGY/UjFzAv+vd5qorfBE25HGO84ZAqHL8vSPVwNxXn8IztfhXo2ag7+xFYjHhzhKTgiu2Bne2OPopwyhRBSDLbR/uPhhEXBug8x08IVeUOmf2C/GtwGWUE21MggtDwgweINxmsUm2zgjDUtGQFgcNjbUCGUDntPQFXOsZEaMzUoMfSv5xQd5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eC2z39Vf+7MGFSTzi8JX8b8fP2AzHsqmMcAR/iHhppY=; b=PpxWSrAzSS+1JmNedsnoSiqQW+SELbDnBkglbd0zzJsNQyxqVTqzS0EdQ0ZNRS70eD/QqOrQwYBCGjjzCBYt+Dua1A3xQveQiw3PeFS1RD5csoBIySAJqnPcjb8CuFsM8EHW6h2Cxvzfov3GjpJZkhcTZkycZ6teYE/yaxHdLz41DauiduRCAKK3Jb+ZVIw02XAlR3Q1TorD7sA5pM6CgGNG3W+1AfCknF4THtwbqjyvwsHB8hb2EdMdzxS5UadGtvZVFniHZLQTUU3qnetJO4U+jwHJW1btZevDOfOW2wnYl0q9cV8FPxeA1L/S2SATUcUnMCZmT5jtDdi4THfdoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=htecgroup.com; dmarc=pass action=none header.from=htecgroup.com; dkim=pass header.d=htecgroup.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=htecgroup.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eC2z39Vf+7MGFSTzi8JX8b8fP2AzHsqmMcAR/iHhppY=; b=EHiQ+OjKn2jwq9yuonIdcA8RWW6+QBz3MdrH379xJ9nJiChJ1LEaoE8DSYpL9FwXavO1a/+kVY6+6BHMsKHkMgFBtSnK87/Zz6sqFI3Sd+bPZOZi9mfzhuRVnXp0pIkOHki8JVw2OlKPZpymERxfGtjYyRSOWSOeVlqA2o3H/MxW+ERGw/04U/J9/A93nAthNoSH+eshWJFDFh0/xHMFbmWlSYUOGCvORc/5bTxFOjlhdR8uIii/yVc9nKtQSn1SzFznG9TuFhgaACBBZYhwH3FRBiiQytbNW92Z5ihEWz+6gPEEjA1BSAjXyovIln3i39Ks1gq9KwxjQ7GMYbxSSQ== From: Djordje Todorovic To: "qemu-devel@nongnu.org" CC: "qemu-riscv@nongnu.org" , "cfu@mips.com" , "mst@redhat.com" , "marcel.apfelbaum@gmail.com" , "dbarboza@ventanamicro.com" , "philmd@linaro.org" , Djordje Todorovic Subject: [PATCH v8 12/14] hw/pci: Allow explicit function numbers in pci Thread-Topic: [PATCH v8 12/14] hw/pci: Allow explicit function numbers in pci Thread-Index: AQHcLTQpNMlUwFw1ck2qxI/DmLV3sQ== Date: Wed, 24 Sep 2025 09:18:17 +0000 Message-ID: <20250924091746.1882125-13-djordje.todorovic@htecgroup.com> References: <20250924091746.1882125-1-djordje.todorovic@htecgroup.com> In-Reply-To: <20250924091746.1882125-1-djordje.todorovic@htecgroup.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=htecgroup.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AS4PR09MB6518:EE_|VI0PR09MB7826:EE_ x-ms-office365-filtering-correlation-id: b2672f90-3589-4e64-2035-08ddfb4b4ea2 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|376014|1800799024|366016|38070700021; x-microsoft-antispam-message-info: =?utf-8?B?Z2VRVlRMNmJUd3diaCtBU2UrTi9vcXNwSCtGRi9qZlY5QUlncEFTQ21YdGpZ?= =?utf-8?B?VXlRajZXZFJZMEJJN2NaZE04VnBZSitseWtZeDMxckFZTzcwVmVJZi81OVVL?= =?utf-8?B?Yll6U0szQlNzM1JxWGRSVjBIQ3JvM1VSazJFNUdnOGxCdXJORGxUQXpaYXhY?= =?utf-8?B?UHlVMkM5OFdaanhqR2dCdkVzNGhvL2krcmJLY3BjYmhoTDltRnpSdXQwODhJ?= =?utf-8?B?Zk5PcElOclY3a0lYVU50Smdqc2VsQlRTelNMRG1lZW15YytTTmpHOVAxSE9E?= =?utf-8?B?NlZ5R3NLYTFOZWNwZVlWWE9hM1NhamRNUGhTdDUyUXFONUxZbS9ZM3Y3VEpl?= =?utf-8?B?TjhVUitKdVBHRXFReklCMlYzRlh5SENyTlhkc3hLd1FTdVRjLzVCMWxwSTF3?= =?utf-8?B?QUZlazdHZzhacW9FZll4NktxVERuMU1UTHBGU09aKzh2S01McFovTDNIU2xi?= =?utf-8?B?dGpOci9keHdlL0p3K1FWd2NqWUV6TFlpQ3pRdDhlK3lYQWtmWXdydVVJR2lG?= =?utf-8?B?ZUwwSUk2VGREVnFSdXc5RnNTT20wVkpaNytYWFJ1NEJodVpRUlF5SlRkNXBW?= =?utf-8?B?OXI1ZUV1bE9tOFJaWllaWUxwMEVXd2V2Tmc5UVQ3Um1kNm1QQ1ZlMVhjZGRp?= =?utf-8?B?QWpUcjdCNEZST3dZYTc3blQ0YW9nZzYxd3lBakhSZnMyUFIzNVRTY3FrblFG?= =?utf-8?B?MVFORnhCcmhCeEowQmd3TTg1UTduWElLZi9Vbm16U3pCdDR5STdDQmJRK2U3?= =?utf-8?B?MVQwN3k3anhtRW00eEQ4eDEyd2lZenk3VVRaTjhZQTBZUTVxdzBRbU5odzNK?= =?utf-8?B?WlhFNWZteFQwNkx2bGR3Z3p5djJCNkxjMTRKNm0xKzVTWS8wL1VLbEFwNlJR?= =?utf-8?B?TzBtQ1NScVNDOG9WZ3NFMDg2ODhUME82RWVPOXUyQVdtbUZEN01pQWxwaERU?= =?utf-8?B?enBJb2xzZ21SRFZYcmp0VGJvc2o0bFBwMlpZSmlyM0dMY2ZDL2lvY29EVy94?= =?utf-8?B?ZVhVNlU3VU0wS1Q5WFlrV2FiWUlWMHB5RlIxWWdpZkNDbWtnQXJ6ZDNkTDFL?= =?utf-8?B?OURXSEJqVkdtQnRQOHFybzZ6c2xvMU9DbVJGL1ZWbnNnYUlsdi93YittRXdQ?= =?utf-8?B?MGplSHNqZU56emNaWHl2NEZHdzRVZTZpOTh3L3UxaHMvaXVCZ0NYaVYyUmx0?= =?utf-8?B?V3E2K2lKS3hFbUZVdFA4UkdZQS9zZU03ajZ6ZlNmWmIwamo0aHpzMUNvbmd6?= =?utf-8?B?L2EvWlU3Y00vL2tBa0x3ZGtud3NoR25jZktzcG1la1ZLSnVHQ1U5MmNyajgx?= =?utf-8?B?MUZtMmNUN3p1UDJ0REdEQUZGUlFuZW5VV0tvVDNESG5zZnFKd2N2NWh5c2JB?= =?utf-8?B?OVZiOUJsWDNCdlc5VUErcEJ3blpUa3ZLSVdIMFk2Q09YTUU4UmR3aVlJTGxV?= =?utf-8?B?dUJiV25vODBmTXJSQUFYRWRmYmtmNVF6N2x0V3dJK1VjT0E0TVQrejViNERR?= =?utf-8?B?UmtxUlBoQ0dMemFoM0wrSTlZM2FXeVkwSVJwUDV0Q2NybUxnWUV2MXl4NmM3?= =?utf-8?B?VFZHWDJKWWl1dXlhc0dmYkNYMjRNczJMSVZzSlhIYis2QUFKL08yWUFUbS9F?= =?utf-8?B?Uk9obXJ2VHg5WlRXK2twcEszaFpYd3pzb0NTb0EybCswcTZyZHNmY0FEK0hD?= =?utf-8?B?cGY2QWp1UzV3dG0rUlYveDBwTXRqcnE5UFlLaUl5TnpaR2N4YmJ5eUdwRGVu?= =?utf-8?B?WW1QVUZzVHVPSFJUNzhLNjZ4Zk8xSW82eVVPc2VhZWliWW8wa28zMDJYbzB2?= =?utf-8?B?MXBZU3JuMjJGQTJTMDlKWVpqRnoxZWZuQjgrdDFmNkRJT2Z4S2xZdmpwVmJk?= =?utf-8?B?Rk13c3JyTmpMejFXMHVUMlJmbzJMZDlpc01rbjNySkIvNEExSlZuQVZpU3Zy?= =?utf-8?B?Z3prcFFCWWcxVzlTOGFlMmpLbFdUTG1EcDhUR1FIQksyQjFsWXRSdndjVzVG?= =?utf-8?B?WUJBVzZpTU1nPT0=?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS4PR09MB6518.eurprd09.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(1800799024)(366016)(38070700021); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?VzRKVC9rMmFLL1lQZ1ZYS0xsS2NEdTNlcTNjcW1SVEdhMnQyaTlGL2szSCtu?= =?utf-8?B?WDFDcmlNU3FIRUNRMUFJMy9zdnNyUW9QaWdMd1B6L2UyaDZGREUxL2VwQjI3?= =?utf-8?B?TVVtbmhBN0JXOUpsUFJ3QWRZbm9DVnRTSURFR29VbWtmT3dFY1NTL0NKUmRj?= =?utf-8?B?b3RLL0tWWHI2cFgvUnpwelljSUsweW03akxWMlhJaXd6Y2JMdE8zOTZ5eEFj?= =?utf-8?B?OGxKWjY1c2c1bUZVbXI1dFA5SHY5TlBGdmpnTDBRTU44dDdGWVpGV1cxWWVX?= =?utf-8?B?TXVjcldRakRWYWFnc2F1dTk2V2VmTnpxY04xamFyOGdIWjlIaVNMMVdqU0JP?= =?utf-8?B?UWpiazdlTEhYdmFVWjUwV3owL211SFlvaGMwdzFxNEE5eE12cGtReE9ETTdN?= =?utf-8?B?ZXNGYk1ZdDExTUdQb0xsK0lFUVlsMXF0YUZIcnRtVTBsaUhhU21YRVFQQ0lx?= =?utf-8?B?c3VPSEVEQVVsOGcwUnhGaFY3VUxpaldqYStHQWVvOXJURVFVWjU2SFI3bmtH?= =?utf-8?B?cjVYQ2x4QTBWSXNqdVcrbVZBdVVhR21PWmk0WnVYSS9KclYrWUhLRjkwdnhM?= =?utf-8?B?VGtwUHdwNmwrRUttWDY0OFFtS1JocmdTR3FIZ0MwV1pMak13S2hzVDV5VXhE?= =?utf-8?B?aUFXZWtJakdjd2NRL1RqR1hhQmkwSVMzS09EMC8rdy9keldDZUl2OE4vdFVn?= =?utf-8?B?MzlVSVh2N2pSUWRxcFhHMXF4STh0T1dtaFRxcGpxdCs0YjRFd3VqcHlZUG5y?= =?utf-8?B?L3RJdTh3WEdwaDJ0UWhpdHFjNzc1bitQck8wZk94OFF0TXp0WUczbHdJaVFN?= =?utf-8?B?Ymc3QXNjQTVjSkdoYkFLbXJudkRSYjVaekVqZldjK21BZ2tUK3E1Zm9QSTlC?= =?utf-8?B?RTNHZzVoZVhWYk1ORHlqcHY3U2NxSXhETlZoeDRUS3VONkU1MXBYdWdGVVZP?= =?utf-8?B?VTJnL3JUYXhFZWF6emVVOEFzMUtvdWdNUk00ZGFJZVZ0UVBEQ0l0bWdOb2Yy?= =?utf-8?B?dVkvOGNuU0tUbjVPamc0d01qcmRHU3pLSGdOSFlSekk0RkNZaE1OQk9PTWlq?= =?utf-8?B?SFgvcDlNOVdtR3QyNHpVMHZ4cksvM1liMzQ1UVlISmczR0RSNm1ZcVFLb004?= =?utf-8?B?K1RLdk04U0JDb2ZsOWVQK0E2bzZoa0ZEZFhkNTNnUEtBTVhpandqZnBnZEtj?= =?utf-8?B?eWhsQzAzRjhwelNZb1JOV1c3cmNFM0F1NFRNSkQ0NUFYM3hwUHlUd3dHMnU2?= =?utf-8?B?VmNZdzJzUjd6NXBtanlhSWhUQWY0V3ltdWJ5cEwxdVBBWnNCclgzWjVaemRh?= =?utf-8?B?UVRHZDU3Q2dHN3hIRGpnZDg3ZTUxSitzT3psaVo4UWhLaE1vdkRYUGYrYnJY?= =?utf-8?B?LzlRY0drd0dOdUpQdDN5UVRmOUhIblhJWU41S3FVdTBkTmFYSERFdHNmbE1k?= =?utf-8?B?SS82N05UUEVNREprZkhySStkY0J3N3pNcm5USjVxU2ZHNjJXRCtKamIvTW5S?= =?utf-8?B?bUplcWJmcVlaVXg2NlVJbVJlK29JYnVjVGJSeEZiWHIwdlBPVmw2ejRLWmZZ?= =?utf-8?B?L2hrOWs5QkhCTHk4SUJUNVR6OTA1cTZ3N1U1b0xRWGRpVStnZG9oTm0yNFdB?= =?utf-8?B?MDhFN1RWdlhaVStDZDJXVzFxbGRvcGxJSXFPbXFCZ3FoWXFmR2FXblhsakVI?= =?utf-8?B?SmRjZmk3dklPdXU1MktETklXMjA1OHVuWlpLUzUyOXBzbmtOZG5VQ0x6Rnk3?= =?utf-8?B?QkZtbmRyOFl4L1hmNmZEaEtXZWhKYWlkUlR0UU1zS3BxamlZMGxXMTNJSlpQ?= =?utf-8?B?em42bkxRck9pMUJQb1EycmYxR1ZyWWxqZjA2dzZENDZmY0RPNWdRNjVTZUdP?= =?utf-8?B?ZEhtWHJGYmsyQ0VaZGVTM2taQTc1dURNV3BNZ3U4ZW5jYlc1QWhFbXFLWXFO?= =?utf-8?B?SHdMRmZOVTZBazJ1Zlh3VXlzVlltbWswK0FhUnQxZlYzb0FGOS9yNlB2d3Ur?= =?utf-8?B?bnZOOHBqQlRlN3pUeWNCNlNuVTJaM25Mb0drWWFDSDZ6empCL1YyQUd4dkU5?= =?utf-8?B?NE9vVEtaNlArOVpVcjZYKzdtcTFSQXczd0dxMmI3aDVQZTNsdzBNU016aC94?= =?utf-8?B?NlFiNjN3RW9MRThkcUFGYzljY2xBZUJ1UEhGVmFEdTVtb3EwNFZVL1hwM3pJ?= =?utf-8?Q?Ctf137vQpM+dq3+OyIG9dNw=3D?= Content-Type: text/plain; charset="utf-8" Content-ID: <880FEA0B115BB94CBDC54F9099B00E88@eurprd09.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: htecgroup.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AS4PR09MB6518.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2672f90-3589-4e64-2035-08ddfb4b4ea2 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2025 09:18:17.9394 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9f85665b-7efd-4776-9dfe-b6bfda2565ee X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: nkioj/78qIsr8LZoGZgbE71Y8+VDQtTrlGIy5pNQEj2mRK1pVslBywnyP/9tW5EwleexYRzoZ0LXRzUj6Fyz8W6GXOv1+0y1r3VJsk0TQ5M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR09MB7826 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c200::5; envelope-from=Djordje.Todorovic@htecgroup.com; helo=DUZPR83CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @htecgroup.com) X-ZM-MESSAGEID: 1758705776652116600 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 Signed-off-by: Djordje Todorovic Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci/pci.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index c70b5ceeba..5d4ffd0d3e 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -984,14 +984,15 @@ static int pci_parse_devaddr(const char *addr, int *d= omp, int *busp, =20 slot =3D val; =20 - if (funcp !=3D NULL) { - if (*e !=3D '.') + if (funcp !=3D NULL && *e !=3D 0) { + if (*e !=3D '.') { return -1; - + } p =3D e + 1; val =3D strtoul(p, &e, 16); - if (e =3D=3D p) + if (e =3D=3D p) { return -1; + } =20 func =3D val; } @@ -2054,15 +2055,18 @@ bool pci_init_nic_in_slot(PCIBus *rootbus, const ch= ar *model, int dom, busnr, devfn; PCIDevice *pci_dev; unsigned slot; + unsigned func; + PCIBus *bus; =20 if (!nd) { return false; } =20 - if (!devaddr || pci_parse_devaddr(devaddr, &dom, &busnr, &slot, NULL) = < 0) { - error_report("Invalid PCI device address %s for device %s", - devaddr, model); + if (!devaddr || + pci_parse_devaddr(devaddr, &dom, &busnr, &slot, &func) < 0) { + error_report("Invalid PCI device address %s for device %s", devadd= r, + model); exit(1); } =20 @@ -2071,7 +2075,7 @@ bool pci_init_nic_in_slot(PCIBus *rootbus, const char= *model, exit(1); } =20 - devfn =3D PCI_DEVFN(slot, 0); + devfn =3D PCI_DEVFN(slot, func); =20 bus =3D pci_find_bus_nr(rootbus, busnr); if (!bus) { --=20 2.34.1