From nobody Mon Feb 9 10:48:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675182761; cv=none; d=zohomail.com; s=zohoarc; b=iz5qq92gAuVBJn3CkgCQmGFVOw5lMBvlmcuBru5yiaU3Q6RfMQgAWXXd0SY6i76MeVshub4dvC1OmbIaV6iha4xp4bn/w8b+F1Ygawi5SlQY0apCgM96iSMXb9JInES6y/Lp5CSH0rVlCaiw7SycM2QsRz8/KgDuo5jKB+1kMeo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675182761; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sj16HG8r/iFX4SskPWFNOYkfmCjlvdBCKmBprIUvQK8=; b=B0K1wuA7D5zQoG0Bp5UOS/X+TfZ4SWgDhPWbyJ9UhFzElV1bhOzE5DUiJe68tm2SMryArWR+i8kKruEFzFQT/5fTBzx0pDbIVxOZpSEnmR0fyGN2rY0FlDnoGSKyifegAPEU8mQFb+CfByhrzj7xQV/FIXJx1m9txNW3DRvy8CQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1675182761152513.636512811995; Tue, 31 Jan 2023 08:32:41 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-593-ciQFij86M9WVeWlLoe2pXA-1; Tue, 31 Jan 2023 11:32:33 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 61CD910294B0; Tue, 31 Jan 2023 16:32:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4BB842166B33; Tue, 31 Jan 2023 16:32:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2C2511946589; Tue, 31 Jan 2023 16:32:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 37A101946587 for ; Tue, 31 Jan 2023 16:32:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2A464175A2; Tue, 31 Jan 2023 16:32:18 +0000 (UTC) Received: from speedmetal.lan (ovpn-208-29.brq.redhat.com [10.40.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31A96422FE for ; Tue, 31 Jan 2023 16:32:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675182758; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sj16HG8r/iFX4SskPWFNOYkfmCjlvdBCKmBprIUvQK8=; b=BqeZzJTASp/i0jf2XOBxzJX23eymXARsJmJC8QyTOOK3UWIyb8FMKH8CWzBPrGVLGWnjot 80vqLlicXsfn0Fg0LatKLdzvZCRhJOZBMRvLWtFyjLL+iKd448Ak+gpLNCYnzNr7w7wgWS 88UKRFEIWcLfB96hOlG+iukhPvmV4kc= X-MC-Unique: ciQFij86M9WVeWlLoe2pXA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/7] qemuStorageSourcePrivateDataFormat: Rename 'tmp' to 'objectsChildBuf' Date: Tue, 31 Jan 2023 17:32:08 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675182762225100002 Content-Type: text/plain; charset="utf-8" Be consistent with other children buffer variable naming scheme. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c331c2e7be..112d4fb90e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2005,9 +2005,9 @@ static int qemuStorageSourcePrivateDataFormat(virStorageSource *src, virBuffer *buf) { - g_auto(virBuffer) tmp =3D VIR_BUFFER_INIT_CHILD(buf); qemuDomainStorageSourcePrivate *srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE= _PRIVATE(src); g_auto(virBuffer) nodenamesChildBuf =3D VIR_BUFFER_INIT_CHILD(buf); + g_auto(virBuffer) objectsChildBuf =3D VIR_BUFFER_INIT_CHILD(buf); virBufferEscapeString(&nodenamesChildBuf, "\n", src->nodestorage); virBufferEscapeString(&nodenamesChildBuf, "\n", src->nodeformat); @@ -2025,16 +2025,16 @@ qemuStorageSourcePrivateDataFormat(virStorageSource= *src, return -1; if (srcPriv) { - qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->secinfo, = "auth"); - qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->encinfo, = "encryption"); - qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->httpcooki= e, "httpcookie"); - qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->tlsKeySec= ret, "tlskey"); + qemuStorageSourcePrivateDataFormatSecinfo(&objectsChildBuf, srcPri= v->secinfo, "auth"); + qemuStorageSourcePrivateDataFormatSecinfo(&objectsChildBuf, srcPri= v->encinfo, "encryption"); + qemuStorageSourcePrivateDataFormatSecinfo(&objectsChildBuf, srcPri= v->httpcookie, "httpcookie"); + qemuStorageSourcePrivateDataFormatSecinfo(&objectsChildBuf, srcPri= v->tlsKeySecret, "tlskey"); } if (src->tlsAlias) - virBufferAsprintf(&tmp, "\n", src->tlsAlias= ); + virBufferAsprintf(&objectsChildBuf, "\n", s= rc->tlsAlias); - virXMLFormatElement(buf, "objects", NULL, &tmp); + virXMLFormatElement(buf, "objects", NULL, &objectsChildBuf); if (src->thresholdEventWithIndex) virBufferAddLit(buf, "\n"); --=20 2.39.1