From nobody Mon Feb 9 01:21:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1606911329; cv=none; d=zohomail.com; s=zohoarc; b=gBLfQki2VFmL/EUK7T97zxxkFsmgyKYYKt/V7Q0WX0gej59/0O3RyTrAh7mS8UVdNyAIzgGNOtB2Dwc2Hka91R41r0T5vaZV+qRGeDYPVYNLigYWMcH+D9HRN+j7Kktv481d5V/+K4F3fu1cOCAYMdOyeRUXt7wH+CtjOFbQh10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606911329; 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=ytXk2ekpAj8gRFp9hGOTEmTzTospgzkJstvJO6D2ot8=; b=kI0HfJ7Tm+ZBaZgCY/rjaR1ybylNZnRznkWBMvexAsAfjkx26d/HR6sDD3De2tFq3CgESwUoVvxGZ+2UhR4vrmyAyaUtsZWdeDN9CnXjUgujhU06vnruNkGvUJJq3QFkaZ5cKXhKHod78v0KcB7TabxhQTKtHekqEPzJ0O0FbnE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1606911329476496.19922457348275; Wed, 2 Dec 2020 04:15:29 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-hwO6UAG5PBOuLnQXtAO7rA-1; Wed, 02 Dec 2020 07:15:25 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B5A1810151EF; Wed, 2 Dec 2020 12:15:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 83AA4608DB; Wed, 2 Dec 2020 12:15:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 01AE85002F; Wed, 2 Dec 2020 12:15:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0B2CFHf5031841 for ; Wed, 2 Dec 2020 07:15:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2EFBC18A9D; Wed, 2 Dec 2020 12:15:17 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84E3B63BA7 for ; Wed, 2 Dec 2020 12:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606911328; 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=ytXk2ekpAj8gRFp9hGOTEmTzTospgzkJstvJO6D2ot8=; b=iOCKVzTg1pMeIPFZ9DkM6oXE1Q3mv28Gxj0ImhDm36nGelGblyeVL6qn8S50qSEO85hgXG GfNKj49hXhCPfTteyirCx7hJndVxnXzwQ2tcjD+tvb130HREHiptbZ9IzLPXzry8YJtJeT PpPFhKUSitn1XYQegQHLzEJm24+LdFM= X-MC-Unique: hwO6UAG5PBOuLnQXtAO7rA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/11] virDomainCheckpointAlignDisks: Use 'chkdisk' instead of 'disk' Date: Wed, 2 Dec 2020 13:14:55 +0100 Message-Id: <28fdce2e2e946d697ccadc688a0f70db7382f85c.1606911231.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Clarify that the variable refers to the definition of the disk from the checkpoint definition. Signed-off-by: Peter Krempa --- src/conf/checkpoint_conf.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 1881c93e09..22757d148f 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -326,35 +326,35 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefP= tr chkdef) /* Double check requested disks. */ for (i =3D 0; i < chkdef->ndisks; i++) { - virDomainCheckpointDiskDefPtr disk =3D &chkdef->disks[i]; - int idx =3D virDomainDiskIndexByName(domdef, disk->name, false); + virDomainCheckpointDiskDefPtr chkdisk =3D &chkdef->disks[i]; + int idx =3D virDomainDiskIndexByName(domdef, chkdisk->name, false); if (idx < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("no disk named '%s'"), disk->name); + _("no disk named '%s'"), chkdisk->name); return -1; } if (virBitmapIsBitSet(map, idx)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk '%s' specified twice"), - disk->name); + chkdisk->name); return -1; } if ((virStorageSourceIsEmpty(domdef->disks[idx]->src) || domdef->disks[idx]->src->readonly) && - disk->type !=3D VIR_DOMAIN_CHECKPOINT_TYPE_NONE) { + chkdisk->type !=3D VIR_DOMAIN_CHECKPOINT_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk '%s' is empty or readonly"), - disk->name); + chkdisk->name); return -1; } ignore_value(virBitmapSetBit(map, idx)); - disk->idx =3D idx; + chkdisk->idx =3D idx; - if (STRNEQ(disk->name, domdef->disks[idx]->dst)) { - VIR_FREE(disk->name); - disk->name =3D g_strdup(domdef->disks[idx]->dst); + if (STRNEQ(chkdisk->name, domdef->disks[idx]->dst)) { + VIR_FREE(chkdisk->name); + chkdisk->name =3D g_strdup(domdef->disks[idx]->dst); } } @@ -365,20 +365,20 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefP= tr chkdef) return -1; for (i =3D 0; i < domdef->ndisks; i++) { - virDomainCheckpointDiskDefPtr disk; + virDomainCheckpointDiskDefPtr chkdisk; if (virBitmapIsBitSet(map, i)) continue; - disk =3D &chkdef->disks[ndisks++]; - disk->name =3D g_strdup(domdef->disks[i]->dst); - disk->idx =3D i; + chkdisk =3D &chkdef->disks[ndisks++]; + chkdisk->name =3D g_strdup(domdef->disks[i]->dst); + chkdisk->idx =3D i; /* Don't checkpoint empty or readonly drives */ if (virStorageSourceIsEmpty(domdef->disks[i]->src) || domdef->disks[i]->src->readonly) - disk->type =3D VIR_DOMAIN_CHECKPOINT_TYPE_NONE; + chkdisk->type =3D VIR_DOMAIN_CHECKPOINT_TYPE_NONE; else - disk->type =3D checkpoint_default; + chkdisk->type =3D checkpoint_default; } qsort(&chkdef->disks[0], chkdef->ndisks, sizeof(chkdef->disks[0]), --=20 2.28.0