From nobody Mon Feb 9 17:28:20 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571415115; cv=none; d=zoho.com; s=zohoarc; b=EU4wOK3eyLa4d4FQ8B59pn6rJjlcs3Nygx9c2WnC9LE92QZz8nm0PWXof52nlu4GG8JBRvksm/vdYFtP59ViIB4SDdLV2tkA8NpN7mKZU3ZSZtKqHme8C1iiiM4SzwwJqQQSPaO5dqOGe20cykah3y8u3WB8zJEJUbJMbpvq1j8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571415115; 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=xVbIRdpb6WbXuRw3c7xoGqqzRC7tcGtsSzc2Cfb+v0Q=; b=dhDNcQEqku5fuEcHdyvgKHvD5OpnF2+L2Mo4w6Auh8kxEb9+Rgz+d3z98MylOEjKccYbtgsaJC8OhZsrIxDD9sXTUVFe0seEVlMlI6sVBMRZM0e59a76+XJGHCR4SoL+53ri+3+iM4lZ2GBl+WkCBFE7TfCP+0nnOW6UN3+gmJQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571415115354848.2526304870308; Fri, 18 Oct 2019 09:11:55 -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 A8E46307B191; Fri, 18 Oct 2019 16:11:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 814F061F21; Fri, 18 Oct 2019 16:11:53 +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 425F3180BAA9; Fri, 18 Oct 2019 16:11:53 +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 x9IGBfwv004636 for ; Fri, 18 Oct 2019 12:11:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 11FE560166; Fri, 18 Oct 2019 16:11:41 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68A7D600C8; Fri, 18 Oct 2019 16:11:40 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 18 Oct 2019 18:10:57 +0200 Message-Id: <882451189e325ff9b934dce36209024a1b1e0783.1571414890.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 Subject: [libvirt] [PATCH RFC 12/40] Replace virDomainDiskByName by virDomainDiskByTarget in appropriate cases 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: , 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.45]); Fri, 18 Oct 2019 16:11:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" In many cases we used virDomainDiskByName to solely look up disk by target. We have a new helper now so we can replace it. Signed-off-by: Peter Krempa Reviewed-by: Daniel Henrique Barboza --- src/libxl/libxl_driver.c | 2 +- src/qemu/qemu_blockjob.c | 6 +++--- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 3 +-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 64b21f2073..a08bafe5ce 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4072,7 +4072,7 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, = virDomainDeviceDefPtr dev) switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: disk =3D dev->data.disk; - if (!(orig =3D virDomainDiskByName(vmdef, disk->dst, false))) { + if (!(orig =3D virDomainDiskByTarget(vmdef, disk->dst))) { virReportError(VIR_ERR_INVALID_ARG, _("target %s doesn't exist."), disk->dst); goto cleanup; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 3506fa165b..f9b3bdaff4 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -601,7 +601,7 @@ qemuBlockJobRewriteConfigDiskSource(virDomainObjPtr vm, if (!vm->newDef) return; - if (!(persistDisk =3D virDomainDiskByName(vm->newDef, disk->dst, false= ))) + if (!(persistDisk =3D virDomainDiskByTarget(vm->newDef, disk->dst))) return; if (!virStorageSourceIsSameLocation(disk->src, persistDisk->src)) @@ -839,7 +839,7 @@ qemuBlockJobGetConfigDisk(virDomainObjPtr vm, disksrc =3D disk->src; - if (!(ret =3D virDomainDiskByName(vm->newDef, disk->dst, false))) + if (!(ret =3D virDomainDiskByTarget(vm->newDef, disk->dst))) return NULL; cfgsrc =3D ret->src; @@ -884,7 +884,7 @@ qemuBlockJobClearConfigChain(virDomainObjPtr vm, if (!vm->newDef || !disk) return; - if (!(cfgdisk =3D virDomainDiskByName(vm->newDef, disk->dst, false))) + if (!(cfgdisk =3D virDomainDiskByTarget(vm->newDef, disk->dst))) return; if (!virStorageSourceIsSameLocation(disk->src, cfgdisk->src)) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3deb69cb63..e330d2390c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3201,7 +3201,7 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObj= Ptr vm, invalidData =3D true; if ((diskdst =3D virXPathString("string(./disk/@dst)", ctxt)) && - !(disk =3D virDomainDiskByName(vm->def, diskdst, false))) + !(disk =3D virDomainDiskByTarget(vm->def, diskdst))) invalidData =3D true; if ((mirror =3D virXPathString("string(./disk/@mirror)", ctxt)) && @@ -3374,7 +3374,7 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm, virDomainDiskDefPtr disk; if ((dst =3D virXMLPropString(nodes[i], "dev")) && - (disk =3D virDomainDiskByName(vm->def, dst, false))) { + (disk =3D virDomainDiskByTarget(vm->def, dst))) { QEMU_DOMAIN_DISK_PRIVATE(disk)->migrating =3D true; if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctx= t, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ac5f108537..e50f2277d2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15276,7 +15276,7 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr d= river, /* modify disk in persistent definition only when the source is the sa= me */ if (vm->newDef && - (persistdisk =3D virDomainDiskByName(vm->newDef, dd->disk->dst, fa= lse)) && + (persistdisk =3D virDomainDiskByTarget(vm->newDef, dd->disk->dst))= && virStorageSourceIsSameLocation(dd->disk->src, persistdisk->src)) { dd->persistdisk =3D persistdisk; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index c65491f9d6..40aa598832 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -319,8 +319,7 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, VIR_DEBUG("Looking up disk target '%s' (capacity=3D%llu)", nbd->disks[i].target, nbd->disks[i].capacity); - if (!(disk =3D virDomainDiskByName(vm->def, nbd->disks[i].target, - false))) { + if (!(disk =3D virDomainDiskByTarget(vm->def, nbd->disks[i].target= ))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find disk by target: %s"), nbd->disks[i].target); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list