From nobody Fri Nov 21 10:03:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1763650697; cv=none; d=zohomail.com; s=zohoarc; b=CERWoZprd1Av5DOUxE4GrNpwu9L+PzlZDpifXd345fM20vz8hP8hh7YdgT7NMtNTvnfAkF4OPTY+U58v6FOHJBqDi+Dr6ykMPkGRfCvbo4K51R9f+IKlQjy/Km4rqdQHR10xhOAIXKyMZYrr4ewluLOpfyq6B48SU0rCAGEDbVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763650697; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc; bh=zskOJ+BCrUKuSrcj/Se3751gzhurcO+FnW0u7HT4Oqs=; b=Wnsc2pTy4Gspmb6HRKRoe4S3QVlhLMnYTqetVuPjFiRgb2ogwvxDQLH8BRSRVoi3DESwGb8tjvaa59c/44f232JlStjP/E17W4HYfjtyWL9DucUr3VlnqsrUKOByX7NX6GpUYA2VoYjJYDy/1LuLywmvTZ0Z3tyQC5QMIawr9eM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1763650697265688.1320215362698; Thu, 20 Nov 2025 06:58:17 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 3824F43EA9; Thu, 20 Nov 2025 09:58:16 -0500 (EST) Received: from [172.19.199.53] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C3EEE4436F; Thu, 20 Nov 2025 09:57:36 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id E5FD543DF7; Thu, 20 Nov 2025 09:57:28 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3A23941B2F for ; Thu, 20 Nov 2025 09:57:27 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-427-NeJQrVB-OaGfXRditErU6Q-1; Thu, 20 Nov 2025 09:57:25 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5A1A0180009D for ; Thu, 20 Nov 2025 14:57:24 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.34.151]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 81D943001E83 for ; Thu, 20 Nov 2025 14:57:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763650646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zskOJ+BCrUKuSrcj/Se3751gzhurcO+FnW0u7HT4Oqs=; b=cCCAFQXvZiZ1oCeP6s6zybO/Yvxb+2b3pnEbdaOR+ivarRFqg6MYzyVWkSURgU7PHMRgMS U9dMuUJObNWecqVvUCMXpGsFwKz+YtLoWHV5jZNw78PPxPYMDdI2lWgZseMCq8UZlKBnzo eSvEkb57DaGe5+2PHsyGO52Nz0df2kQ= X-MC-Unique: NeJQrVB-OaGfXRditErU6Q-1 X-Mimecast-MFC-AGG-ID: NeJQrVB-OaGfXRditErU6Q_1763650644 To: devel@lists.libvirt.org Subject: [libvirt PATCH] qemu: make qemuBuildDeviceAddressPCIGetBus more generic Date: Thu, 20 Nov 2025 15:56:14 +0100 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9wxaCegHFCCuHu3y_5y7zcBQA2vNOZoYft4sJu6IQkw_1763650644 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6B2L2CSYLICGUNKQGC3YSE22FZKWAIHN X-Message-ID-Hash: 6B2L2CSYLICGUNKQGC3YSE22FZKWAIHN X-MailFrom: jtomko@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?J=C3=A1n_Tomko_via_Devel?= Reply-To: =?UTF-8?q?J=C3=A1n=20Tomko?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1763650698824018900 From: J=C3=A1n Tomko Operate on a virPCIDeviceAddress, not virDomainDeviceInfo so that this can be reused to look for buses that are not stored in the device info. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- A prerequisite for the SMMUv3 series src/qemu/qemu_command.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c56c321a6e..d5a4201e12 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -332,7 +332,7 @@ qemuBuildMasterKeyCommandLine(virCommand *cmd, =20 static char * qemuBuildDeviceAddressPCIGetBus(const virDomainDef *domainDef, - const virDomainDeviceInfo *info) + const virPCIDeviceAddress *pci) { g_autofree char *devStr =3D NULL; const char *contAlias =3D NULL; @@ -340,14 +340,14 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *d= omainDef, int contTargetIndex =3D 0; size_t i; =20 - if (!(devStr =3D virPCIDeviceAddressAsString(&info->addr.pci))) + if (!(devStr =3D virPCIDeviceAddressAsString(pci))) return NULL; =20 for (i =3D 0; i < domainDef->ncontrollers; i++) { virDomainControllerDef *cont =3D domainDef->controllers[i]; =20 if (cont->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI && - cont->idx =3D=3D info->addr.pci.bus) { + cont->idx =3D=3D pci->bus) { contAlias =3D cont->info.alias; contIsPHB =3D virDomainControllerIsPSeriesPHB(cont); contTargetIndex =3D cont->opts.pciopts.targetIndex; @@ -355,7 +355,7 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *dom= ainDef, if (!contAlias) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Device alias was not set for PCI control= ler with index '%1$u' required for device at address '%2$s'"), - info->addr.pci.bus, devStr); + pci->bus, devStr); return NULL; } =20 @@ -397,7 +397,7 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *dom= ainDef, if (!contAlias) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not find PCI controller with index '%1$u' = required for device at address '%2$s'"), - info->addr.pci.bus, devStr); + pci->bus, devStr); return NULL; } =20 @@ -584,7 +584,7 @@ qemuBuildDeviceAddressProps(virJSONValue *props, switch (info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: { g_autofree char *pciaddr =3D NULL; - g_autofree char *bus =3D qemuBuildDeviceAddressPCIGetBus(domainDef= , info); + g_autofree char *bus =3D qemuBuildDeviceAddressPCIGetBus(domainDef= , &info->addr.pci); =20 if (!bus) return -1; --=20 2.51.1