From nobody Wed Jun 24 21:39:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; 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 38.145.34.151 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=1782315828; cv=none; d=zohomail.com; s=zohoarc; b=iPU/cgUIMdID75zFk4DkW8UezTNYQQ2CLmPqIOU0RtWjV1O+LJcTbHsfhJ7L40O6A9SalbvVlD6WloLMoL2qNgHhn+HZfHkFKXRYfCK0Z4rwnzX0M6MlTjmydAYB/ksiwWOHL3JjmaabVFKR05P2VpUvUb16WUeNdknrVYvWkPc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782315828; 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=faVNah4jTme9cH9bm8n3TcnudIzp30CaTKS/QEyHSFc=; b=PmARiehzO+302uMK06ebHhkWLxJNDFplgGkRD7mlMHtZv3NhLue61wA8CdBXLfgEQd5BTHS5AvDEcHdaglptFkVkvjf+tZJ0063quMbIqoVPACndpaT5v83mWS7fkFpURNk3Lc4SuO0EW/12SGvincJtgOxis/nJKNdlPKNCN0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 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 [38.145.34.151]) by mx.zohomail.com with SMTPS id 1782315828885524.4314371568437; Wed, 24 Jun 2026 08:43:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 38EDF41DCB; Wed, 24 Jun 2026 11:42:01 -0400 (EDT) Received: from [172.19.199.7] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 81F3F41E56; Wed, 24 Jun 2026 11:38:17 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 947C53F97D; Wed, 24 Jun 2026 11:37:24 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 59A934197D for ; Wed, 24 Jun 2026 11:37:16 -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-437-W2g-hfweOV2GybQxhQ8AoQ-1; Wed, 24 Jun 2026 11:37:04 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 94A0F1955F68 for ; Wed, 24 Jun 2026 15:37:03 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.48.64]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A28CF1800361 for ; Wed, 24 Jun 2026 15:37:02 +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=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782315426; 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=faVNah4jTme9cH9bm8n3TcnudIzp30CaTKS/QEyHSFc=; b=Td857Mjswjg+8Ku2vfRBhiUS2nZb3UAsQ5N5FMaGtriuk20j1WzsG93Li0fYgILJATpotR doVQMmObGHPC+0NjA7atCO6sWACD5B/gO7z2C4dkghEuG7nvLCKsPmVW822+OzD1O7oya3 UuQUuZyNpKFkljp8JBZnOZyMRxko1oA= X-MC-Unique: W2g-hfweOV2GybQxhQ8AoQ-1 X-Mimecast-MFC-AGG-ID: W2g-hfweOV2GybQxhQ8AoQ_1782315423 To: devel@lists.libvirt.org Subject: [libvirt PATCH 1/3] hyperv: return void from hypervAddSimpleParam Date: Wed, 24 Jun 2026 17:36:42 +0200 Message-ID: <47617d9a50f285bbb3658bb896e592baf64efdd5.1782315404.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: e7BJhoew3OrdlS8bmBj7mDba6yF5Z2L9oD2fx0rqaQQ_1782315423 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GYWS23HBLMAHCDWLMOHHQNGN7H4NQ7CX X-Message-ID-Hash: GYWS23HBLMAHCDWLMOHHQNGN7H4NQ7CX X-MailFrom: jtomko@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: =?utf-8?q?J=C3=A1n_Tomko_via_Devel?= Reply-To: =?UTF-8?q?J=C3=A1n=20Tomko?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1782315831438158500 From: J=C3=A1n Tomko Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/hyperv/hyperv_driver.c | 6 ++---- src/hyperv/hyperv_wmi.c | 9 ++------- src/hyperv/hyperv_wmi.h | 4 ++-- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 68b2e7fa67..940fa58d0d 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -3739,8 +3739,7 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int= codeset, if (!params) return -1; =20 - if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0) - return -1; + hypervAddSimpleParam(params, "keyCode", keycodeStr); =20 if (hypervInvokeMethod(priv, ¶ms, NULL) < 0) return -1; @@ -3759,8 +3758,7 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int= codeset, if (!params) return -1; =20 - if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0) - return -1; + hypervAddSimpleParam(params, "keyCode", keycodeStr); =20 if (hypervInvokeMethod(priv, ¶ms, NULL) < 0) return -1; diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 1e39e6d61f..ab3eb5ffc0 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -204,10 +204,8 @@ hypervCheckParams(hypervInvokeParamsList *params) * * Add a param of type HYPERV_SIMPLE_PARAM, which is essentially a seriali= zed * key/value pair. - * - * Returns -1 on failure, 0 on success. */ -int +void hypervAddSimpleParam(hypervInvokeParamsList *params, const char *name, const char *value) { @@ -222,8 +220,6 @@ hypervAddSimpleParam(hypervInvokeParamsList *params, co= nst char *name, p->simple.value =3D value; =20 params->nbParams++; - - return 0; } =20 =20 @@ -1672,8 +1668,7 @@ hypervImageManagementServiceGetVHDSD(hypervPrivate *p= riv, params =3D hypervCreateInvokeParamsList("GetVirtualHardDiskSettingData= ", MSVM_IMAGEMANAGEMENTSERVICE_SELE= CTOR, Msvm_ImageManagementService_WmiI= nfo); - if (hypervAddSimpleParam(params, "Path", vhdPath) < 0) - return -1; + hypervAddSimpleParam(params, "Path", vhdPath); =20 if (hypervInvokeMethod(priv, ¶ms, &response) < 0) return -1; diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h index 36ca85a592..706fd85e87 100644 --- a/src/hyperv/hyperv_wmi.h +++ b/src/hyperv/hyperv_wmi.h @@ -141,8 +141,8 @@ hypervInvokeParamsList *hypervCreateInvokeParamsList(co= nst char *method, void hypervFreeInvokeParams(hypervInvokeParamsList *params); G_DEFINE_AUTOPTR_CLEANUP_FUNC(hypervInvokeParamsList, hypervFreeInvokePara= ms); =20 -int hypervAddSimpleParam(hypervInvokeParamsList *params, const char *name, - const char *value); +void hypervAddSimpleParam(hypervInvokeParamsList *params, const char *name, + const char *value); =20 int hypervAddEprParam(hypervInvokeParamsList *params, const char *name, --=20 2.54.0 From nobody Wed Jun 24 21:39:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; 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 38.145.34.151 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=1782315594; cv=none; d=zohomail.com; s=zohoarc; b=frcG1502sc5RDu5JtKsgVdtMaE+Mbc/UI33hgu8P43fbMbct5RPCX2+j+RJRb2UMPex2QNXX15weumGf+CMpgkQ6d4KflyPYutFx/IqhMbRWsDAlbYEZ9W5A5+m8L0QzSfYFDUarU3X+tE+idVrxY7MMI1HHTbx+KxJ29jpRZfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782315594; 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=zUM/aO5fjt6a6uoG/irAeR2iJ8lBJiVC6BL1wsmHaYo=; b=oHqHnv48broAd5IHueu2j0S5O78+e1QyL9wenPtBxIPsyX7jQss6pxTtcvBXJ+qXlqWe9U4fRaA5O/eAf8+VPN69BwrZALGBPsg2ZOFogoT9CvKmNAkrM0TTe96ujsc3P9bXECrSK7clTtN8Go+n6LtAktiy9j0aaH5ZeC8BJ0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 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 [38.145.34.151]) by mx.zohomail.com with SMTPS id 1782315594063738.2536570069733; Wed, 24 Jun 2026 08:39:54 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4031E41CF0; Wed, 24 Jun 2026 11:39:20 -0400 (EDT) Received: from [172.19.199.7] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 31BA441BC0; Wed, 24 Jun 2026 11:37:37 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 531843F95D; Wed, 24 Jun 2026 11:37:18 -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) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 7786041B88 for ; Wed, 24 Jun 2026 11:37:07 -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-204-hAmSyM8VNsilyIrVo8Rbbg-1; Wed, 24 Jun 2026 11:37:05 -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 09B621800601 for ; Wed, 24 Jun 2026 15:37:05 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.48.64]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 22A62180028B for ; Wed, 24 Jun 2026 15:37:03 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_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=1782315427; 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=zUM/aO5fjt6a6uoG/irAeR2iJ8lBJiVC6BL1wsmHaYo=; b=ciYLwei+CtL6VbtNxaxy5JGtE0SPGBNLj4g419hoNAqGvKiQYCskeFc4KNoslWHDSb9sW9 dwvSFK7hiXqsphq85U1ZDM+h4Y9Hx8m7cafk0xvE9DyEB4Qfu2njT45+LB6IWNpn3N+kg2 //yfeu/hCXv9nN+EIBxd7rdQbz9J2Xs= X-MC-Unique: hAmSyM8VNsilyIrVo8Rbbg-1 X-Mimecast-MFC-AGG-ID: hAmSyM8VNsilyIrVo8Rbbg_1782315425 To: devel@lists.libvirt.org Subject: [libvirt PATCH 2/3] hyperv: return void from hypervAddEprParam Date: Wed, 24 Jun 2026 17:36:43 +0200 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: FCSzsfL7iUZNzcM1FlbAocqEkxQg4cMBq7-byPmnNTw_1782315425 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PBBCGZ4W7YK6I6PYHXRIYBK2V72ESAQP X-Message-ID-Hash: PBBCGZ4W7YK6I6PYHXRIYBK2V72ESAQP X-MailFrom: jtomko@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: =?utf-8?q?J=C3=A1n_Tomko_via_Devel?= Reply-To: =?UTF-8?q?J=C3=A1n=20Tomko?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1782315598938158500 From: J=C3=A1n Tomko Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/hyperv/hyperv_driver.c | 13 +++++-------- src/hyperv/hyperv_wmi.c | 11 ++++------- src/hyperv/hyperv_wmi.h | 8 ++++---- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 940fa58d0d..52e2ac111c 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -2968,8 +2968,7 @@ hypervDomainUndefineFlags(virDomainPtr domain, unsign= ed int flags) =20 virBufferEscapeSQL(&eprQuery, MSVM_COMPUTERSYSTEM_WQL_SELECT "WHERE Na= me =3D '%s'", uuid_string); =20 - if (hypervAddEprParam(params, "AffectedSystem", &eprQuery, Msvm_Comput= erSystem_WmiInfo) < 0) - return -1; + hypervAddEprParam(params, "AffectedSystem", &eprQuery, Msvm_ComputerSy= stem_WmiInfo); =20 /* actually destroy the VM */ if (hypervInvokeMethod(priv, ¶ms, NULL) < 0) @@ -4238,9 +4237,8 @@ hypervDomainSnapshotCreateXML(virDomainPtr domain, if (!params) return NULL; =20 - if (hypervAddEprParam(params, "AffectedSystem", &eprQuery, - Msvm_ComputerSystem_WmiInfo) < 0) - return NULL; + hypervAddEprParam(params, "AffectedSystem", &eprQuery, + Msvm_ComputerSystem_WmiInfo); =20 snapshotSettings =3D hypervCreateEmbeddedParam(Msvm_VirtualSystemSnaps= hotSettingData_WmiInfo); if (!snapshotSettings) @@ -4304,9 +4302,8 @@ hypervDomainSnapshotDelete(virDomainSnapshotPtr snaps= hot, if (!params) return -1; =20 - if (hypervAddEprParam(params, "AffectedSnapshot", &eprQuery, - Msvm_VirtualSystemSettingData_WmiInfo) < 0) - return -1; + hypervAddEprParam(params, "AffectedSnapshot", &eprQuery, + Msvm_VirtualSystemSettingData_WmiInfo); =20 /* Invoke the method */ if (hypervInvokeMethod(priv, ¶ms, NULL) < 0) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index ab3eb5ffc0..30ff81d83e 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -231,9 +231,9 @@ hypervAddSimpleParam(hypervInvokeParamsList *params, co= nst char *name, * @query: WQL filter * @eprInfo: WmiInfo of the object being filtered * - * Adds an EPR param to the params list. Returns -1 on failure, 0 on succe= ss. + * Adds an EPR param to the params list. */ -int +void hypervAddEprParam(hypervInvokeParamsList *params, const char *name, virBuffer *query, @@ -249,8 +249,6 @@ hypervAddEprParam(hypervInvokeParamsList *params, p->epr.query =3D query; p->epr.info =3D classInfo; params->nbParams++; - - return 0; } =20 =20 @@ -1730,9 +1728,8 @@ hypervMsvmVSMSAddResourceSettings(virDomainPtr domain, if (!params) return -1; =20 - if (hypervAddEprParam(params, "AffectedConfiguration", - &eprQuery, Msvm_VirtualSystemSettingData_WmiInfo= ) < 0) - return -1; + hypervAddEprParam(params, "AffectedConfiguration", + &eprQuery, Msvm_VirtualSystemSettingData_WmiInfo); =20 if (hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettin= gs, wmiInfo) < 0) { hypervFreeEmbeddedParam(resourceSettings); diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h index 706fd85e87..c769ac4db0 100644 --- a/src/hyperv/hyperv_wmi.h +++ b/src/hyperv/hyperv_wmi.h @@ -144,10 +144,10 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(hypervInvokeParamsList,= hypervFreeInvokeParams); void hypervAddSimpleParam(hypervInvokeParamsList *params, const char *name, const char *value); =20 -int hypervAddEprParam(hypervInvokeParamsList *params, - const char *name, - virBuffer *query, - hypervWmiClassInfo *eprInfo); +void hypervAddEprParam(hypervInvokeParamsList *params, + const char *name, + virBuffer *query, + hypervWmiClassInfo *eprInfo); =20 GHashTable *hypervCreateEmbeddedParam(hypervWmiClassInfo *info); =20 --=20 2.54.0 From nobody Wed Jun 24 21:39:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; 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 38.145.34.151 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=1782315935; cv=none; d=zohomail.com; s=zohoarc; b=SGR9ZTnV9nx2J9pprwbl0kF4Pu6U3P6zsAELBnNGnv+/Q1VlJrq64By+LAXPCcspPYHr0kICCnnl59VWJ8WK6GqbCrQtID+2qOhir6kd27N0kvbpV8Vwqda07vdXEwDdAmUncsfe4tEZVToLEL2Vw4cpCMpxh5DB2TR3iArXInc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782315935; 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=yFfmr646Bn6TdPJgrwGArDcb/Qsa+qGCwjjBMngkzHY=; b=LWCOeiI2WIYFkx8JKqJTtBC3ReMVOS+ARyceznFKcCLsrTzfE9Z12i836UOu9U159GKkS6md/HwAIudwWoStr6UDxiWIawkyTazqsNMGkhzP8Wnluq6YTC4r3oGTy9xPlJT4sWLuqRLQKVc11iiKQbwpU6eaTJjoNr2SrJbRVTo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 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 [38.145.34.151]) by mx.zohomail.com with SMTPS id 1782315935769873.9267508071612; Wed, 24 Jun 2026 08:45:35 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 94A0841DFA; Wed, 24 Jun 2026 11:43:11 -0400 (EDT) Received: from [172.19.199.7] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id E39EE423F6; Wed, 24 Jun 2026 11:38:31 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4C20C41D04; Wed, 24 Jun 2026 11:37:34 -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) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CE9583F95D for ; Wed, 24 Jun 2026 11:37:13 -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-132-Mv8itSXxNVeodRgOL4EhGA-1; Wed, 24 Jun 2026 11:37:07 -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 5AF661802669 for ; Wed, 24 Jun 2026 15:37:06 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.48.64]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9A2191800361 for ; Wed, 24 Jun 2026 15:37:05 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_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=1782315428; 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=yFfmr646Bn6TdPJgrwGArDcb/Qsa+qGCwjjBMngkzHY=; b=DVPc7QBN6d4jcMfSNYYVi33QBJGhQyyWrjD2u/zm1UzeNG21n2kZizbF7ajNXkXrhBctnA MJttAfYFHdA2xQ6evM7PypkUfyBA+DDo4tqG3Z+EDMNR/PmbJb+8Bf2bK68Nc/xzYSz0K2 zNDZUS7jHC1FE1c6DNqaiLSj5lHn5pg= X-MC-Unique: Mv8itSXxNVeodRgOL4EhGA-1 X-Mimecast-MFC-AGG-ID: Mv8itSXxNVeodRgOL4EhGA_1782315426 To: devel@lists.libvirt.org Subject: [libvirt PATCH 3/3] hyperv: return void from hypervAddEmbeddedParam Date: Wed, 24 Jun 2026 17:36:44 +0200 Message-ID: <15c23610072e5dcffe299f7a6c7d096930d54be1.1782315404.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: pFrTTtcJFaYWnVVWImfwthQBtdbTg-ZEMOSqBLU59Ic_1782315426 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EPAZYURMORDT5KLXA6VUVIYQNCBWH53C X-Message-ID-Hash: EPAZYURMORDT5KLXA6VUVIYQNCBWH53C X-MailFrom: jtomko@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: =?utf-8?q?J=C3=A1n_Tomko_via_Devel?= Reply-To: =?UTF-8?q?J=C3=A1n=20Tomko?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1782315936575158500 From: J=C3=A1n Tomko Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/hyperv/hyperv_driver.c | 15 ++++++--------- src/hyperv/hyperv_wmi.c | 18 ++++-------------- src/hyperv/hyperv_wmi.h | 8 ++++---- 3 files changed, 14 insertions(+), 27 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 52e2ac111c..50b4c88939 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -3054,9 +3054,8 @@ hypervDomainDefineXMLFlags(virConnectPtr conn, } } =20 - if (hypervAddEmbeddedParam(params, "SystemSettings", - &defineSystemParam, Msvm_VirtualSystemSetti= ngData_WmiInfo) < 0) - goto error; + hypervAddEmbeddedParam(params, "SystemSettings", + &defineSystemParam, Msvm_VirtualSystemSettingDa= ta_WmiInfo); =20 /* create the VM */ if (hypervInvokeMethod(priv, ¶ms, NULL) < 0) @@ -3312,9 +3311,8 @@ hypervDomainSetAutostart(virDomainPtr domain, int aut= ostart) if (hypervSetEmbeddedProperty(autostartParam, "InstanceID", vssd->data= ->InstanceID) < 0) return -1; =20 - if (hypervAddEmbeddedParam(params, "SystemSettings", - &autostartParam, Msvm_VirtualSystemSettingD= ata_WmiInfo) < 0) - return -1; + hypervAddEmbeddedParam(params, "SystemSettings", + &autostartParam, Msvm_VirtualSystemSettingData_= WmiInfo); =20 if (hypervInvokeMethod(priv, ¶ms, NULL) < 0) return -1; @@ -4250,9 +4248,8 @@ hypervDomainSnapshotCreateXML(virDomainPtr domain, HYPERV_SNAPSHOT_CONSISTENCY_CRASH_CONSIS= TENT) < 0) return NULL; =20 - if (hypervAddEmbeddedParam(params, "SnapshotSettings", &snapshotSettin= gs, - Msvm_VirtualSystemSnapshotSettingData_WmiIn= fo) < 0) - return NULL; + hypervAddEmbeddedParam(params, "SnapshotSettings", &snapshotSettings, + Msvm_VirtualSystemSnapshotSettingData_WmiInfo); =20 hypervAddSimpleParam(params, "SnapshotType", HYPERV_SNAPSHOT_TYPE_FULL= ); =20 diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 30ff81d83e..c669ecd8f9 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -314,11 +314,9 @@ hypervSetEmbeddedProperty(GHashTable *table, * Add a GHashTable containing object properties as an embedded param to * an invocation list. * - * Upon successful return the @table is consumed and the pointer is cleare= d out. - * - * Returns -1 on failure, 0 on success. + * Upon return the @table is consumed and the pointer is cleared out. */ -int +void hypervAddEmbeddedParam(hypervInvokeParamsList *params, const char *name, GHashTable **table, @@ -334,8 +332,6 @@ hypervAddEmbeddedParam(hypervInvokeParamsList *params, p->embedded.table =3D g_steal_pointer(table); p->embedded.info =3D classInfo; params->nbParams++; - - return 0; } =20 =20 @@ -1731,10 +1727,7 @@ hypervMsvmVSMSAddResourceSettings(virDomainPtr domai= n, hypervAddEprParam(params, "AffectedConfiguration", &eprQuery, Msvm_VirtualSystemSettingData_WmiInfo); =20 - if (hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettin= gs, wmiInfo) < 0) { - hypervFreeEmbeddedParam(resourceSettings); - return -1; - } + hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettings, = wmiInfo); =20 if (hypervInvokeMethod(priv, ¶ms, response) < 0) return -1; @@ -1760,10 +1753,7 @@ hypervMsvmVSMSModifyResourceSettings(hypervPrivate *= priv, if (!params) return -1; =20 - if (hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettin= gs, wmiInfo) < 0) { - hypervFreeEmbeddedParam(resourceSettings); - return -1; - } + hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettings, = wmiInfo); =20 if (hypervInvokeMethod(priv, ¶ms, NULL) < 0) return -1; diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h index c769ac4db0..c5cd34b411 100644 --- a/src/hyperv/hyperv_wmi.h +++ b/src/hyperv/hyperv_wmi.h @@ -155,10 +155,10 @@ int hypervSetEmbeddedProperty(GHashTable *table, const char *name, const char *value); =20 -int hypervAddEmbeddedParam(hypervInvokeParamsList *params, - const char *name, - GHashTable **table, - hypervWmiClassInfo *info); +void hypervAddEmbeddedParam(hypervInvokeParamsList *params, + const char *name, + GHashTable **table, + hypervWmiClassInfo *info); =20 void hypervFreeEmbeddedParam(GHashTable *p); =20 --=20 2.54.0