From nobody Wed Mar 12 12:48:15 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 1740587503934245.00264652835938; Wed, 26 Feb 2025 08:31:43 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id CB48F1725; Wed, 26 Feb 2025 11:31:42 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 38FAE15AC; Wed, 26 Feb 2025 11:31:21 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 60BCE14A4; Wed, 26 Feb 2025 11:31:18 -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 BB9841493 for ; Wed, 26 Feb 2025 11:31:17 -0500 (EST) Received: from mx-prod-mc-03.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-547-oy-EfVbkNamS0cb5NG-cgQ-1; Wed, 26 Feb 2025 11:31:15 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 73E321955F28 for ; Wed, 26 Feb 2025 16:31:14 +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 72DAE180087F for ; Wed, 26 Feb 2025 16:31: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=1740587477; 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=r27X63Yc+c3FZcpUs3HiiNfJtNvtvO4aIqEaHRNDVP4=; b=Pmi49fFW66DyTR6ExxgczA31yzNVF1/nOi/GELniPh3O86untX+mTn4VK640y8PhjMAHZB qVAJPqVu2BephkN8iVAXLIER/1IX/trzcGZyED54k0PbjXIhO+FYIW4VuufXEvqGNM51+g EJUcYON7KltKGF6nwnqddJiThHdnxmw= X-MC-Unique: oy-EfVbkNamS0cb5NG-cgQ-1 X-Mimecast-MFC-AGG-ID: oy-EfVbkNamS0cb5NG-cgQ_1740587474 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 01/10] qemuDomainGetGuestInfo: Prepare for refactor to virTypedParamList Date: Wed, 26 Feb 2025 17:31:01 +0100 Message-ID: <20718fbed8d0b49f97c1bd5ccd2afe207f9243a3.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: 9caFLxsEby7O9U4x9vQEhq4pKKF6s_xkTJF2oRAKNbc_1740587474 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: P5Y7JMPHMGJMC2RPL2G3UFO3WFYUOZQZ X-Message-ID-Hash: P5Y7JMPHMGJMC2RPL2G3UFO3WFYUOZQZ 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: 1740587504946019100 Content-Type: text/plain; charset="utf-8" Use of raw typed param APIs is very clunky. Prepare qemuDomainGetGuestInfo for step-by-step refactor to virTypedParamList. The two lists will coexist until the refactor is complete. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 86b945d9b9..3d2ebd7719 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19483,6 +19483,8 @@ qemuDomainGetGuestInfo(virDomainPtr dom, double load15m =3D 0; bool format_load =3D false; size_t i; + g_autoptr(virTypedParamList) list =3D virTypedParamListNew(); + g_autoptr(virTypedParamList) tmplist =3D NULL; virCheckFlags(0, -1); @@ -19592,6 +19594,14 @@ qemuDomainGetGuestInfo(virDomainPtr dom, virTypedParamsAddDouble(params, nparams, &maxparams, "load.15m", l= oad15m); } + /* temporarily allow the old and new construction style to coexist */ + tmplist =3D virTypedParamListFromParams(params, *nparams); + virTypedParamListConcat(tmplist, &list); + list =3D g_steal_pointer(&tmplist); + + if (virTypedParamListSteal(list, params, nparams) < 0) + goto cleanup; + ret =3D 0; cleanup: --=20 2.48.1 From nobody Wed Mar 12 12:48:15 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 1740587523301836.1481620190552; Wed, 26 Feb 2025 08:32:03 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id A752818D5; Wed, 26 Feb 2025 11:32:02 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4EEDA17DA; Wed, 26 Feb 2025 11:31:24 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id CFD2E14C9; Wed, 26 Feb 2025 11:31:18 -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 549C914B6 for ; Wed, 26 Feb 2025 11:31:18 -0500 (EST) Received: from mx-prod-mc-02.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-166-BXI0DQkGOHCIIReP0llrHQ-1; Wed, 26 Feb 2025 11:31:16 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D599218EAB39 for ; Wed, 26 Feb 2025 16:31:15 +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 080B5180035E for ; Wed, 26 Feb 2025 16:31:14 +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=1740587478; 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=MLZXAIyT4dQfagpg5LhHLe9udFLSOZ5JGfbkY668gC0=; b=Vp83EB6HxMTRgdzPKWAfVR6MO5NxlAK6Spa02Xc6TxpaOJJ5LUJvcbmtxcJZx8bSA5y+7W gdvO1sB0pVV6Yib51phApo8wNhVOqDLSZmQ0V1OeRiSbPUUQQUZtrtFqX6LsIY2mLen+dl 8HxM4TirR0UyOCIVcGyuWj83C4LsrSY= X-MC-Unique: BXI0DQkGOHCIIReP0llrHQ-1 X-Mimecast-MFC-AGG-ID: BXI0DQkGOHCIIReP0llrHQ_1740587476 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 02/10] qemuDomainGetGuestInfo: Convert load code to virTypedParamList Date: Wed, 26 Feb 2025 17:31:02 +0100 Message-ID: <446c9280158d1481373a3b4ccf7e592693c6e6ed.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: U4t7tBHcTxQHsAvQ2erT7Tg4oS1NcvnlPY9PQy-5xCE_1740587476 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: T4V7OK6ERSZZ6SI4QVYWA24DTMSUXPNQ X-Message-ID-Hash: T4V7OK6ERSZZ6SI4QVYWA24DTMSUXPNQ 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: 1740587525205019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3d2ebd7719..3eabb0e1ed 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19589,9 +19589,9 @@ qemuDomainGetGuestInfo(virDomainPtr dom, } if (format_load) { - virTypedParamsAddDouble(params, nparams, &maxparams, "load.1m", lo= ad1m); - virTypedParamsAddDouble(params, nparams, &maxparams, "load.5m", lo= ad5m); - virTypedParamsAddDouble(params, nparams, &maxparams, "load.15m", l= oad15m); + virTypedParamListAddDouble(list, load1m, "load.1m"); + virTypedParamListAddDouble(list, load5m, "load.5m"); + virTypedParamListAddDouble(list, load15m, "load.15m"); } /* temporarily allow the old and new construction style to coexist */ --=20 2.48.1 From nobody Wed Mar 12 12:48:15 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 1740587571242859.4758218476794; Wed, 26 Feb 2025 08:32:51 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id A798618CF; Wed, 26 Feb 2025 11:32:50 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 48B6C1856; Wed, 26 Feb 2025 11:31:29 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1C13514B6; Wed, 26 Feb 2025 11:31:20 -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 9A9F1149B for ; Wed, 26 Feb 2025 11:31:19 -0500 (EST) 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-57-a56I1FvUMQCi8d0SO9oADA-1; Wed, 26 Feb 2025 11:31:18 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3D812180087F for ; Wed, 26 Feb 2025 16:31:17 +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 7018B180035E for ; Wed, 26 Feb 2025 16:31: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_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=1740587479; 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=z1Q5HpQNz1ghGmBQRMLQWKT9xxBNjuR5T8tSihUvBew=; b=Zet9Nd0zI82oBo8rBD5Iji80IE2NWZrl6WHqNr6oCO4QADwz+e2w6CJy5qD13jFWrBDbVr 6G5IKPBX5f/A0UbJZ57bWnYDOHNanXfaF4CP4WE9aW80FvL+q33S6zZXDY24GglE9A0Oew 71XmHPFGs7vLCagQ+OTZlAqZ3IJ4W7w= X-MC-Unique: a56I1FvUMQCi8d0SO9oADA-1 X-Mimecast-MFC-AGG-ID: a56I1FvUMQCi8d0SO9oADA_1740587477 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 03/10] virDomainInterfaceFormatParams: Convert interface code to virTypedParamList Date: Wed, 26 Feb 2025 17:31:03 +0100 Message-ID: <84a3174a23839d35b4af5585a294e2120f9e8a7f.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: WY240NZINyJE8wrIYtRPYo_Tkul24GS9n4XKDz9ZY2Y_1740587477 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XXXTRQLIJYNG3EM3IFUGRKJTK2KZSCKD X-Message-ID-Hash: XXXTRQLIJYNG3EM3IFUGRKJTK2KZSCKD 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: 1740587571764019000 Content-Type: text/plain; charset="utf-8" Also deletes pre-existing broken formatting. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 60 ++++++++++-------------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3eabb0e1ed..3ebc712f9a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19393,66 +19393,34 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfo **fsi= nfo, static void virDomainInterfaceFormatParams(virDomainInterfacePtr *ifaces, int nifaces, - virTypedParameterPtr *params, - int *nparams, int *maxparams) + virTypedParamList *list) { size_t i; - size_t j; - if (virTypedParamsAddUInt(params, nparams, maxparams, - "if.count", nifaces) < 0) - return; + virTypedParamListAddUInt(list, nifaces, "if.count"); for (i =3D 0; i < nifaces; i++) { - char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; - - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "if.%zu.name", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, ifaces[i]->name) < 0) - return; + size_t j; - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "if.%zu.hwaddr", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, ifaces[i]->hwaddr) < 0) - return; - - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "if.%zu.addr.count", i); - if (virTypedParamsAddUInt(params, nparams, maxparams, - param_name, ifaces[i]->naddrs) < 0) - return; + virTypedParamListAddString(list, ifaces[i]->name, "if.%zu.name", i= ); + virTypedParamListAddString(list, ifaces[i]->hwaddr, "if.%zu.hwaddr= ", i); + virTypedParamListAddUInt(list, ifaces[i]->naddrs, "if.%zu.addr.cou= nt", i); for (j =3D 0; j < ifaces[i]->naddrs; j++) { - const char *type =3D NULL; - switch (ifaces[i]->addrs[j].type) { case VIR_IP_ADDR_TYPE_IPV4: - type =3D "ipv4"; + virTypedParamListAddString(list, "ipv4", "if.%zu.addr.= %zu.type", i, j); break; + case VIR_IP_ADDR_TYPE_IPV6: - type =3D "ipv6"; + virTypedParamListAddString(list, "ipv6", "if.%zu.addr.= %zu.type", i, j); break; } - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "if.%zu.addr.%zu.type", i, j); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, type) < 0) - return; - - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "if.%zu.addr.%zu.addr", i, j); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, ifaces[i]->addrs[j].ad= dr) < 0) - return; - - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "if.%zu.addr.%zu.prefix", i, j); - if (virTypedParamsAddUInt(params, nparams, maxparams, - param_name, ifaces[i]->addrs[j].pref= ix) < 0) - return; + virTypedParamListAddString(list, ifaces[i]->addrs[j].addr, + "if.%zu.addr.%zu.addr", i, j); + virTypedParamListAddUInt(list, ifaces[i]->addrs[j].prefix, + "if.%zu.addr.%zu.prefix", i, j); } } } @@ -19585,7 +19553,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, } if (nifaces > 0) { - virDomainInterfaceFormatParams(ifaces, nifaces, params, nparams, &= maxparams); + virDomainInterfaceFormatParams(ifaces, nifaces, list); } if (format_load) { --=20 2.48.1 From nobody Wed Mar 12 12:48:15 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 1740587624972810.994273113386; Wed, 26 Feb 2025 08:33:44 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id EAD0517EC; Wed, 26 Feb 2025 11:33:43 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 28E47170F; Wed, 26 Feb 2025 11:31:37 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id B24451572; Wed, 26 Feb 2025 11:31:31 -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 1A8EC1776 for ; Wed, 26 Feb 2025 11:31:23 -0500 (EST) 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-159-ia1pL7dFPhaLtQnQGOY2sw-1; Wed, 26 Feb 2025 11:31:19 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 86ADE180034E for ; Wed, 26 Feb 2025 16:31:18 +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 B9093180087F for ; Wed, 26 Feb 2025 16:31:17 +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=1740587482; 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=+YF7GgT9wI0eHfrFYMYJ/SxML/tzSlxWg3RWg8np8Tw=; b=LL/vBl6fM0ZsxfWPgudZTB9mm8T/WAQgbkccU7qK8BRTcaTOWSQqhb+QRBYpXcJJSxvghA xdn1eG/lIjGPGp2llDPdSVsOTIPJpbBRIecoaqcIdINqC7X1Q31LAk3VcGUQTA/zFloweA My/u0yQTPV0Up+iUZltSe+QpvShy4jo= X-MC-Unique: ia1pL7dFPhaLtQnQGOY2sw-1 X-Mimecast-MFC-AGG-ID: ia1pL7dFPhaLtQnQGOY2sw_1740587478 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 04/10] qemuAgentDiskInfoFormatParams: Convert interface code to virTypedParamList Date: Wed, 26 Feb 2025 17:31:04 +0100 Message-ID: <49e465984744ccf112344f683e0d6ebbd8161c1e.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: JUDYipiQhtpFP5gtUBJghQboXeo6p-FPpkU_seN26m4_1740587478 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: W5RQBOQWZUZMTD56K5FTRYYTEQTD56IN X-Message-ID-Hash: W5RQBOQWZUZMTD56K5FTRYYTEQTD56IN 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: 1740587627284019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 81 +++++++++++------------------------------- 1 file changed, 21 insertions(+), 60 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3ebc712f9a..515577b71a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19210,44 +19210,26 @@ static void qemuAgentDiskInfoFormatParams(qemuAgentDiskInfo **info, int ndisks, virDomainDef *vmdef, - virTypedParameterPtr *params, - int *nparams, int *maxparams) + virTypedParamList *list) { - size_t i, j, ndeps; + size_t i; - if (virTypedParamsAddUInt(params, nparams, maxparams, - "disk.count", ndisks) < 0) - return; + virTypedParamListAddUInt(list, ndisks, "disk.count"); for (i =3D 0; i < ndisks; i++) { - char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; + virTypedParamListAddString(list, info[i]->name, "disk.%zu.name", i= ); + virTypedParamListAddBoolean(list, info[i]->partition, "disk.%zu.pa= rtition", i); - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "disk.%zu.name", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, info[i]->name) < 0) - return; + if (info[i]->dependencies) { + size_t ndeps =3D g_strv_length(info[i]->dependencies); + size_t j; - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "disk.%zu.partition", i); - if (virTypedParamsAddBoolean(params, nparams, maxparams, - param_name, info[i]->partition) < 0) - return; + if (ndeps > 0) + virTypedParamListAddUInt(list, ndeps, "disk.%zu.dependency= .count", i); - if (info[i]->dependencies) { - ndeps =3D g_strv_length(info[i]->dependencies); - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "disk.%zu.dependency.count", i); - if (ndeps && - virTypedParamsAddUInt(params, nparams, maxparams, - param_name, ndeps) < 0) - return; for (j =3D 0; j < ndeps; j++) { - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "disk.%zu.dependency.%zu.name", i, j); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, info[i]->dependenc= ies[j]) < 0) - return; + virTypedParamListAddString(list, info[i]->dependencies[j], + "disk.%zu.dependency.%zu.name",= i, j); } } @@ -19255,13 +19237,8 @@ qemuAgentDiskInfoFormatParams(qemuAgentDiskInfo **= info, qemuAgentDiskAddress *address =3D info[i]->address; virDomainDiskDef *diskdef =3D NULL; - if (address->serial) { - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "disk.%zu.serial", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, address->serial) <= 0) - return; - } + if (address->serial) + virTypedParamListAddString(list, address->serial, "disk.%z= u.serial", i); /* match the disk to the target in the vm definition */ diskdef =3D virDomainDiskByAddress(vmdef, @@ -19270,32 +19247,16 @@ qemuAgentDiskInfoFormatParams(qemuAgentDiskInfo *= *info, address->bus, address->target, address->unit); - if (diskdef) { - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "disk.%zu.alias", i); - if (diskdef->dst && - virTypedParamsAddString(params, nparams, maxparams, - param_name, diskdef->dst) < 0) - return; - } - if (address->bus_type) { - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "disk.%zu.guest_bus", i); + if (diskdef && diskdef->dst) + virTypedParamListAddString(list, diskdef->dst, "disk.%zu.a= lias", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, address->bus_type)= < 0) - return; - } + if (address->bus_type) + virTypedParamListAddString(list, address->bus_type, "disk.= %zu.guest_bus", i); } - if (info[i]->alias) { - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "disk.%zu.guest_alias", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, info[i]->alias) < 0) - return; - } + if (info[i]->alias) + virTypedParamListAddString(list, info[i]->alias, "disk.%zu.gue= st_alias", i); } } @@ -19546,7 +19507,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuAgentFSInfoFormatParams(agentfsinfo, nfs, vm->def, params,= nparams, &maxparams); if (ndisks > 0) - qemuAgentDiskInfoFormatParams(agentdiskinfo, ndisks, vm->def, = params, nparams, &maxparams); + qemuAgentDiskInfoFormatParams(agentdiskinfo, ndisks, vm->def, = list); endjob: virDomainObjEndJob(vm); --=20 2.48.1 From nobody Wed Mar 12 12:48:15 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 1740587601188816.1553832661411; Wed, 26 Feb 2025 08:33:21 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 11447187F; Wed, 26 Feb 2025 11:33:20 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7133517E6; Wed, 26 Feb 2025 11:31:35 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id DB8F614B6; Wed, 26 Feb 2025 11:31:30 -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 AC5C31743 for ; Wed, 26 Feb 2025 11:31:22 -0500 (EST) 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-398-ia_sDGJOOjaoLav_E-nUPQ-1; Wed, 26 Feb 2025 11:31:20 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DE9461800876 for ; Wed, 26 Feb 2025 16:31:19 +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 1CAC0180035E for ; Wed, 26 Feb 2025 16:31:18 +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=1740587482; 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=FOVYpFF2QZD38AZs0mTJ5OoU1LryjYmjtGkwErUG8Os=; b=HuMymrXvZ/Bo78tZ64jOKD+Yy1WZD/eRLI1VbwkF/xsZGQtpmhqq0/FKdWg8egVdBS8rtM mzD75x8amUWKOg8rVMUzmgwPkGsi91Jfv8Xqyf+wMYaibWOX+pLE9X3cEnbViQXYxMo8P7 UdDMWM0kWhMR1dF/mK9KeZok3APOVvE= X-MC-Unique: ia_sDGJOOjaoLav_E-nUPQ-1 X-Mimecast-MFC-AGG-ID: ia_sDGJOOjaoLav_E-nUPQ_1740587480 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 05/10] qemuAgentFSInfoFormatParams: Convert interface code to virTypedParamList Date: Wed, 26 Feb 2025 17:31:05 +0100 Message-ID: <4aca3382219aba546cb47d380c42de10b6d81d03.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: VwIcwCzFOZTAn3e3JQH0wt-x0xY3KiEMdmiHKL38qAY_1740587480 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5VD6NQGLFTKJAVPZN6XQ35CW66YJSHE2 X-Message-ID-Hash: 5VD6NQGLFTKJAVPZN6XQ35CW66YJSHE2 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: 1740587603245019100 Content-Type: text/plain; charset="utf-8" Also remove stale TODO comment as we already report disk target. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 86 +++++++++++------------------------------- 1 file changed, 23 insertions(+), 63 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 515577b71a..0d88f182b8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19265,59 +19265,32 @@ static void qemuAgentFSInfoFormatParams(qemuAgentFSInfo **fsinfo, int nfs, virDomainDef *vmdef, - virTypedParameterPtr *params, - int *nparams, int *maxparams) + virTypedParamList *list) { - size_t i, j; - - /* FIXME: get disk target */ + size_t i; - if (virTypedParamsAddUInt(params, nparams, maxparams, - "fs.count", nfs) < 0) - return; + virTypedParamListAddUInt(list, nfs, "fs.count"); for (i =3D 0; i < nfs; i++) { - char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "fs.%zu.name", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, fsinfo[i]->name) < 0) - return; - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "fs.%zu.mountpoint", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, fsinfo[i]->mountpoint) < 0) - return; - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "fs.%zu.fstype", i); - if (virTypedParamsAddString(params, nparams, maxparams, - param_name, fsinfo[i]->fstype) < 0) - return; + size_t j; + + virTypedParamListAddString(list, fsinfo[i]->name, "fs.%zu.name", i= ); + virTypedParamListAddString(list, fsinfo[i]->mountpoint, "fs.%zu.mo= untpoint", i); + virTypedParamListAddString(list, fsinfo[i]->fstype, "fs.%zu.fstype= ", i); /* disk usage values are not returned by older guest agents, so * only add the params if the value is set */ - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "fs.%zu.total-bytes", i); - if (fsinfo[i]->total_bytes !=3D -1 && - virTypedParamsAddULLong(params, nparams, maxparams, - param_name, fsinfo[i]->total_bytes) < = 0) - return; + if (fsinfo[i]->total_bytes !=3D -1) + virTypedParamListAddULLong(list, fsinfo[i]->total_bytes, "fs.%= zu.total-bytes", i); + if (fsinfo[i]->used_bytes !=3D -1) + virTypedParamListAddULLong(list, fsinfo[i]->used_bytes, "fs.%z= u.used-bytes", i); - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "fs.%zu.used-bytes", i); - if (fsinfo[i]->used_bytes !=3D -1 && - virTypedParamsAddULLong(params, nparams, maxparams, - param_name, fsinfo[i]->used_bytes) < 0) - return; + virTypedParamListAddUInt(list, fsinfo[i]->ndisks, "fs.%zu.disk.cou= nt", i); - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "fs.%zu.disk.count", i); - if (virTypedParamsAddUInt(params, nparams, maxparams, - param_name, fsinfo[i]->ndisks) < 0) - return; for (j =3D 0; j < fsinfo[i]->ndisks; j++) { virDomainDiskDef *diskdef =3D NULL; qemuAgentDiskAddress *d =3D fsinfo[i]->disks[j]; + /* match the disk to the target in the vm definition */ diskdef =3D virDomainDiskByAddress(vmdef, &d->pci_controller, @@ -19325,28 +19298,15 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfo **fsi= nfo, d->bus, d->target, d->unit); - if (diskdef) { - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "fs.%zu.disk.%zu.alias", i, j); - if (diskdef->dst && - virTypedParamsAddString(params, nparams, maxparams, - param_name, diskdef->dst) < 0) - return; - } + if (diskdef && diskdef->dst) + virTypedParamListAddString(list, diskdef->dst, + "fs.%zu.disk.%zu.alias", i, j); + + if (d->serial) + virTypedParamListAddString(list, d->serial, "fs.%zu.disk.%= zu.serial", i, j); - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "fs.%zu.disk.%zu.serial", i, j); - if (d->serial && - virTypedParamsAddString(params, nparams, maxparams, - param_name, d->serial) < 0) - return; - - g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, - "fs.%zu.disk.%zu.device", i, j); - if (d->devnode && - virTypedParamsAddString(params, nparams, maxparams, - param_name, d->devnode) < 0) - return; + if (d->devnode) + virTypedParamListAddString(list, d->devnode, "fs.%zu.disk.= %zu.device", i, j); } } } @@ -19504,7 +19464,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, /* we need to convert the agent fsinfo struct to parameters and ma= tch * it to the vm disk target */ if (nfs > 0) - qemuAgentFSInfoFormatParams(agentfsinfo, nfs, vm->def, params,= nparams, &maxparams); + qemuAgentFSInfoFormatParams(agentfsinfo, nfs, vm->def, list); if (ndisks > 0) qemuAgentDiskInfoFormatParams(agentdiskinfo, ndisks, vm->def, = list); --=20 2.48.1 From nobody Wed Mar 12 12:48:15 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Wed Mar 12 12:48:15 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 1740587805373944.9455285944679; Wed, 26 Feb 2025 08:36:45 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3B51C1626; Wed, 26 Feb 2025 11:36:44 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4CF08176A; Wed, 26 Feb 2025 11:31:50 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2A96B1793; Wed, 26 Feb 2025 11:31:42 -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 59AA11602 for ; Wed, 26 Feb 2025 11:31:25 -0500 (EST) 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-201-U7R0x1y5MWiZiZYwqR_JeA-1; Wed, 26 Feb 2025 11:31:23 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 02CEE180087B for ; Wed, 26 Feb 2025 16:31:23 +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 33D131800949 for ; Wed, 26 Feb 2025 16:31:21 +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=1740587485; 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=r2RUWUXVyyTBfD79JKZ8ru51Y64bm0u4QKd+zBekID8=; b=UWR29VhFIPHOR2JceErslEd3BCVQzWsu5QQyK1wwaaArDtx/OGXTizmUTxFrhOxbMJ4cFJ CLGnFmr7bVJf1hRoffVOsuH8egEV+t/vK49kvRYOVHrO7IN+CirVGviHFwbCW4Wo2hhzX2 ZbqZgOUJ99qlqtrYA/micO6f68DqBSQ= X-MC-Unique: U7R0x1y5MWiZiZYwqR_JeA-1 X-Mimecast-MFC-AGG-ID: U7R0x1y5MWiZiZYwqR_JeA_1740587483 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 07/10] qemuAgentGetOSInfo: Convert to virTypedParamList Date: Wed, 26 Feb 2025 17:31:07 +0100 Message-ID: <6b3f642da4a272a158a2b4383a7610dac7ad3fa1.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: 3tDtuyibnGc8giKEd_e7y38KnA4HOQbx0v2lg8tsfQw_1740587483 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: M6OVRUBCTCFGWZCOHZBHEKTPLEKJNAW6 X-Message-ID-Hash: M6OVRUBCTCFGWZCOHZBHEKTPLEKJNAW6 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: 1740587805870019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_agent.c | 9 ++----- src/qemu/qemu_agent.h | 4 +--- src/qemu/qemu_driver.c | 2 +- tests/qemuagenttest.c | 54 ++++++++++++++++++++---------------------- 4 files changed, 30 insertions(+), 39 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index e158b3d7ab..fcfe50dd9e 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2257,9 +2257,7 @@ qemuAgentGetUsers(qemuAgent *agent, */ int qemuAgentGetOSInfo(qemuAgent *agent, - virTypedParameterPtr *params, - int *nparams, - int *maxparams, + virTypedParamList *list, bool report_unsupported) { g_autoptr(virJSONValue) cmd =3D NULL; @@ -2284,10 +2282,7 @@ qemuAgentGetOSInfo(qemuAgent *agent, do { \ const char *result; \ if ((result =3D virJSONValueObjectGetString(data, agent_string_)))= { \ - if (virTypedParamsAddString(params, nparams, maxparams, \ - param_string_, result) < 0) { \ - return -1; \ - } \ + virTypedParamListAddString(list, result, param_string_); \ } \ } while (0) OSINFO_ADD_PARAM("id", "os.id"); diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 3f25f0e5a6..ac2c8506a2 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -163,9 +163,7 @@ int qemuAgentGetUsers(qemuAgent *mon, bool report_unsupported); int qemuAgentGetOSInfo(qemuAgent *mon, - virTypedParameterPtr *params, - int *nparams, - int *maxparams, + virTypedParamList *list, bool report_unsupported); int qemuAgentGetTimezone(qemuAgent *mon, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 53be46ce0a..201ac89de6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19404,7 +19404,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, goto exitagent; if (supportedTypes & VIR_DOMAIN_GUEST_INFO_OS && - qemuAgentGetOSInfo(agent, params, nparams, &maxparams, report_unsu= pported) =3D=3D -1) + qemuAgentGetOSInfo(agent, list, report_unsupported) =3D=3D -1) goto exitagent; if (supportedTypes & VIR_DOMAIN_GUEST_INFO_TIMEZONE && diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 5fd4d70a70..93f88083fe 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1191,30 +1191,31 @@ testQemuAgentOSInfo(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; if (!test) return -1; if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - goto cleanup; + return -1; if (qemuMonitorTestAddItem(test, "guest-get-osinfo", testQemuAgentOSInfoResponse) < 0) - goto cleanup; + return -1; /* get osinfo */ - if (qemuAgentGetOSInfo(qemuMonitorTestGetAgent(test), - ¶ms, &nparams, &maxparams, true) < 0) - goto cleanup; + if (qemuAgentGetOSInfo(qemuMonitorTestGetAgent(test), list, true) < 0) + return -1; + + if (virTypedParamListFetch(list, ¶ms, &nparams) < 0) + return -1; if (nparams !=3D 8) { virReportError(VIR_ERR_INTERNAL_ERROR, - "Expected 8 params, got %d", nparams); - goto cleanup; + "Expected 8 params, got %zu", nparams); + return -1; } #define VALIDATE_PARAM(param_name_, expected_) \ do { \ @@ -1222,12 +1223,12 @@ testQemuAgentOSInfo(const void *data) if (virTypedParamsGetString(params, nparams, param_name_, &value_)= < 0 || \ value_ =3D=3D NULL) { \ virReportError(VIR_ERR_INTERNAL_ERROR, "missing param '%s'", p= aram_name_); \ - goto cleanup; \ + return -1; \ } \ if (STRNEQ(value_, expected_)) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "Expected name '%s', got '%s'", expected_, valu= e_); \ - goto cleanup; \ + return -1; \ } \ } while (0) @@ -1239,24 +1240,25 @@ testQemuAgentOSInfo(const void *data) VALIDATE_PARAM("os.kernel-release", "3.10.0-862.14.4.el7.x86_64"); VALIDATE_PARAM("os.kernel-version", "#1 SMP Wed Sep 26 15:12:11 UTC 20= 18"); VALIDATE_PARAM("os.machine", "x86_64"); - virTypedParamsFree(params, nparams); - params =3D NULL; - nparams =3D 0; - maxparams =3D 0; + + g_clear_pointer(&list, virTypedParamListFree); + list =3D virTypedParamListNew(); if (qemuMonitorTestAddItem(test, "guest-get-osinfo", testQemuAgentOSInfoResponse2) < 0) - goto cleanup; + return -1; /* get users with domain */ - if (qemuAgentGetOSInfo(qemuMonitorTestGetAgent(test), - ¶ms, &nparams, &maxparams, true) < 0) - goto cleanup; + if (qemuAgentGetOSInfo(qemuMonitorTestGetAgent(test), list, true) < 0) + return -1; + + if (virTypedParamListFetch(list, ¶ms, &nparams) < 0) + return -1; if (nparams !=3D 10) { virReportError(VIR_ERR_INTERNAL_ERROR, - "Expected 10 params, got %d", nparams); - goto cleanup; + "Expected 10 params, got %zu", nparams); + return -1; } VALIDATE_PARAM("os.id", "mswindows"); @@ -1270,11 +1272,7 @@ testQemuAgentOSInfo(const void *data) VALIDATE_PARAM("os.kernel-version", "6.1"); VALIDATE_PARAM("os.machine", "x86_64"); - ret =3D 0; - - cleanup: - virTypedParamsFree(params, nparams); - return ret; + return 0; } static const char testQemuAgentTimezoneResponse1[] =3D --=20 2.48.1 From nobody Wed Mar 12 12:48:15 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 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Wed Mar 12 12:48:15 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 1740587676647373.7262310324884; Wed, 26 Feb 2025 08:34:36 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 78C6D16F4; Wed, 26 Feb 2025 11:34:35 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 067471789; Wed, 26 Feb 2025 11:31:43 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id D8BB718A5; Wed, 26 Feb 2025 11:31:39 -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 1F7871705 for ; Wed, 26 Feb 2025 11:31:28 -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-313-0IwNGB5qMKScQoT2mWz63A-1; Wed, 26 Feb 2025 11:31:26 -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 A66B61801A0D for ; Wed, 26 Feb 2025 16:31:25 +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 CD347180035E for ; Wed, 26 Feb 2025 16:31:24 +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=1740587487; 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=5UQY8GeSCZ0ZugssMZLzWp5zJOLxxT+IkMWhFOZQb5o=; b=C/TNI5wZsgcUdRwZtpq4edtQwrp2OX+l3BriCJ4JtgrRVXv9V9W56FTrZuRRvgydjtJy4S nw1SIuB4hhuhdF0Wbbp9AQ+NyVxnbMLWXqLrRsRnzedySQwQ7hwsMrp3B1GS9mWKh6lcOV H3Y1Rr3ZDkz6fKOVwRMEiUNprFQv6rg= X-MC-Unique: 0IwNGB5qMKScQoT2mWz63A-1 X-Mimecast-MFC-AGG-ID: 0IwNGB5qMKScQoT2mWz63A_1740587485 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 09/10] qemuDomainGetGuestInfo: Convert hostname code to virTypedParamList Date: Wed, 26 Feb 2025 17:31:09 +0100 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: W_KmwmvVb0XbZO_7fUTa5JMPa2UsPoWKc0sQGuVAeFU_1740587485 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PJSARBPHSQ2PNH5NYLB6HCHFDGCHDFOS X-Message-ID-Hash: PJSARBPHSQ2PNH5NYLB6HCHFDGCHDFOS 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: 1740587679417019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cd07d3eac5..5d91bd1a93 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19356,7 +19356,6 @@ qemuDomainGetGuestInfo(virDomainPtr dom, virDomainObj *vm =3D NULL; qemuAgent *agent; int ret =3D -1; - int maxparams =3D 0; g_autofree char *hostname =3D NULL; unsigned int supportedTypes; bool report_unsupported =3D types !=3D 0; @@ -19415,9 +19414,8 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuAgentGetHostname(agent, &hostname, report_unsupported) =3D=3D = -1) goto exitagent; - if (hostname && - virTypedParamsAddString(params, nparams, &maxparams, "hostname", h= ostname) < 0) - goto exitagent; + if (hostname) + virTypedParamListAddString(list, hostname, "hostname"); if (supportedTypes & VIR_DOMAIN_GUEST_INFO_FILESYSTEM) { rc =3D qemuAgentGetFSInfo(agent, &agentfsinfo, report_unsupported); --=20 2.48.1 From nobody Wed Mar 12 12:48:15 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 1740587717627152.4453758717259; Wed, 26 Feb 2025 08:35:17 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 821C51723; Wed, 26 Feb 2025 11:35:16 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8712218EA; Wed, 26 Feb 2025 11:31:48 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 04A9B16B2; 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 7B3631858 for ; Wed, 26 Feb 2025 11:31:29 -0500 (EST) Received: from mx-prod-mc-01.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-685-dzAMPZfvM5GU14HSez2N7w-1; Wed, 26 Feb 2025 11:31:27 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1481419783B6 for ; Wed, 26 Feb 2025 16:31:27 +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 3B6B1180035E for ; Wed, 26 Feb 2025 16:31:25 +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=1740587489; 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=/0ZguF+96TwB+VvZI4DB0/lSrP9zZ4q7E21iuptDMYg=; b=AtqmnDGk1sh8kexYZUAzq9D+x6YEOfG48yiG0gdTAG8PCE+5iQp/E+HvO4zOI5/3qjEjUe KqXpTa9vn+tcnzSAfOq4JX0Rl6E2KIslR1VLdCHYY6HBkO9RejUNEiL+Nm905QUMWdyKBp yGB1r9ZA18u4T0de9TIPwwUYY9sIqy0= X-MC-Unique: dzAMPZfvM5GU14HSez2N7w-1 X-Mimecast-MFC-AGG-ID: dzAMPZfvM5GU14HSez2N7w_1740587487 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 10/10] qemuDomainGetGuestInfo: Remove temporary infrastructure Date: Wed, 26 Feb 2025 17:31:10 +0100 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: tELD5CAJ32UV3nobUvIGqm681dMQ3TDqkZn3jkXyaSI_1740587487 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BCU3ZOKIQLDZ65D22SC3YXEWTHUVEZC4 X-Message-ID-Hash: BCU3ZOKIQLDZ65D22SC3YXEWTHUVEZC4 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: 1740587719571019100 Content-Type: text/plain; charset="utf-8" Now that the refactor was completed the helper infrastructure can be removed. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5d91bd1a93..c69074766b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19372,7 +19372,6 @@ qemuDomainGetGuestInfo(virDomainPtr dom, bool format_load =3D false; size_t i; g_autoptr(virTypedParamList) list =3D virTypedParamListNew(); - g_autoptr(virTypedParamList) tmplist =3D NULL; virCheckFlags(0, -1); @@ -19481,11 +19480,6 @@ qemuDomainGetGuestInfo(virDomainPtr dom, virTypedParamListAddDouble(list, load15m, "load.15m"); } - /* temporarily allow the old and new construction style to coexist */ - tmplist =3D virTypedParamListFromParams(params, *nparams); - virTypedParamListConcat(tmplist, &list); - list =3D g_steal_pointer(&tmplist); - if (virTypedParamListSteal(list, params, nparams) < 0) goto cleanup; --=20 2.48.1