From nobody Sun Feb 8 12:39:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1645622586096567.52454071977; Wed, 23 Feb 2022 05:23:06 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-519-eQU8n46qNMm79aNhFoXLvw-1; Wed, 23 Feb 2022 08:23:01 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E4ADB501FA; Wed, 23 Feb 2022 13:22:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C31117D87A; Wed, 23 Feb 2022 13:22:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 954E255345; Wed, 23 Feb 2022 13:22:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21NDKjLe029888 for ; Wed, 23 Feb 2022 08:20:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6CF072026609; Wed, 23 Feb 2022 13:20:45 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6810F2026990 for ; Wed, 23 Feb 2022 13:20:42 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5A75D89FF01 for ; Wed, 23 Feb 2022 13:20:42 +0000 (UTC) Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-669-MY4yEqj5N_engZPN1LginA-1; Wed, 23 Feb 2022 08:20:40 -0500 Received: by mail-oo1-f46.google.com with SMTP id i6-20020a4ac506000000b0031c5ac6c078so14409405ooq.6 for ; Wed, 23 Feb 2022 05:20:40 -0800 (PST) Received: from rekt.ibmuc.com ([191.193.99.92]) by smtp.gmail.com with ESMTPSA id a4sm27646154oaa.42.2022.02.23.05.20.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 05:20:39 -0800 (PST) X-MC-Unique: eQU8n46qNMm79aNhFoXLvw-1 X-MC-Unique: MY4yEqj5N_engZPN1LginA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u9JF362+HaegmyxuQjgs5jB8hV7ZY9DQXMnMzFpf/90=; b=1uRNA/rAAdhp+mvIHzeLDg6xocBisVjQmbvtSddF0BLEF9BbjmWsDCZDkGGYkoD+IN ON2a4J6D5m++xRPh4MjvnMwtTBI0xedgRck7N9YZKtQqwXPlcn4NP7B0ICBxuJ3Z90eC aZCmBohcr3YPMR5eEmXcfV7x2YJ3l+c2PBChAub7zRs7CdIzubjkDfbPnCCA3PUVg8Iq 2/h5hBGFYP0ntS/mSI0+1E16NL062xfXadMnCxZgmpdDbfF0ktO7bcyoAUYI1b7NejNn IcPJ5okEe5f2f0eG8E3wpstj8E7bEsKAvKMIYKaYz9CssLhQM8t4FhAxKcAhmMJqnhi9 wKvA== X-Gm-Message-State: AOAM532P5i3cWgXxfP1HhsrrXdnQr/h9AbZb+qYprwFvAgVQIXW/XFEt pEovSRGkeB3ZDyysueniX7SW/httA5g= X-Google-Smtp-Source: ABdhPJz7PTZg6RB/pqIFQgsetsMQk0yGVCD1tItzb+ziLdGdOu31vBaHvOn10YDtUKk7dLYZi41IiQ== X-Received: by 2002:a05:6870:1487:b0:d0:e4c4:9b7f with SMTP id k7-20020a056870148700b000d0e4c49b7fmr3897779oab.72.1645622439710; Wed, 23 Feb 2022 05:20:39 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v3 27/29] conf, qemu: add 'pnv-phb4' controller model name Date: Wed, 23 Feb 2022 10:19:50 -0300 Message-Id: <20220223131952.922228-28-danielhb413@gmail.com> In-Reply-To: <20220223131952.922228-1-danielhb413@gmail.com> References: <20220223131952.922228-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: danielhb413@gmail.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1645622587555100016 Similar to the existing pnv-phb3 device, pnv-phb4 is also an implementation of pcie-root. No user doc is needed in this case since the user doesn't ideally set PCI model names manually. Reviewed-by: J=C3=A1n Tomko Signed-off-by: Daniel Henrique Barboza --- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_domain_address.c | 14 +++++++++++++- src/qemu/qemu_validate.c | 2 ++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 43f78473e1..9a9ce91aeb 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2599,6 +2599,7 @@ i82801b11-bridge pnv-phb3 + pnv-phb4 pcie-pci-bridge diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c6b071c153..9767aa5c7b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -441,6 +441,7 @@ VIR_ENUM_IMPL(virDomainControllerPCIModelName, "pnv-phb3-root-port", "pnv-phb3", "pnv-phb4-root-port", + "pnv-phb4", ); =20 VIR_ENUM_IMPL(virDomainControllerModelSCSI, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1313534622..7e4c0fc786 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -649,6 +649,7 @@ typedef enum { VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PNV_PHB3_ROOT_PORT, VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PNV_PHB3, VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PNV_PHB4_ROOT_PORT, + VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PNV_PHB4, =20 VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_LAST } virDomainControllerPCIModelName; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 9290083f39..9d9da31bc7 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2425,6 +2425,18 @@ virDomainControllerGetPowerNVRootPortName(virDomainD= ef *def) } =20 =20 +static virDomainControllerPCIModelName +virDomainControllerGetPowerNVPHBName(virDomainDef *def) +{ + if (STREQ(def->os.machine, "powernv8")) + return VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PNV_PHB3; + else if (STREQ(def->os.machine, "powernv9")) + return VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PNV_PHB4; + + return VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE; +} + + static void qemuDomainPCIControllerSetDefaultModelName(virDomainControllerDef *cont, virDomainDef *def, @@ -2477,7 +2489,7 @@ qemuDomainPCIControllerSetDefaultModelName(virDomainC= ontrollerDef *cont, break; case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: if (qemuDomainIsPowerNV(def)) - *modelName =3D VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PNV_PHB3; + *modelName =3D virDomainControllerGetPowerNVPHBName(def); break; case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 37e7c5616c..2d813355d3 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3439,6 +3439,8 @@ virValidateControllerPCIModelNameToQEMUCaps(int model= Name) return QEMU_CAPS_DEVICE_PNV_PHB3; case VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PNV_PHB4_ROOT_PORT: return QEMU_CAPS_DEVICE_PNV_PHB4; + case VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_PNV_PHB4: + return QEMU_CAPS_DEVICE_PNV_PHB4; case VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE: return 0; case VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_LAST: --=20 2.35.1