From nobody Mon Dec 15 11:50:24 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=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 1741879980533628.9787754437267; Thu, 13 Mar 2025 08:33:00 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DFE2B213D; Thu, 13 Mar 2025 11:32:59 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 84AD9216D; Thu, 13 Mar 2025 11:32:21 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D91171913; Thu, 13 Mar 2025 11:32:16 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 25AC91940 for ; Thu, 13 Mar 2025 11:32:16 -0400 (EDT) Received: from mx-prod-mc-03.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-159-Rk9E4t5xO-yNRuJXUzQnzg-1; Thu, 13 Mar 2025 11:32:13 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 844BF19560B6 for ; Thu, 13 Mar 2025 15:32:12 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C772A1801751 for ; Thu, 13 Mar 2025 15:32:11 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741879935; 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=jcD0Ij7wmO0508nlQMZR46vxEc/CLgfHyU/4NG5iQm4=; b=a3maAVPNxbWa2izz1wLVBxuYBLhNHf6TAicvS6Ag+fSNajTS0YWsjoyeo6hM16HnzXzvSc Fj3CJajwimUWwjdDc7VrIpUfASzeZ3iPiugeS1NqQaFWN0G2aL6VtHCJsEiwd3w0T/4fG4 8NtxR+BTj2hrVxPaY5zhmlhgRBh7Imc= X-MC-Unique: Rk9E4t5xO-yNRuJXUzQnzg-1 X-Mimecast-MFC-AGG-ID: Rk9E4t5xO-yNRuJXUzQnzg_1741879932 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 01/10] qemu: seccomp sandbox: remove incorect G_GNUC_UNUSED marker Date: Thu, 13 Mar 2025 16:30:15 +0100 Message-ID: <220add50fbe41ad277fa8e3e4fece3346082c972.1741879824.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: fkfch9ZTdnViuJ4mWrVnyYTEWYQtCshxEogqfZ-ehDk_1741879932 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UDXOL6COZ7MIOAEZFIHQSCQMRZZWTQ5S X-Message-ID-Hash: UDXOL6COZ7MIOAEZFIHQSCQMRZZWTQ5S X-MailFrom: jtomko@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741879981409019000 Content-Type: text/plain; charset="utf-8" qemuCaps is obviously used. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 51e428e017..e2e19743d8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10075,7 +10075,7 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver, static int qemuBuildSeccompSandboxCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + virQEMUCaps *qemuCaps) { if (cfg->seccompSandbox =3D=3D 0) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX)) --=20 2.48.1 From nobody Mon Dec 15 11:50:24 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=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 1741880044697935.6908503640933; Thu, 13 Mar 2025 08:34:04 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 86E1E1C14; Thu, 13 Mar 2025 11:34:03 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2072C2185; Thu, 13 Mar 2025 11:32:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 39DF51B68; Thu, 13 Mar 2025 11:32:38 -0400 (EDT) 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 5E66E2191 for ; Thu, 13 Mar 2025 11:32:25 -0400 (EDT) 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-539-yx_XWlXkO7KnmUVEtKgdSg-1; Thu, 13 Mar 2025 11:32:23 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 A496A187BE08 for ; Thu, 13 Mar 2025 15:32:13 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 07F841800945 for ; Thu, 13 Mar 2025 15:32:12 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741879945; 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=9nobTWpUosIN4O6vRnOC7yJ0dsefqh53Gr7YedlIGco=; b=PD77S9JWd5qvIecDH4mVW2aD5cWxMfc+DMGlaGCgZK64EKT+rLM4qkDQMuwLAfGWoXI7nL nuLIflrY5ywAmjBwAN9ma/CEuY4PcVucLpKCSg7WdMeNYe/RU6BQOpAPc+jzJEXY2zZolD MNHHIy90ucCzg+Ztp7IJMiri+d5orzQ= X-MC-Unique: yx_XWlXkO7KnmUVEtKgdSg-1 X-Mimecast-MFC-AGG-ID: yx_XWlXkO7KnmUVEtKgdSg_1741879942 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 02/10] qemu: validate: fs: remove unneeded parameter Date: Thu, 13 Mar 2025 16:30:16 +0100 Message-ID: <9e8fcbcbce16112ac758ff55c1838d7496b3eb1e.1741879824.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: wk4w8QVSVDYdIxJDVAph3bW32HJxyMZ8yJ2HfXzkjsE_1741879942 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CUJ42JT5QZFBT7WZHS2REJ2P27PJIDLR X-Message-ID-Hash: CUJ42JT5QZFBT7WZHS2REJ2P27PJIDLR X-MailFrom: jtomko@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741880045841019100 Content-Type: text/plain; charset="utf-8" No longer required since we don't require driver->privileged anymore. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/qemu/qemu_validate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 4ef944addb..af334aa96a 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4578,7 +4578,6 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGr= aphicsDef *graphics, static int qemuValidateDomainDeviceDefFS(virDomainFSDef *fs, const virDomainDef *def, - virQEMUDriver *driver G_GNUC_UNUSED, virQEMUCaps *qemuCaps) { if (fs->type !=3D VIR_DOMAIN_FS_TYPE_MOUNT) { @@ -5544,7 +5543,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef = *dev, return qemuValidateDomainDeviceDefIOMMU(dev->data.iommu, def, qemu= Caps); =20 case VIR_DOMAIN_DEVICE_FS: - return qemuValidateDomainDeviceDefFS(dev->data.fs, def, driver, qe= muCaps); + return qemuValidateDomainDeviceDefFS(dev->data.fs, def, qemuCaps); =20 case VIR_DOMAIN_DEVICE_NVRAM: return qemuValidateDomainDeviceDefNVRAM(dev->data.nvram, def, qemu= Caps); --=20 2.48.1 From nobody Mon Dec 15 11:50:24 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=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 1741880113303326.1832432392283; Thu, 13 Mar 2025 08:35:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 38BF91B88; Thu, 13 Mar 2025 11:35:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A41A72162; Thu, 13 Mar 2025 11:32:50 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0DC851DBC; Thu, 13 Mar 2025 11:32:40 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 3CC052198 for ; Thu, 13 Mar 2025 11:32:26 -0400 (EDT) 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-213-Ia6xTEPTP2yWuE9Qrh_GTw-1; Thu, 13 Mar 2025 11:32:24 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 A057D187BE32 for ; Thu, 13 Mar 2025 15:32:14 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0D7441801759 for ; Thu, 13 Mar 2025 15:32:13 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741879945; 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=IVVqhSOld8C0T0WX78uaUboSR3Vd5QsWQbMyPSfVz5Y=; b=RCsOuOhYg2uN0XsBcDAWSX143/+FeFafTf9zjkuEYEDAAabAFYmobdg3MhHuLLotsfuJ8O 9qP2bNe/DQqyDmLvBgTrPclxq+kpcYahU0lql3LwRpdY0iXbuJ9AVJYZmL7TEXzTtn6Ns7 l9CrDK0RdeopM9jpSYKE6PfU8rELLZk= X-MC-Unique: Ia6xTEPTP2yWuE9Qrh_GTw-1 X-Mimecast-MFC-AGG-ID: Ia6xTEPTP2yWuE9Qrh_GTw_1741879943 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 03/10] qemu: remove qemuCaps from qemuBuildObjectCommandlineFromJSON Date: Thu, 13 Mar 2025 16:30:17 +0100 Message-ID: <965726877d8465737e845737b98634ac05910de8.1741879824.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 7W71NbzetXWVpnqdkk6yiG4uXag-ZQafMV9SDfBZvN0_1741879943 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RXFCZ74FS74QFEKWI4OS6RRK6VJVKOWU X-Message-ID-Hash: RXFCZ74FS74QFEKWI4OS6RRK6VJVKOWU X-MailFrom: jtomko@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741880115839019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 65 ++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e2e19743d8..ae187dac78 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -184,8 +184,7 @@ qemuOnOffAuto(virTristateSwitch s) =20 static int qemuBuildObjectCommandlineFromJSON(virCommand *cmd, - virJSONValue *props, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + virJSONValue *props) { g_autofree char *arg =3D NULL; =20 @@ -324,7 +323,7 @@ qemuBuildMasterKeyCommandLine(virCommand *cmd, NULL) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 return 0; @@ -1222,14 +1221,14 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfo *seci= nfo, static int qemuBuildObjectSecretCommandLine(virCommand *cmd, qemuDomainSecretInfo *secinfo, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_autoptr(virJSONValue) props =3D NULL; =20 if (qemuBuildSecretInfoProps(secinfo, &props) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 return 0; @@ -1289,7 +1288,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd, bool verifypeer, const char *certEncSecretAlias, const char *alias, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_autoptr(virJSONValue) props =3D NULL; =20 @@ -1297,7 +1296,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd, certEncSecretAlias, &props) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 return 0; @@ -1969,12 +1968,12 @@ qemuBuildFloppyCommandLineControllerOptions(virComm= and *cmd, static int qemuBuildObjectCommandline(virCommand *cmd, virJSONValue *objProps, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { if (!objProps) return 0; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, objProps, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, objProps) < 0) return -1; =20 return 0; @@ -3442,11 +3441,10 @@ qemuBuildMemoryDimmBackendStr(virCommand *cmd, return -1; =20 if (tcProps && - qemuBuildObjectCommandlineFromJSON(cmd, tcProps, - priv->qemuCaps) < 0) + qemuBuildObjectCommandlineFromJSON(cmd, tcProps) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 return 0; @@ -4247,7 +4245,7 @@ qemuBuildInputCommandLine(virCommand *cmd, if (!(props =3D qemuBuildInputEvdevProps(input))) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) <= 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; } else { g_autoptr(virJSONValue) props =3D NULL; @@ -5371,7 +5369,7 @@ qemuBuildRNGCommandLine(virCommand *cmd, if (qemuBuildRNGBackendProps(rng, &props) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 /* add the device */ @@ -7230,11 +7228,10 @@ qemuBuildMemCommandLineMemoryDefaultBackend(virComm= and *cmd, return -1; =20 if (tcProps && - qemuBuildObjectCommandlineFromJSON(cmd, tcProps, - priv->qemuCaps) < 0) + qemuBuildObjectCommandlineFromJSON(cmd, tcProps) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 return 0; @@ -7304,7 +7301,7 @@ qemuBuildMemCommandLine(virCommand *cmd, static int qemuBuildIOThreadCommandLine(virCommand *cmd, const virDomainDef *def, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { size_t i; =20 @@ -7339,7 +7336,7 @@ qemuBuildIOThreadCommandLine(virCommand *cmd, NULL) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; } =20 @@ -7352,7 +7349,7 @@ qemuBuildIOThreadCommandLine(virCommand *cmd, NULL) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; } =20 @@ -7584,12 +7581,10 @@ qemuBuildNumaCommandLine(virQEMUDriverConfig *cfg, goto cleanup; =20 if (tcProps && - qemuBuildObjectCommandlineFromJSON(cmd, tcProps, - priv->qemuCaps) < 0) + qemuBuildObjectCommandlineFromJSON(cmd, tcProps) < 0) goto cleanup; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, nodeBackends[i], - priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, nodeBackends[i]) <= 0) goto cleanup; } =20 @@ -9027,7 +9022,7 @@ qemuBuildShmemCommandLine(virCommand *cmd, if (!(memProps =3D qemuBuildShmemBackendMemProps(shmem))) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, memProps, qemuCaps) < = 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, memProps) < 0) return -1; =20 G_GNUC_FALLTHROUGH; @@ -9648,7 +9643,7 @@ qemuBuildSEVCommandLine(virDomainObj *vm, virCommand = *cmd, NULL) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 return 0; @@ -9656,12 +9651,11 @@ qemuBuildSEVCommandLine(virDomainObj *vm, virComman= d *cmd, =20 =20 static int -qemuBuildSEVSNPCommandLine(virDomainObj *vm, +qemuBuildSEVSNPCommandLine(virDomainObj *vm G_GNUC_UNUSED, virCommand *cmd, virDomainSEVSNPDef *def) { g_autoptr(virJSONValue) props =3D NULL; - qemuDomainObjPrivate *priv =3D vm->privateData; virTristateBool vcek_disabled =3D VIR_TRISTATE_BOOL_ABSENT; =20 VIR_DEBUG("policy=3D0x%llx cbitpos=3D%d reduced_phys_bits=3D%d", @@ -9688,7 +9682,7 @@ qemuBuildSEVSNPCommandLine(virDomainObj *vm, NULL) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 return 0; @@ -9696,16 +9690,15 @@ qemuBuildSEVSNPCommandLine(virDomainObj *vm, =20 =20 static int -qemuBuildPVCommandLine(virDomainObj *vm, virCommand *cmd) +qemuBuildPVCommandLine(virDomainObj *vm G_GNUC_UNUSED, virCommand *cmd) { g_autoptr(virJSONValue) props =3D NULL; - qemuDomainObjPrivate *priv =3D vm->privateData; =20 if (qemuMonitorCreateObjectProps(&props, "s390-pv-guest", "lsec0", NULL) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 return 0; @@ -9884,7 +9877,7 @@ qemuBuildManagedPRCommandLine(virCommand *cmd, if (!(props =3D qemuBuildPRManagedManagerInfoProps(priv))) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 return 0; @@ -9971,7 +9964,7 @@ qemuBuildDBusVMStateCommandLine(virCommand *cmd, if (!(props =3D qemuBuildDBusVMStateInfoProps(driver, vm))) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 priv->dbusVMState =3D true; @@ -10221,7 +10214,7 @@ qemuBuildCryptoCommandLine(virCommand *cmd, if (qemuBuildCryptoBackendProps(crypto, &props) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; =20 /* add the device */ @@ -10278,7 +10271,7 @@ qemuBuildPstoreCommandLine(virCommand *cmd, if (qemuBuildDeviceAddressProps(devProps, def, &pstore->info) < 0) return -1; =20 - if (qemuBuildObjectCommandlineFromJSON(cmd, memProps, qemuCaps) < 0 || + if (qemuBuildObjectCommandlineFromJSON(cmd, memProps) < 0 || qemuBuildDeviceCommandlineFromJSON(cmd, devProps, def, qemuCaps) <= 0) return -1; =20 --=20 2.48.1 From nobody Mon Dec 15 11:50:24 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=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 1741880064398241.69036843730987; Thu, 13 Mar 2025 08:34:24 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 55BA2218B; Thu, 13 Mar 2025 11:34:23 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0BEB721B7; Thu, 13 Mar 2025 11:32:46 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3189E1B12; Thu, 13 Mar 2025 11:32:39 -0400 (EDT) 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 998F92125 for ; Thu, 13 Mar 2025 11:32:25 -0400 (EDT) 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-376-L3IFgNi7Psm3zwVOhWGO5A-1; Thu, 13 Mar 2025 11:32:23 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 9A43D187BE33 for ; Thu, 13 Mar 2025 15:32:15 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 087C418001DE for ; Thu, 13 Mar 2025 15:32:14 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741879945; 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=NJsO4N28E4gGdwxUrkxUpuDzZQ/7BqbfoUEEp+MlqUA=; b=ZXRkp/OOIpPWAHHG+GeG/ViMWt5yHgm62rC8wTnLbTF6VcyvQQJV/CX177h8pMuZRvXg3f VPVvoj7GK7NiLNgbC2CpOoOKwB9JPW2wcTeukbMdNAuzAh8OPkbnIIQcgX4Cqh/g7DuCOW Az+n0p1d6oUE9Ui8qeE59BGdMu6eL/E= X-MC-Unique: L3IFgNi7Psm3zwVOhWGO5A-1 X-Mimecast-MFC-AGG-ID: L3IFgNi7Psm3zwVOhWGO5A_1741879943 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 04/10] qemu: remove qemuCaps from qemuBuildObjectSecretCommandLine Date: Thu, 13 Mar 2025 16:30:18 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: -dwZzGNayr6fRDGe4HXulm27GuDt7a2PtZICJMQ_I40_1741879943 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6UXEO4OWVOLA4FI3ZQXAA7H236RV5BXK X-Message-ID-Hash: 6UXEO4OWVOLA4FI3ZQXAA7H236RV5BXK X-MailFrom: jtomko@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741880065783019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ae187dac78..4f0a9a517c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1220,8 +1220,7 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfo *secinf= o, */ static int qemuBuildObjectSecretCommandLine(virCommand *cmd, - qemuDomainSecretInfo *secinfo, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + qemuDomainSecretInfo *secinfo) { g_autoptr(virJSONValue) props =3D NULL; =20 @@ -1323,8 +1322,7 @@ qemuBuildChardevCommand(virCommand *cmd, * functions can just check the config fields */ if (chrSourcePriv->secinfo) { if (qemuBuildObjectSecretCommandLine(cmd, - chrSourcePriv->secinf= o, - qemuCaps) < 0) + chrSourcePriv->secinf= o) < 0) return -1; =20 tlsCertEncSecAlias =3D chrSourcePriv->secinfo->alias; @@ -8099,8 +8097,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *= cfg, =20 if (gfxPriv->secinfo) { if (qemuBuildObjectSecretCommandLine(cmd, - gfxPriv->secinfo, - qemuCaps) < 0) + gfxPriv->secinfo) < 0) return -1; secretAlias =3D gfxPriv->secinfo->alias; } --=20 2.48.1 From nobody Mon Dec 15 11:50:24 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=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 1741880007314132.47671891028892; Thu, 13 Mar 2025 08:33:27 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 44B4F2195; Thu, 13 Mar 2025 11:33:26 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A6CB92188; Thu, 13 Mar 2025 11:32:31 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A78991D8D; Thu, 13 Mar 2025 11:32:27 -0400 (EDT) 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 7497B2142 for ; Thu, 13 Mar 2025 11:32:20 -0400 (EDT) Received: from mx-prod-mc-01.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-658-tfcDG_afMt6Aozgb-lMh-A-1; Thu, 13 Mar 2025 11:32:17 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 93FDD1956055 for ; Thu, 13 Mar 2025 15:32:16 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0126E1801752 for ; Thu, 13 Mar 2025 15:32:15 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741879940; 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=b3VfNxMEqydci3UhwqmEUJtXd6bkB1l6P5BLMq7WXT8=; b=X20xqjcGsHvTq4eJLGCmH+Jo+v37E2Zry/oKOgkwyQSqAiYSuXC8uavlrLMH6RSlgP5Aqz vaihThjjqCdu6XyXKzHwXpzXPP8cfIQFTUML7QYdLOqjgUkJpFSSF8FrkRiM34LepDrHMv sQGy8o7uHCQpNM4ByyMe71qEflZOJwI= X-MC-Unique: tfcDG_afMt6Aozgb-lMh-A-1 X-Mimecast-MFC-AGG-ID: tfcDG_afMt6Aozgb-lMh-A_1741879936 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 05/10] qemu: remove qemuCaps from qemuBuildTLSx509CommandLine Date: Thu, 13 Mar 2025 16:30:19 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 2Nss6tOuUfyVBaEtt-wIrRuAX70GSOaa86LpJWoysxg_1741879936 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VJJO623QKSOXJNRXFZTRFEYX4TNEL35W X-Message-ID-Hash: VJJO623QKSOXJNRXFZTRFEYX4TNEL35W X-MailFrom: jtomko@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741880009650019100 Content-Type: text/plain; charset="utf-8" Also from qemuBuildGraphicsVNCCommandLine Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4f0a9a517c..ef1ba9269c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1286,8 +1286,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd, bool isListen, bool verifypeer, const char *certEncSecretAlias, - const char *alias, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + const char *alias) { g_autoptr(virJSONValue) props =3D NULL; =20 @@ -1335,7 +1334,7 @@ qemuBuildChardevCommand(virCommand *cmd, dev->data.tcp.listen, chrSourcePriv->tlsVerify, tlsCertEncSecAlias, - objalias, qemuCaps) < 0) { + objalias) < 0) { return -1; } =20 @@ -8026,7 +8025,6 @@ static int qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg, const virDomainDef *def, virCommand *cmd, - virQEMUCaps *qemuCaps, virDomainGraphicsDef *graphics) { g_autofree char *audioid =3D qemuGetAudioIDString(def, graphics->data.= vnc.audioId); @@ -8107,8 +8105,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *= cfg, true, cfg->vncTLSx509verify, secretAlias, - gfxPriv->tlsAlias, - qemuCaps) < 0) + gfxPriv->tlsAlias) < 0) return -1; =20 virBufferAsprintf(&opt, ",tls-creds=3D%s", gfxPriv->tlsAlias); @@ -8417,7 +8414,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cfg, break; case VIR_DOMAIN_GRAPHICS_TYPE_VNC: if (qemuBuildGraphicsVNCCommandLine(cfg, def, cmd, - qemuCaps, graphics) < 0) + graphics) < 0) return -1; =20 break; --=20 2.48.1 From nobody Mon Dec 15 11:50:24 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=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 17418801318551015.868324481744; Thu, 13 Mar 2025 08:35:31 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C9ECF21EF; Thu, 13 Mar 2025 11:35:30 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7A10621D1; Thu, 13 Mar 2025 11:32:53 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E4DBC1A39; Thu, 13 Mar 2025 11:32:40 -0400 (EDT) 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 49133212F for ; Thu, 13 Mar 2025 11:32:26 -0400 (EDT) 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-342-Fmlp3YncPxquHi-04UV1sg-1; Thu, 13 Mar 2025 11:32:24 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 8C8B0187DBAB for ; Thu, 13 Mar 2025 15:32:17 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EE1321801756 for ; Thu, 13 Mar 2025 15:32:16 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741879945; 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=Tum5FdW7xmHC/85rU35ENvI3Gs7prseIpH3WPfiqY7Q=; b=NVE5YV+jwflLbT/SvwmJ8KmeG2G+98F4Lm8X24y/Yr6KaK2Kz9mJ3NkSEwcCHqCJBTcbXQ whc6YtmJzHEhjWaVDKVYy27n0OV4iiIGn2sMGgfrZVgvMYKF6SoknuKMlW1TC2hETywb/q 37ZKHyoekFp68OIJsXpexZo0Kq1+k1s= X-MC-Unique: Fmlp3YncPxquHi-04UV1sg-1 X-Mimecast-MFC-AGG-ID: Fmlp3YncPxquHi-04UV1sg_1741879943 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 06/10] qemu: remove qemuCaps from qemuBuildObjectCommandline Date: Thu, 13 Mar 2025 16:30:20 +0100 Message-ID: <256e822ab8060030d182016e3b0e444c8a631c36.1741879824.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: YHusAE1dnl_cAp75ILQ2Rq4hIBQIv7ody_j_yHcIzHY_1741879943 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DJ5OTT3FXSZXDB4MECJLNPC3OYCDGX24 X-Message-ID-Hash: DJ5OTT3FXSZXDB4MECJLNPC3OYCDGX24 X-MailFrom: jtomko@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741880133877019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ef1ba9269c..4b178cac71 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1964,8 +1964,7 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= d *cmd, =20 static int qemuBuildObjectCommandline(virCommand *cmd, - virJSONValue *objProps, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + virJSONValue *objProps) { if (!objProps) return 0; @@ -1985,15 +1984,15 @@ qemuBuildBlockStorageSourceAttachDataCommandline(vi= rCommand *cmd, char *tmp; size_t i; =20 - if (qemuBuildObjectCommandline(cmd, data->prmgrProps, qemuCaps) < 0 || - qemuBuildObjectCommandline(cmd, data->authsecretProps, qemuCaps) <= 0 || - qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps, qemuC= aps) < 0 || - qemuBuildObjectCommandline(cmd, data->tlsKeySecretProps, qemuCaps)= < 0 || - qemuBuildObjectCommandline(cmd, data->tlsProps, qemuCaps) < 0) + if (qemuBuildObjectCommandline(cmd, data->prmgrProps) < 0 || + qemuBuildObjectCommandline(cmd, data->authsecretProps) < 0 || + qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps) < 0 || + qemuBuildObjectCommandline(cmd, data->tlsKeySecretProps) < 0 || + qemuBuildObjectCommandline(cmd, data->tlsProps) < 0) return -1; =20 for (i =3D 0; i < data->encryptsecretCount; ++i) { - if (qemuBuildObjectCommandline(cmd, data->encryptsecretProps[i], q= emuCaps) < 0) { + if (qemuBuildObjectCommandline(cmd, data->encryptsecretProps[i]) <= 0) { return -1; } } --=20 2.48.1 From nobody Mon Dec 15 11:50:24 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=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 1741880025707734.2791791489057; Thu, 13 Mar 2025 08:33:45 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 229C3215C; Thu, 13 Mar 2025 11:33:45 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5D49B1AF8; Thu, 13 Mar 2025 11:32:33 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DD5BA1AE4; Thu, 13 Mar 2025 11:32:28 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 CB792215A for ; Thu, 13 Mar 2025 11:32:20 -0400 (EDT) Received: from mx-prod-mc-01.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-117-v2hwGSZxMlqNuL1PijWhdA-1; Thu, 13 Mar 2025 11:32:19 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8FDF5195606B for ; Thu, 13 Mar 2025 15:32:18 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E690A1800945 for ; Thu, 13 Mar 2025 15:32:17 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741879940; 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=D327ipiYOqR9gnXxglRowhgWU8xvIQBhvDmNWeTIFMA=; b=JsJ91OzIFc5UPo8yQ/SlhuNHpvhyHnhv5DO1qQ+bvaKwr3ERUxGiYVNwpuLXk1xPEdnPjv 6emj5ELuRiZiPeG0ZZgI1HUR08sF2l4N9n/D8GLm1vN8tA58OxksmS/8Kw9iwxaO3PCdH4 2c5lSnrDj/Mb9t0YdTQEOCqdiVJzPQc= X-MC-Unique: v2hwGSZxMlqNuL1PijWhdA-1 X-Mimecast-MFC-AGG-ID: v2hwGSZxMlqNuL1PijWhdA_1741879938 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 07/10] qemu: remove qemuCaps from qemuBuildIOThreadCommandLine Date: Thu, 13 Mar 2025 16:30:21 +0100 Message-ID: <849577632cfbded9e0e8f3ddd6279235f75ca81a.1741879824.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NGaKZbgn5tiS2BKHyZqqi_yyBFBZLpaXk7asrlGEwo0_1741879938 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SQKV4DNWODYKB2YBROYL5YXEBZ3HJ4R6 X-Message-ID-Hash: SQKV4DNWODYKB2YBROYL5YXEBZ3HJ4R6 X-MailFrom: jtomko@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741880027756019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4b178cac71..456df9ae0e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7296,8 +7296,7 @@ qemuBuildMemCommandLine(virCommand *cmd, =20 static int qemuBuildIOThreadCommandLine(virCommand *cmd, - const virDomainDef *def, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + const virDomainDef *def) { size_t i; =20 @@ -10454,7 +10453,7 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0) return NULL; =20 - if (qemuBuildIOThreadCommandLine(cmd, def, qemuCaps) < 0) + if (qemuBuildIOThreadCommandLine(cmd, def) < 0) return NULL; =20 if (virDomainNumaGetNodeCount(def->numa) && --=20 2.48.1 From nobody Mon Dec 15 11:50:24 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=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 1741880084219328.6864331315064; Thu, 13 Mar 2025 08:34:44 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 322D41913; Thu, 13 Mar 2025 11:34:43 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A9F7D21C2; Thu, 13 Mar 2025 11:32:47 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6FF711ACF; Thu, 13 Mar 2025 11:32:39 -0400 (EDT) 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 E488A1C96 for ; Thu, 13 Mar 2025 11:32:25 -0400 (EDT) Received: from mx-prod-mc-08.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-36-bWJ_a0nOOSOXLush6oHUhw-1; Thu, 13 Mar 2025 11:32:24 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 907A2180AF57 for ; Thu, 13 Mar 2025 15:32:19 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E88081800945 for ; Thu, 13 Mar 2025 15:32:18 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741879945; 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=fFbVj3dw5qnGrD71p+NKCymKM+/PAFJpTHy6XUYC+3g=; b=a1GzpbEyBinKeEC1SbkeSDfm3YDIPqxgjPOq2JH7vVrZkdGBplOAVzHjYcMKgxFWnbTytV rrAZsX3wElTe/zux41Y1BQRiBoBAxEW8Aa9Z1xa1MxlWrhsYm+IiZ5ncw8o09vY4qzc7Ev xF1HoWpL9PP8Hm3Zkfnh06csqGrps9w= X-MC-Unique: bWJ_a0nOOSOXLush6oHUhw-1 X-Mimecast-MFC-AGG-ID: bWJ_a0nOOSOXLush6oHUhw_1741879943 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 08/10] qemu: remove unused vm from qemuBuildSEVSNPCommandLine Date: Thu, 13 Mar 2025 16:30:22 +0100 Message-ID: <3cfe58e07ecebb382f045c3cf51c06ad01c7a163.1741879824.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: nHmtlORKiOgaxHaacfzSW5CSVYc2dq-i-DBjhrKmDOs_1741879943 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZDSDWWSNSQFUFVOOTWXJ4323Q2PI6ATV X-Message-ID-Hash: ZDSDWWSNSQFUFVOOTWXJ4323Q2PI6ATV X-MailFrom: jtomko@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741880085789019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 456df9ae0e..0b618e5c88 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9643,8 +9643,7 @@ qemuBuildSEVCommandLine(virDomainObj *vm, virCommand = *cmd, =20 =20 static int -qemuBuildSEVSNPCommandLine(virDomainObj *vm G_GNUC_UNUSED, - virCommand *cmd, +qemuBuildSEVSNPCommandLine(virCommand *cmd, virDomainSEVSNPDef *def) { g_autoptr(virJSONValue) props =3D NULL; @@ -9709,7 +9708,7 @@ qemuBuildSecCommandLine(virDomainObj *vm, virCommand = *cmd, return qemuBuildSEVCommandLine(vm, cmd, &sec->data.sev); break; case VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP: - return qemuBuildSEVSNPCommandLine(vm, cmd, &sec->data.sev_snp); + return qemuBuildSEVSNPCommandLine(cmd, &sec->data.sev_snp); break; case VIR_DOMAIN_LAUNCH_SECURITY_PV: return qemuBuildPVCommandLine(vm, cmd); --=20 2.48.1 From nobody Mon Dec 15 11:50:24 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=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 1741880183180373.155352272624; Thu, 13 Mar 2025 08:36:23 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8BF1921D5; Thu, 13 Mar 2025 11:36:22 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2968B2164; Thu, 13 Mar 2025 11:32:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CDD091D3A; Thu, 13 Mar 2025 11:32:48 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 80D502155 for ; Thu, 13 Mar 2025 11:32:28 -0400 (EDT) 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-371-ieJSavYVMU2Ewgf-k01_LA-1; Thu, 13 Mar 2025 11:32:25 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 92766180AF5C for ; Thu, 13 Mar 2025 15:32:20 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EB6411801751 for ; Thu, 13 Mar 2025 15:32:19 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741879948; 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=gcxl+JoySk5WJVHY9M9ZWy1+v0WvReqQsfihOlxL0TM=; b=L7DHlqZSKE63QHYOk/EXdBdFUne/Ir+ApNGH/2OO9mVtE5LWD1JoVf77HgHcGFGWq14w1S SOdlJ16x1q3VNy8eTr+8qrYdlF6I4h9LdT4GzF3/gXmO99h3spfoPJzb0yKt5Bw93pVn0q PQT/PAxyI8Znwoq0qT9jfXA/Y/tb1SU= X-MC-Unique: ieJSavYVMU2Ewgf-k01_LA-1 X-Mimecast-MFC-AGG-ID: ieJSavYVMU2Ewgf-k01_LA_1741879945 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 09/10] qemu: remove unused vm from qemuBuildPVCommandLine Date: Thu, 13 Mar 2025 16:30:23 +0100 Message-ID: <10e462e73dcd62fb7aea3f83d3ed565e41e033f3.1741879824.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: -s6vDwGT76XQ47Pl5Kuau0Qp4MpimgTPK-hKFdTU1ko_1741879945 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2ACJM6SHNXZBOIELH25U4SVTO4NLQNXF X-Message-ID-Hash: 2ACJM6SHNXZBOIELH25U4SVTO4NLQNXF X-MailFrom: jtomko@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741880184662019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0b618e5c88..92560d381f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9681,7 +9681,7 @@ qemuBuildSEVSNPCommandLine(virCommand *cmd, =20 =20 static int -qemuBuildPVCommandLine(virDomainObj *vm G_GNUC_UNUSED, virCommand *cmd) +qemuBuildPVCommandLine(virCommand *cmd) { g_autoptr(virJSONValue) props =3D NULL; =20 @@ -9711,7 +9711,7 @@ qemuBuildSecCommandLine(virDomainObj *vm, virCommand = *cmd, return qemuBuildSEVSNPCommandLine(cmd, &sec->data.sev_snp); break; case VIR_DOMAIN_LAUNCH_SECURITY_PV: - return qemuBuildPVCommandLine(vm, cmd); + return qemuBuildPVCommandLine(cmd); break; case VIR_DOMAIN_LAUNCH_SECURITY_NONE: case VIR_DOMAIN_LAUNCH_SECURITY_LAST: --=20 2.48.1 From nobody Mon Dec 15 11:50:24 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=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 1741880166358590.3306189553296; Thu, 13 Mar 2025 08:36:06 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9BAC4212F; Thu, 13 Mar 2025 11:36:05 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8479E21D9; Thu, 13 Mar 2025 11:32:55 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 454D22139; Thu, 13 Mar 2025 11:32:46 -0400 (EDT) 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 C3A052139 for ; Thu, 13 Mar 2025 11:32:27 -0400 (EDT) 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-10-8xSgyTRtNgS82h3-d-IAYA-1; Thu, 13 Mar 2025 11:32:26 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 8B0161828B64 for ; Thu, 13 Mar 2025 15:32:21 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EDE791800945 for ; Thu, 13 Mar 2025 15:32:20 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741879947; 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=5lb70TpBNIvwhtdnZjb9Rb2RdOnb8hH2S0Vu+3wVY4o=; b=So0g/9uzcTEJgZFvRzsLSffy89GhGkqPKsPZqmEyd41cJPwYgBoGWHygGohOIkI91a8kUG CWUUbb5p+Iy+icGWvpge9gxU42iRKOxpU1/P6mxtFlRFm7efRLinu2FL8DsQRsSlphBC20 KdwDKqn8LdQY6CakpTZaVsw1Vsy/atQ= X-MC-Unique: 8xSgyTRtNgS82h3-d-IAYA-1 X-Mimecast-MFC-AGG-ID: 8xSgyTRtNgS82h3-d-IAYA_1741879945 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 10/10] Remove unreachable breaks right after return Date: Thu, 13 Mar 2025 16:30:24 +0100 Message-ID: <57c32b37a629ca11018b4eaceb97bb3d352f1398.1741879824.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: LLn7_lDsObH16f8v5Qo8HMfhHypDBVWBqHMcxmm7N6o_1741879945 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VCKXQMOVSTUDR76F23LAVSE3MTEL4NSX X-Message-ID-Hash: VCKXQMOVSTUDR76F23LAVSE3MTEL4NSX X-MailFrom: jtomko@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741880168623019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/qemu/qemu_cgroup.c | 2 -- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_driver.c | 1 - src/qemu/qemu_hotplug.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/security/security_apparmor.c | 1 - src/vmx/vmx.c | 2 -- tools/virsh-domain.c | 1 - tools/virsh-host.c | 2 -- tools/vsh.c | 7 ------- 10 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f3c85d65e8..48af467bf9 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -436,7 +436,6 @@ qemuSetupInputCgroup(virDomainObj *vm, case VIR_DOMAIN_INPUT_TYPE_EVDEV: return qemuCgroupAllowDevicePath(vm, dev->source.evdev, VIR_CGROUP_DEVICE_RW, false); - break; } =20 return ret; @@ -457,7 +456,6 @@ qemuTeardownInputCgroup(virDomainObj *vm, case VIR_DOMAIN_INPUT_TYPE_EVDEV: return qemuCgroupDenyDevicePath(vm, dev->source.evdev, VIR_CGROUP_DEVICE_RWM, false); - break; } =20 return 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 92560d381f..ca5a228572 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9706,13 +9706,13 @@ qemuBuildSecCommandLine(virDomainObj *vm, virComman= d *cmd, switch (sec->sectype) { case VIR_DOMAIN_LAUNCH_SECURITY_SEV: return qemuBuildSEVCommandLine(vm, cmd, &sec->data.sev); - break; + case VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP: return qemuBuildSEVSNPCommandLine(cmd, &sec->data.sev_snp); - break; + case VIR_DOMAIN_LAUNCH_SECURITY_PV: return qemuBuildPVCommandLine(cmd); - break; + case VIR_DOMAIN_LAUNCH_SECURITY_NONE: case VIR_DOMAIN_LAUNCH_SECURITY_LAST: virReportEnumRangeError(virDomainLaunchSecurity, sec->sectype); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index af5445f78d..f0e9681161 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11990,7 +11990,6 @@ qemuDomainGetJobInfoDumpStats(virDomainObj *vm, _("dump query failed, status=3D%1$d"), privJob->stats.dump.status); return -1; - break; =20 case QEMU_MONITOR_DUMP_STATUS_ACTIVE: jobData->status =3D VIR_DOMAIN_JOB_STATUS_ACTIVE; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 28ca321c5c..b6ef10edf9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -7268,7 +7268,6 @@ qemuDomainChangeMemoryLiveValidateChange(const virDom= ainMemoryDef *oldDef, _("cannot modify memory of model '%1$s'"), virDomainMemoryModelTypeToString(oldDef->model)); return false; - break; } =20 if (oldDef->model !=3D newDef->model) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3caeb39a1b..9c60807926 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5601,7 +5601,6 @@ int qemuMonitorJSONGetObjectProperty(qemuMonitor *mon, _("qom-get invalid object property type %1$d"), prop->type); return -1; - break; } =20 if (ret =3D=3D -1) { diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 91c51f6395..68ac39611f 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -681,7 +681,6 @@ AppArmorSetInputLabel(virSecurityManager *mgr, return -1; } return reload_profile(mgr, def, input->source.evdev, true); - break; =20 case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 8d10b6e9e8..0dd03c1a88 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2250,13 +2250,11 @@ virVMXGenerateDiskTarget(virDomainDiskDef *def, virDomainDiskBusTypeToString(def->bus), virDomainDiskDeviceTypeToString(def->device)); return -1; - break; =20 case VIR_DOMAIN_DISK_BUS_NONE: case VIR_DOMAIN_DISK_BUS_LAST: virReportEnumRangeError(virDomainDiskBus, def->bus); return -1; - break; } =20 def->dst =3D virIndexToDiskName(idx, prefix); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 93c34c4971..7624cb90fe 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1070,7 +1070,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("No support for %1$s in command 'attach-interface'= "), type); return false; - break; } =20 if (target !=3D NULL) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 9e8f542c96..8a92e15b21 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1217,7 +1217,6 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("CPU described in %1$s is incompatible with host C= PU\n"), from); return false; - break; =20 case VIR_CPU_COMPARE_IDENTICAL: vshPrint(ctl, _("CPU described in %1$s is identical to host CPU\n"= ), @@ -1632,7 +1631,6 @@ cmdHypervisorCPUCompare(vshControl *ctl, _("CPU described in %1$s is incompatible with the CPU pro= vided by hypervisor on the host\n"), from); return false; - break; =20 case VIR_CPU_COMPARE_IDENTICAL: vshPrint(ctl, diff --git a/tools/vsh.c b/tools/vsh.c index fd6156ea76..b42e2f0c50 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1922,31 +1922,24 @@ vshGetTypedParamValue(vshControl *ctl, virTypedPara= meterPtr item) switch (item->type) { case VIR_TYPED_PARAM_INT: return g_strdup_printf("%d", item->value.i); - break; =20 case VIR_TYPED_PARAM_UINT: return g_strdup_printf("%u", item->value.ui); - break; =20 case VIR_TYPED_PARAM_LLONG: return g_strdup_printf("%lld", item->value.l); - break; =20 case VIR_TYPED_PARAM_ULLONG: return g_strdup_printf("%llu", item->value.ul); - break; =20 case VIR_TYPED_PARAM_DOUBLE: return g_strdup_printf("%f", item->value.d); - break; =20 case VIR_TYPED_PARAM_BOOLEAN: return g_strdup(item->value.b ? _("yes") : _("no")); - break; =20 case VIR_TYPED_PARAM_STRING: return g_strdup(item->value.s); - break; =20 default: vshError(ctl, _("unimplemented parameter type %1$d"), item->type); --=20 2.48.1