From nobody Fri Dec 19 06:34:31 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 --- 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