From nobody Sun Feb 8 18:32:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1697468715; cv=none; d=zohomail.com; s=zohoarc; b=K/A8XUtN4ZS3vlvYMthKbXKLOEc67cGZuYfeTufyukuCEE3bD8oIrcDcmWXKshPaiWikqZCAaLjpWHIYrjNQDsZxfZjCMqoVTfgAkF/YsuPJjbYm5dFe1oWcmjEFs8JnHgM6UWplftUbqzpS+Amp+AHkaP7z/beQ2w/c34eMydg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697468715; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=icesvONkxdz6Frv1z71XtNQ+/jD63UC2wx1QxyJrQGw=; b=gIOIr5sfms8AeoIwwvdVNrNco1y7cMkfiePrdq/w8l+tjczj5A7IS0OH6Wtob7yrShECgyzpKecgQKoW0dY5tGe2A1Kwc1lpibDmgVVvFlpx9Qu+SB/mfgPReSCdjbV/ujRuBOB13Hzm0NS5/viQ4o2Bdk3B4/6V2jiY1SY8J7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1697468715461183.62848501631163; Mon, 16 Oct 2023 08:05:15 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-690-rbArMINGOu25OQOL1UTMkQ-1; Mon, 16 Oct 2023 11:03:01 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C7F93C170AC; Mon, 16 Oct 2023 15:02:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19AE963F53; Mon, 16 Oct 2023 15:02:36 +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 09905194658F; Mon, 16 Oct 2023 15:02:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 86842194658F for ; Mon, 16 Oct 2023 15:02:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 675A540C6F7F; Mon, 16 Oct 2023 15:02:34 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEF6640C6F79 for ; Mon, 16 Oct 2023 15:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697468714; 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=icesvONkxdz6Frv1z71XtNQ+/jD63UC2wx1QxyJrQGw=; b=AS+keeKGMmTuY8PZwIW3SB4ovyMw/jOTJ7eo4xXit2jLtRpPvw9O2J9ip3oy82p18bULpS WLg9bC/hUAoekXpieD4k60TJ/56AExaU4ZITZ0dhTqvcPwbbr0fiK3w7e/DA8QaQM/fAct EtZpmxT6LNEYwnAWFMrrOcl8Rnacxvk= X-MC-Unique: rbArMINGOu25OQOL1UTMkQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 31/31] conf: Rename 'nodeformat' field of virStorageSource to 'nodenameformat' Date: Mon, 16 Oct 2023 17:01:58 +0200 Message-ID: <19288e90f77e1808a89da65c79bfa6787e8b60cb.1697468414.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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.5 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: 1697468717288100001 Content-Type: text/plain; charset="utf-8" While the name itself doesn't matter, this rename is done to prove that all places using 'nodeformat' were converted to the appropriate accessors. Signed-off-by: Peter Krempa --- src/conf/storage_source_conf.c | 4 ++-- src/conf/storage_source_conf.h | 2 +- src/qemu/qemu_block.c | 8 ++++---- src/qemu/qemu_blockjob.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index ea171f9945..f974a521b1 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -828,7 +828,7 @@ virStorageSourceCopy(const virStorageSource *src, def->backingStoreRawFormat =3D src->backingStoreRawFormat; def->snapshot =3D g_strdup(src->snapshot); def->configFile =3D g_strdup(src->configFile); - def->nodeformat =3D g_strdup(src->nodeformat); + def->nodenameformat =3D g_strdup(src->nodenameformat); def->nodenamestorage =3D g_strdup(src->nodenamestorage); def->compat =3D g_strdup(src->compat); def->tlsAlias =3D g_strdup(src->tlsAlias); @@ -1169,7 +1169,7 @@ virStorageSourceClear(virStorageSource *def) virObjectUnref(def->privateData); VIR_FREE(def->nodenamestorage); - VIR_FREE(def->nodeformat); + VIR_FREE(def->nodenameformat); virStorageSourceBackingStoreClear(def); diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index e9525c8f65..5a9b03b610 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -370,7 +370,7 @@ struct _virStorageSource { virStorageFileFormat backingStoreRawFormat; /* metadata that allows identifying given storage source */ - char *nodeformat; /* name of the format handler object */ + char *nodenameformat; /* name of the format handler object */ char *nodenamestorage; /* name of the storage object */ /* An optional setting to enable usage of TLS for the storage source */ diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index fa31028db3..0d252552de 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -81,8 +81,8 @@ void qemuBlockStorageSourceSetFormatNodename(virStorageSource *src, char *nodename) { - g_free(src->nodeformat); - src->nodeformat =3D nodename; + g_free(src->nodenameformat); + src->nodenameformat =3D nodename; } @@ -96,7 +96,7 @@ qemuBlockStorageSourceSetFormatNodename(virStorageSource = *src, const char * qemuBlockStorageSourceGetEffectiveNodename(virStorageSource *src) { - return src->nodeformat; + return src->nodenameformat; } @@ -141,7 +141,7 @@ qemuBlockStorageSourceGetStorageNodename(virStorageSour= ce *src) const char * qemuBlockStorageSourceGetFormatNodename(virStorageSource *src) { - return src->nodeformat; + return src->nodenameformat; } diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 0913a224e3..4b5b63d287 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -617,7 +617,7 @@ qemuBlockJobCleanStorageSourceRuntime(virStorageSource = *src) VIR_FREE(src->relPath); VIR_FREE(src->backingStoreRaw); VIR_FREE(src->nodenamestorage); - VIR_FREE(src->nodeformat); + VIR_FREE(src->nodenameformat); VIR_FREE(src->tlsAlias); VIR_FREE(src->tlsCertdir); } --=20 2.41.0