From nobody Fri Dec 19 06:37:40 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 --- 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