From nobody Wed Jan 15 13:49:48 2025 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17054873325021023.029502495132; Wed, 17 Jan 2024 02:28:52 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E192419B3; Wed, 17 Jan 2024 05:28:20 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A491C1E0E; Wed, 17 Jan 2024 04:57:05 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id AC01D1E37; Wed, 17 Jan 2024 04:55:16 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 70F911C60 for ; Wed, 17 Jan 2024 04:55:02 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-658-uUH6q7HsOgmCLutpU1lDLg-1; Wed, 17 Jan 2024 04:54:55 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5FD92830E5B for ; Wed, 17 Jan 2024 09:54:55 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.208]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB26040C6EB9 for ; Wed, 17 Jan 2024 09:54:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: uUH6q7HsOgmCLutpU1lDLg-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 03/18] qemu: Fix handling of user aliases for default PHB Date: Wed, 17 Jan 2024 10:54:36 +0100 Message-ID: <20240117095451.788816-4-abologna@redhat.com> In-Reply-To: <20240117095451.788816-1-abologna@redhat.com> References: <20240117095451.788816-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: MJYJWDD45FJOCU3RVPRRVIABYLHKV3KG X-Message-ID-Hash: MJYJWDD45FJOCU3RVPRRVIABYLHKV3KG X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705487333527100001 The bus name for the default PHB is always "pci.0". Fixes: 937f319536723fec57ad472b002a159d0f67a77c Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 23 ++++++++++++++++--- .../pseries-phb-user-alias.ppc64-latest.args | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 712feb7b81..f2a4e1088b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -366,9 +366,26 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *do= mainDef, if (virDomainDeviceAliasIsUserAlias(contAlias)) { /* When domain has builtin pci-root controller we don't pu= t it * onto cmd line. Therefore we can't set its alias. In that - * case, use the default one. */ - if (!qemuDomainIsPSeries(domainDef) && - cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROO= T) { + * case, use the default one. + * + * Note that we have to check the value of targetIndex her= e, + * because we need to handle three different cases: + * + * non-pSeries guest (targetIndex =3D=3D -1) + * =3D> must use default alias + * + * pSeries guest, default PHB (targetIndex =3D=3D 0) + * =3D> must use default alias + * + * pSeries guest, non-default PHB (targetIndex > 0) + * =3D> can use actual alias + * + * The last one is due to non-default PHBs beind created + * through the spapr-pci-host-bridge device, which supports + * custom device IDs and thus custom bus names. + * */ + if (cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROO= T && + contTargetIndex <=3D 0) { if (virQEMUCapsHasPCIMultiBus(domainDef)) contAlias =3D "pci.0"; else diff --git a/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.arg= s b/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args index e64fc9aa11..8a2be8cf0c 100644 --- a/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"spapr-pci-host-bridge","index":1,"id":"ua-phb1"}' \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:a2:44:92","bus":"ua-phb0","addr":"0x1"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:a2:44:92","bus":"pci.0","addr":"0x1"}' \ -netdev user,id=3Dhostnet1 \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:a2:44:93","bus":"ua-phb1.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org