From nobody Wed Mar 12 17:47:02 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 1740587654212872.4715437842783; Wed, 26 Feb 2025 08:34:14 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 888DC1749; Wed, 26 Feb 2025 11:34:13 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EB1EC1705; Wed, 26 Feb 2025 11:31:39 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6B4401890; Wed, 26 Feb 2025 11:31:34 -0500 (EST) 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 3AEA917EE for ; Wed, 26 Feb 2025 11:31:24 -0500 (EST) 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-224--t5BVoB6MKSPwujXuzJkPw-1; Wed, 26 Feb 2025 11:31:22 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3A2161801A16 for ; Wed, 26 Feb 2025 16:31:21 +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 6BAB81800945 for ; Wed, 26 Feb 2025 16:31: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=1740587483; 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=NuKI477aiV6kxK4ZZk4isvxyQoHRQ6C4bEUEPSmsLx0=; b=iWjSVuAD7o80QG47y55uldBVYMICprjh2E7IRaqEBmq7hDlNVYa7eeRjmmF09wYLfUm3sg AH8zRcAFxuZ5/MCB+AkNKQnw48IgXCOom4qfsvZP1ZkTFXDCM7Y6VCFKbST6VRhkIR2k8F f6FAPx7NUhoD/YQpKgH3OvwZU3afVGw= X-MC-Unique: -t5BVoB6MKSPwujXuzJkPw-1 X-Mimecast-MFC-AGG-ID: -t5BVoB6MKSPwujXuzJkPw_1740587481 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 06/10] qemuAgentGetTimezone: Convert to virTypedParamList Date: Wed, 26 Feb 2025 17:31:06 +0100 Message-ID: <4efe8e139c551f31340918b75fd9e3bfe39d2c15.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: qtLNtlGNpugm0fwAj4kNZIR4VxqNW7eSSIrSOsj7T2Q_1740587481 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 43UTWOC767XUSULLU6WIZS4H5SPJM76M X-Message-ID-Hash: 43UTWOC767XUSULLU6WIZS4H5SPJM76M 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: 1740587655982019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_agent.c | 14 ++++---------- src/qemu/qemu_agent.h | 4 +--- src/qemu/qemu_driver.c | 2 +- tests/qemuagenttest.c | 39 ++++++++++++++++----------------------- 4 files changed, 22 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 27efb4b389..e158b3d7ab 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2311,9 +2311,7 @@ qemuAgentGetOSInfo(qemuAgent *agent, */ int qemuAgentGetTimezone(qemuAgent *agent, - virTypedParameterPtr *params, - int *nparams, - int *maxparams, + virTypedParamList *list, bool report_unsupported) { g_autoptr(virJSONValue) cmd =3D NULL; @@ -2336,10 +2334,8 @@ qemuAgentGetTimezone(qemuAgent *agent, return -1; } - if ((name =3D virJSONValueObjectGetString(data, "zone")) && - virTypedParamsAddString(params, nparams, maxparams, - "timezone.name", name) < 0) - return -1; + if ((name =3D virJSONValueObjectGetString(data, "zone"))) + virTypedParamListAddString(list, name, "timezone.name"); if ((virJSONValueObjectGetNumberInt(data, "offset", &offset)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2347,9 +2343,7 @@ qemuAgentGetTimezone(qemuAgent *agent, return -1; } - if (virTypedParamsAddInt(params, nparams, maxparams, - "timezone.offset", offset) < 0) - return -1; + virTypedParamListAddInt(list, offset, "timezone.offset"); return 0; } diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index cd17a98d39..3f25f0e5a6 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -169,9 +169,7 @@ int qemuAgentGetOSInfo(qemuAgent *mon, bool report_unsupported); int qemuAgentGetTimezone(qemuAgent *mon, - virTypedParameterPtr *params, - int *nparams, - int *maxparams, + virTypedParamList *list, bool report_unsupported); void qemuAgentSetResponseTimeout(qemuAgent *mon, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0d88f182b8..53be46ce0a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19408,7 +19408,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, goto exitagent; if (supportedTypes & VIR_DOMAIN_GUEST_INFO_TIMEZONE && - qemuAgentGetTimezone(agent, params, nparams, &maxparams, report_un= supported) =3D=3D -1) + qemuAgentGetTimezone(agent, list, report_unsupported) =3D=3D -1) goto exitagent; if (supportedTypes & VIR_DOMAIN_GUEST_INFO_HOSTNAME && diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 566571cf11..5fd4d70a70 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1291,57 +1291,54 @@ testQemuAgentTimezone(const void *data) { virDomainXMLOption *xmlopt =3D (virDomainXMLOption *)data; g_autoptr(qemuMonitorTest) test =3D qemuMonitorTestNewAgent(xmlopt); - virTypedParameterPtr params =3D NULL; - int nparams =3D 0; - int ret =3D -1; if (!test) return -1; if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - goto cleanup; + return -1; #define VALIDATE_TIMEZONE(response_, expected_name_, expected_offset_) \ do { \ - int maxparams_ =3D 0; \ + g_autoptr(virTypedParamList) list =3D virTypedParamListNew(); \ + virTypedParameterPtr params; \ + size_t nparams; \ const char *name_ =3D NULL; \ int offset_; \ if (qemuMonitorTestAddItem(test, "guest-get-timezone", \ response_) < 0) \ - goto cleanup; \ - virTypedParamsFree(params, nparams); \ - params =3D NULL; \ - nparams =3D 0; \ - if (qemuAgentGetTimezone(qemuMonitorTestGetAgent(test), \ - ¶ms, &nparams, &maxparams_, true) < 0= ) \ - goto cleanup; \ + return -1; \ + if (qemuAgentGetTimezone(qemuMonitorTestGetAgent(test), list, true= ) < 0) \ + return -1; \ + if (virTypedParamListFetch(list, ¶ms, &nparams) < 0) \ + return -1; \ if (nparams !=3D 2) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - "Expected 2 params, got %d", nparams); \ - goto cleanup; \ + "Expected 2 params, got %zu", nparams); \ + return -1; \ } \ if (virTypedParamsGetString(params, nparams, \ "timezone.name", &name_) < 0) { \ virReportError(VIR_ERR_INTERNAL_ERROR, "missing param '%s'", \ "tiemzone.name"); \ - goto cleanup; \ + return -1; \ } \ if (STRNEQ(name_, expected_name_)) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "Expected name '%s', got '%s'", expected_name_,= name_); \ - goto cleanup; \ + return -1; \ } \ if (virTypedParamsGetInt(params, nparams, \ "timezone.offset", &offset_) < 0) { \ virReportError(VIR_ERR_INTERNAL_ERROR, "missing param '%s'", \ "tiemzone.offset"); \ - goto cleanup; \ + return -1; \ } \ if (offset_ !=3D expected_offset_) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "Expected offset '%i', got '%i'", offset_, \ expected_offset_); \ - goto cleanup; \ + return -1; \ } \ } while (0) @@ -1350,11 +1347,7 @@ testQemuAgentTimezone(const void *data) VALIDATE_TIMEZONE(testQemuAgentTimezoneResponse3, "NDT", -9000); VALIDATE_TIMEZONE(testQemuAgentTimezoneResponse4, "PDT", -25200); - ret =3D 0; - - cleanup: - virTypedParamsFree(params, nparams); - return ret; + return 0; } --=20 2.48.1