From nobody Sun Feb 8 12:29:02 2026 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 1740587700288570.005048131784; Wed, 26 Feb 2025 08:35:00 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id A4F28182E; Wed, 26 Feb 2025 11:34:59 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B290B16B2; Wed, 26 Feb 2025 11:31:45 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4A0431809; Wed, 26 Feb 2025 11:31:40 -0500 (EST) 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 D717D1607 for ; Wed, 26 Feb 2025 11:31:26 -0500 (EST) Received: from mx-prod-mc-04.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-637-cFNIyaEzMaGSdb0Fq3X1eg-1; Wed, 26 Feb 2025 11:31:25 -0500 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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 53CA519039C6 for ; Wed, 26 Feb 2025 16:31:24 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.10]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 841C7180035E for ; Wed, 26 Feb 2025 16:31:23 +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=1740587486; 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=OPE545aiMb/UmG7NfSzKday7r1mnNByhlrGMo1bPMC0=; b=dvTucxCHRUdfSItNipSuF7c3HNzeEJoOaXbtcA5ZfoSmyr1teR5ve83/W4qoOwg0l1RR9c 1sCzinXAG/gClUlelKapd78wda8J37FF5e5+kuRhCa1iyymbo5XFZFP/KeAKhyALRPYgEm s4QL4yuRAmuVd2N1T9Qlw6AIOjfS7wc= X-MC-Unique: cFNIyaEzMaGSdb0Fq3X1eg-1 X-Mimecast-MFC-AGG-ID: cFNIyaEzMaGSdb0Fq3X1eg_1740587484 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 08/10] qemuAgentGetUsers: Convert to virTypedParamList Date: Wed, 26 Feb 2025 17:31:08 +0100 Message-ID: <8f335f09af90487294b3ae1fcb4cd6476a4ec8d9.1740586286.git.pkrempa@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: XyFm9OUGLhahsbciEB-yF5IMTNeVTdz-1ut07djrs8Y_1740587484 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OVTUU3B6LHNBSEVUU6AOV2XOCQFPCKHE X-Message-ID-Hash: OVTUU3B6LHNBSEVUU6AOV2XOCQFPCKHE X-MailFrom: pkrempa@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: 1740587702227019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_agent.c | 29 +++++----------------- src/qemu/qemu_agent.h | 4 +-- src/qemu/qemu_driver.c | 2 +- tests/qemuagenttest.c | 55 +++++++++++++++++++----------------------- 4 files changed, 33 insertions(+), 57 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index fcfe50dd9e..606600451d 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2172,9 +2172,7 @@ qemuAgentSetUserPassword(qemuAgent *agent, */ int qemuAgentGetUsers(qemuAgent *agent, - virTypedParameterPtr *params, - int *nparams, - int *maxparams, + virTypedParamList *list, bool report_unsupported) { g_autoptr(virJSONValue) cmd =3D NULL; @@ -2199,13 +2197,10 @@ qemuAgentGetUsers(qemuAgent *agent, ndata =3D virJSONValueArraySize(data); - if (virTypedParamsAddUInt(params, nparams, maxparams, - "user.count", ndata) < 0) - return -1; + virTypedParamListAddUInt(list, ndata, "user.count"); for (i =3D 0; i < ndata; i++) { virJSONValue *entry =3D virJSONValueArrayGet(data, i); - char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; const char *strvalue; double logintime; @@ -2221,30 +2216,18 @@ qemuAgentGetUsers(qemuAgent *agent, return -1; } - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, "user.%zu.nam= e", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, strvalue) < 0) - return -1; + virTypedParamListAddString(list, strvalue, "user.%zu.name", i); /* 'domain' is only present for windows guests */ - if ((strvalue =3D virJSONValueObjectGetString(entry, "domain"))) { - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "user.%zu.domain", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, strvalue) < 0) - return -1; - } + if ((strvalue =3D virJSONValueObjectGetString(entry, "domain"))) + virTypedParamListAddString(list, strvalue, "user.%zu.domain", = i); if (virJSONValueObjectGetNumberDouble(entry, "login-time", &logint= ime) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("'login-time' missing in reply of guest-get-u= sers")); return -1; } - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "user.%zu.login-time", i); - if (virTypedParamsAddULLong(params, nparams, maxparams, - param_name, logintime * 1000) < 0) - return -1; + virTypedParamListAddULLong(list, logintime * 1000, "user.%zu.login= -time", i); } return 0; diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index ac2c8506a2..860f19b6bd 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -157,9 +157,7 @@ int qemuAgentSetUserPassword(qemuAgent *mon, bool crypted); int qemuAgentGetUsers(qemuAgent *mon, - virTypedParameterPtr *params, - int *nparams, - int *maxparams, + virTypedParamList *list, bool report_unsupported); int qemuAgentGetOSInfo(qemuAgent *mon, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 201ac89de6..cd07d3eac5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19400,7 +19400,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, * 'unsupported' errors and gather as much information as we can. In a= ll * other cases, abort on error. */ if (supportedTypes & VIR_DOMAIN_GUEST_INFO_USERS && - qemuAgentGetUsers(agent, params, nparams, &maxparams, report_unsup= ported) =3D=3D -1) + qemuAgentGetUsers(agent, list, report_unsupported) =3D=3D -1) goto exitagent; if (supportedTypes & VIR_DOMAIN_GUEST_INFO_OS && diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 93f88083fe..9c64ed3c5f 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1095,69 +1095,64 @@ testQemuAgentUsers(const void *data) { virDomainXMLOption *xmlopt =3D (virDomainXMLOption *)data; g_autoptr(qemuMonitorTest) test =3D qemuMonitorTestNewAgent(xmlopt); - virTypedParameterPtr params =3D NULL; - int nparams =3D 0; - int maxparams =3D 0; - int ret =3D -1; + g_autoptr(virTypedParamList) list =3D virTypedParamListNew(); + virTypedParameterPtr params; + size_t nparams =3D 0; unsigned int count; if (!test) return -1; if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - goto cleanup; + return -1; if (qemuMonitorTestAddItem(test, "guest-get-users", testQemuAgentUsersResponse) < 0) - goto cleanup; + return -1; - /* get users */ - if (qemuAgentGetUsers(qemuMonitorTestGetAgent(test), - ¶ms, &nparams, &maxparams, true) < 0) - goto cleanup; + if (qemuAgentGetUsers(qemuMonitorTestGetAgent(test), list, true) < 0) + return -1; + + if (virTypedParamListFetch(list, ¶ms, &nparams) < 0) + return -1; if (virTypedParamsGetUInt(params, nparams, "user.count", &count) < 0) - goto cleanup; + return -1; if (count !=3D 2) { virReportError(VIR_ERR_INTERNAL_ERROR, "Expected '2' users, got '%u'", count); - goto cleanup; + return -1; } if (checkUserInfo(params, nparams, 0, "test", NULL, 1561739203584) < 0= || checkUserInfo(params, nparams, 1, "test2", NULL, 1561739229190) < = 0) - goto cleanup; + return -1; + + g_clear_pointer(&list, virTypedParamListFree); + list =3D virTypedParamListNew(); if (qemuMonitorTestAddItem(test, "guest-get-users", testQemuAgentUsersResponse2) < 0) - goto cleanup; + return -1; - virTypedParamsFree(params, nparams); - params =3D NULL; - nparams =3D 0; - maxparams =3D 0; + if (qemuAgentGetUsers(qemuMonitorTestGetAgent(test), list, true) < 0) + return -1; - /* get users with domain */ - if (qemuAgentGetUsers(qemuMonitorTestGetAgent(test), - ¶ms, &nparams, &maxparams, true) < 0) - goto cleanup; + if (virTypedParamListFetch(list, ¶ms, &nparams) < 0) + return -1; if (virTypedParamsGetUInt(params, nparams, "user.count", &count) < 0) - goto cleanup; + return -1; if (count !=3D 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "Expected '1' user, got '%u'", count); - goto cleanup; + return -1; } if (checkUserInfo(params, nparams, 0, "test", "DOMAIN", 1561739203584)= < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - virTypedParamsFree(params, nparams); - return ret; + return 0; } static const char testQemuAgentOSInfoResponse[] =3D --=20 2.48.1