From nobody Thu May 15 14:04:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1507835303062486.05891082468247; Thu, 12 Oct 2017 12:08:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D35153D97B; Thu, 12 Oct 2017 19:08:21 +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 AC0575EDF2; Thu, 12 Oct 2017 19:08:21 +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 746C33FC71; Thu, 12 Oct 2017 19:08:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9CJ8KaV001678 for ; Thu, 12 Oct 2017 15:08:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id F12855EDEE; Thu, 12 Oct 2017 19:08:20 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09C4C5EDFC; Thu, 12 Oct 2017 19:08:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D35153D97B Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 12 Oct 2017 21:07:35 +0200 Message-Id: <1f463b2241a8d0d0042ab6c207dc18287390e3fe.1507835192.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 4/9] util: storage: use stored index to lookup disks 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 12 Oct 2017 19:08:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We can now use the backing store ID directly rather than counting the number of images seen while looking up images. --- src/util/virstoragefile.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2b9f4c892..9568a5068 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1588,25 +1588,14 @@ virStorageFileChainLookup(virStorageSourcePtr chain, const char *start =3D chain->path; char *parentDir =3D NULL; bool nameIsFile =3D virStorageIsFile(name); - size_t i =3D 0; if (!parent) parent =3D &prev; *parent =3D NULL; if (startFrom) { - while (chain && chain !=3D startFrom->backingStore) { + while (chain && chain !=3D startFrom->backingStore) chain =3D chain->backingStore; - i++; - } - - if (idx && idx < i) { - virReportError(VIR_ERR_INVALID_ARG, - _("requested backing store index %u is above '%= s' " - "in chain for '%s'"), - idx, NULLSTR(startFrom->path), NULLSTR(start)); - return NULL; - } *parent =3D startFrom; } @@ -1616,8 +1605,8 @@ virStorageFileChainLookup(virStorageSourcePtr chain, if (!chain->backingStore) break; } else if (idx) { - VIR_DEBUG("%zu: %s", i, chain->path); - if (idx =3D=3D i) + VIR_DEBUG("%u: %s", chain->id, chain->path); + if (idx =3D=3D chain->id) break; } else { if (STREQ_NULLABLE(name, chain->relPath) || @@ -1649,7 +1638,6 @@ virStorageFileChainLookup(virStorageSourcePtr chain, } *parent =3D chain; chain =3D chain->backingStore; - i++; } if (!chain) --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list