From nobody Wed Mar 12 17:13:38 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 --- 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