From nobody Sun Oct 5 01:51:55 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=1758826909; cv=none; d=zohomail.com; s=zohoarc; b=JBcpulxHPg5Y5GsFmHyRH5qhzcSncsf4ces3XTEPhjiBnJja+RvAwdmL81KJjk3R5cd61yM5+xByDEznabOjW4OZn3nDte/X5lPSNP08OKvL9TCQA59q4kUO1tYgzhiQ/mjugtSqBARXC6CtlOcr278yt3c9vqNmattFPZwfO8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758826909; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=GDO5dxnoYIzAupTvYdNapE70twkhP/SrB4XfksXxLXY=; b=K/tgvPYVbQFDFbD7SP0dM0qJQXjwSiklX96w0PGc50TSg6oMl7FGKJ5Ug5tCMBhgA5XlFBoXE3OLR7x297tqdRKXCawZFn7WC9i17EzrEAMNyMOxk7tA15D1zys3eLskCxtULvMaGksbck6aB4YOwTsbMgAkJc8VtaF5s5fAyRc= 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 175882690986990.15957389416326; Thu, 25 Sep 2025 12:01:49 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id F02AD44074; Thu, 25 Sep 2025 15:01:48 -0400 (EDT) Received: from [172.19.199.14] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id EC6D8447F8; Thu, 25 Sep 2025 14:21:08 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id AE59E43F89; Thu, 25 Sep 2025 14:19:01 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9E14B44138 for ; Thu, 25 Sep 2025 14:08:03 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-NdGPn86hNiys6JAJM2MTSw-1; Thu, 25 Sep 2025 14:08:02 -0400 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2413E19774D9 for ; Thu, 25 Sep 2025 18:08:01 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.225.196]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 516EC300021A for ; Thu, 25 Sep 2025 18:08:00 +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=-3.1 required=5.0 tests=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=1758823683; 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: in-reply-to:in-reply-to:references:references; bh=GDO5dxnoYIzAupTvYdNapE70twkhP/SrB4XfksXxLXY=; b=hzJh6y+b6xij0LcZpsEI6zbBIE46Tx0m6qPKhX9NeIZPvbJ0JW+3yfJr6Hz1pZrPFFradq pat4/fBdTy6p6ETE6/XKW3PPQXPb8nXGsPm4D5DDzCAVZ35abXYKfgJFJveuVlKDTZhERP ppoyjZ13nnDAguTyPWuVKzyVkwNol9I= X-MC-Unique: NdGPn86hNiys6JAJM2MTSw-1 X-Mimecast-MFC-AGG-ID: NdGPn86hNiys6JAJM2MTSw_1758823681 To: devel@lists.libvirt.org Subject: [PATCH v2 24/38] qemu: Rename function argument Date: Thu, 25 Sep 2025 20:07:10 +0200 Message-ID: <20250925180724.500758-25-abologna@redhat.com> In-Reply-To: <20250925180724.500758-1-abologna@redhat.com> References: <20250925180724.500758-1-abologna@redhat.com> 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: CKMMHnpCl8kiE_5r4oaXeAA7TETyExemFn_4rrp_GeA_1758823681 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ORDRLVJ36NWUY23RNY4H5PNDMQ3L3VGK X-Message-ID-Hash: ORDRLVJ36NWUY23RNY4H5PNDMQ3L3VGK X-MailFrom: abologna@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: Andrea Bolognani via Devel Reply-To: Andrea Bolognani X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1758826910365116600 Content-Type: text/plain; charset="utf-8"; x-default="true" This makes the signature consistent with that of other qemuValidateDomainDeviceDefController*() functions, which are passed a virDomainDef along with the existing virDomainControllerDef. Later changes to this function will require access to the additional data structure. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e57bbc3d9a..f48165f75c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2588,29 +2588,29 @@ qemuControllerModelUSBToCaps(int model) =20 =20 static int -qemuValidateDomainDeviceDefControllerUSB(const virDomainControllerDef *def, +qemuValidateDomainDeviceDefControllerUSB(const virDomainControllerDef *con= troller, virQEMUCaps *qemuCaps) { - if (def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT) { + if (controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to determine model for USB controller idx= =3D%1$d"), - def->idx); + controller->idx); return -1; } =20 - if (!virQEMUCapsGet(qemuCaps, qemuControllerModelUSBToCaps(def->model)= )) { + if (!virQEMUCapsGet(qemuCaps, qemuControllerModelUSBToCaps(controller-= >model))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("USB controller model '%1$s' not supported in thi= s QEMU binary"), - virDomainControllerModelUSBTypeToString(def->model)= ); + virDomainControllerModelUSBTypeToString(controller-= >model)); return -1; } =20 - if (def->opts.usbopts.ports !=3D -1) { - if (def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI && - def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI) { + if (controller->opts.usbopts.ports !=3D -1) { + if (controller->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHC= I && + controller->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XH= CI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("usb controller type '%1$s' doesn't support '= ports' with this QEMU binary"), - virDomainControllerModelUSBTypeToString(def->mo= del)); + virDomainControllerModelUSBTypeToString(control= ler->model)); return -1; } } --=20 2.51.0