From nobody Mon Feb 9 10:32:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633624106; cv=none; d=zohomail.com; s=zohoarc; b=LtaqwqIGamxdDiQv8iqstwd2TBhm5yaqJ+FWjE1HtTn+yQoIr/65cwU4GR8iBuZd7ycXxbI0zOyEKoCSxl4cfzqvtNmUHzUTqLFkumIJUEkZ7lKOsKprmKK5DnjgygmKv84ZpnHJCw/qUoPIG6axhWlAVFs8tqhiz6ytzh8EgBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633624106; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yYpzRn77lAn3V9fgn4iJ7z2EBiFu1olicLoG0HNHXVE=; b=oEBwNwBHQ62N1IaGIWveLLl+PfL9hMu1kjha4LjJxDacXpTogvqkRP2LzzfaC+MVCDQXxEnafI4u8ifd3w0e3lN9B17vg8rNa7urf76NqOWXz3gxqKJhnaA5kO8CK7vYsJaP14qjhoIvpd/LsS5L+wWtSq6tSnfHmc0bECPNAak= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1633624106560206.3535804209506; Thu, 7 Oct 2021 09:28:26 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-269-psvmT3Z0P2K31SgB6S5ViA-1; Thu, 07 Oct 2021 12:28:23 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AA0071B15E48; Thu, 7 Oct 2021 15:56:37 +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 C62C61F8CD0; Thu, 7 Oct 2021 15:56:36 +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 754ED4EA37; Thu, 7 Oct 2021 15:56:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 197FL6aW024457 for ; Thu, 7 Oct 2021 11:21:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id EF37E5F4EA; Thu, 7 Oct 2021 15:21:06 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EB7A5D6BA for ; Thu, 7 Oct 2021 15:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633624105; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=yYpzRn77lAn3V9fgn4iJ7z2EBiFu1olicLoG0HNHXVE=; b=O8p5hvYAVXoiCeCUlq0lRyquN2oSOEAz1Yw23chllsfZpSd8H8Jh7428+2nGPE4xzLb/DD LUEu7MZrjZYRplzAc1wpkT57i7quoDMcXUvWUVoxKNK0tZyo0Tn4emIsrWRbBE+8t1B4Eg mF5JNQURWAK7GtvLRBGrXdg4CD/Mcp8= X-MC-Unique: psvmT3Z0P2K31SgB6S5ViA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 085/103] qemuBuildControllerDevStr: Split out formatting of PCI controller Date: Thu, 7 Oct 2021 17:18:13 +0200 Message-Id: <8db6675f3f41fd280285e12167549dadf6fc9c55.1633619630.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.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.84 on 10.5.11.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633624107941100001 Content-Type: text/plain; charset="utf-8" Move the code into a new function called qemuBuildControllerPCIDevStr so that the code is self contained and the original function easier to follow. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 157 ++++++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 70 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f756bb2edd..31fd9a540d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2947,6 +2947,91 @@ qemuBuildControllerSCSIDevStr(const virDomainDef *do= mainDef, } +static int +qemuBuildControllerPCIDevStr(virDomainControllerDef *def, + const virDomainDef *domainDef, + char **devstr) +{ + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + const virDomainPCIControllerOpts *pciopts =3D &def->opts.pciopts; + const char *modelName =3D virDomainControllerPCIModelNameTypeToString(= pciopts->modelName); + + *devstr =3D NULL; + + /* Skip the implicit PHB for pSeries guests */ + if (def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT && + pciopts->modelName =3D=3D VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_SPA= PR_PCI_HOST_BRIDGE && + pciopts->targetIndex =3D=3D 0) { + return 0; + } + + if (!modelName) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown virDomainControllerPCIModelName value: %= d"), + pciopts->modelName); + return -1; + } + + switch ((virDomainControllerModelPCI) def->model) { + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE: + virBufferAsprintf(&buf, "%s,chassis_nr=3D%d,id=3D%s", + modelName, pciopts->chassisNr, + def->info.alias); + break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: + virBufferAsprintf(&buf, "%s,bus_nr=3D%d,id=3D%s", + modelName, pciopts->busNr, + def->info.alias); + if (pciopts->numaNode !=3D -1) { + virBufferAsprintf(&buf, ",numa_node=3D%d", + pciopts->numaNode); + } + break; + case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_TO_PCI_BRIDGE: + virBufferAsprintf(&buf, "%s,id=3D%s", modelName, def->info.alias); + break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: + virBufferAsprintf(&buf, "%s,port=3D0x%x,chassis=3D%d,id=3D%s", + modelName, pciopts->port, + pciopts->chassis, def->info.alias); + if (pciopts->hotplug !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&buf, ",hotplug=3D%s", + virTristateSwitchTypeToString(pciopts->hotpl= ug)); + } + break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: + virBufferAsprintf(&buf, "%s,index=3D%d,id=3D%s", + modelName, pciopts->targetIndex, + def->info.alias); + + if (pciopts->numaNode !=3D -1) + virBufferAsprintf(&buf, ",numa_node=3D%d", pciopts->numaNode); + break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Unsupported PCI Express root controller")); + return -1; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected PCI controller model %d"), + def->model); + return -1; + } + + if (qemuBuildDeviceAddressStr(&buf, domainDef, &def->info) < 0) + return -1; + + *devstr =3D virBufferContentAndReset(&buf); + return 0; +} + + + /** * qemuBuildControllerDevStr: * @domainDef: domain definition @@ -3013,76 +3098,8 @@ qemuBuildControllerDevStr(const virDomainDef *domain= Def, break; - case VIR_DOMAIN_CONTROLLER_TYPE_PCI: { - const virDomainPCIControllerOpts *pciopts =3D &def->opts.pciopts; - const char *modelName =3D virDomainControllerPCIModelNameTypeToStr= ing(pciopts->modelName); - - /* Skip the implicit PHB for pSeries guests */ - if (def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT && - pciopts->modelName =3D=3D VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME= _SPAPR_PCI_HOST_BRIDGE && - pciopts->targetIndex =3D=3D 0) { - return 0; - } - - if (!modelName) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown virDomainControllerPCIModelName valu= e: %d"), - pciopts->modelName); - return -1; - } - - switch ((virDomainControllerModelPCI) def->model) { - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE: - virBufferAsprintf(&buf, "%s,chassis_nr=3D%d,id=3D%s", - modelName, pciopts->chassisNr, - def->info.alias); - break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS: - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: - virBufferAsprintf(&buf, "%s,bus_nr=3D%d,id=3D%s", - modelName, pciopts->busNr, - def->info.alias); - if (pciopts->numaNode !=3D -1) { - virBufferAsprintf(&buf, ",numa_node=3D%d", - pciopts->numaNode); - } - break; - case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_TO_PCI_BRIDGE: - virBufferAsprintf(&buf, "%s,id=3D%s", modelName, def->info.ali= as); - break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: - virBufferAsprintf(&buf, "%s,port=3D0x%x,chassis=3D%d,id=3D%s", - modelName, pciopts->port, - pciopts->chassis, def->info.alias); - if (pciopts->hotplug !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(&buf, ",hotplug=3D%s", - virTristateSwitchTypeToString(pciopts->h= otplug)); - } - break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: - virBufferAsprintf(&buf, "%s,index=3D%d,id=3D%s", - modelName, pciopts->targetIndex, - def->info.alias); - - if (pciopts->numaNode !=3D -1) - virBufferAsprintf(&buf, ",numa_node=3D%d", pciopts->numaNo= de); - break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Unsupported PCI Express root controller")); - return -1; - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected PCI controller model %d"), - def->model); - return -1; - } - break; - } + case VIR_DOMAIN_CONTROLLER_TYPE_PCI: + return qemuBuildControllerPCIDevStr(def, domainDef, devstr); case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: --=20 2.31.1