Replace virDomainDiskByName by virDomainDiskByTarget in appropriate cases

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 <pkrempa@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index ceedeb3795b49f0c43d40a556e3ef6ae6f325757..5cc6b87b8cecbc71fe4cd1173ceefbfdc861934e 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -4071,7 +4071,7 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev)
     switch (dev->type) {
         case VIR_DOMAIN_DEVICE_DISK:
             disk = dev->data.disk;
-            if (!(orig = virDomainDiskByName(vmdef, disk->dst, false))) {
+            if (!(orig = 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 6a7dd5a1d4645af6eb903f42dd38a7f97148aa49..8c418ecf6c750a12ff87aede3dca3f0c80ad2e50 100644 (file)
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -599,7 +599,7 @@ qemuBlockJobRewriteConfigDiskSource(virDomainObjPtr vm,
     if (!vm->newDef)
         return;
 
-    if (!(persistDisk = virDomainDiskByName(vm->newDef, disk->dst, false)))
+    if (!(persistDisk = virDomainDiskByTarget(vm->newDef, disk->dst)))
         return;
 
     if (!virStorageSourceIsSameLocation(disk->src, persistDisk->src))
@@ -837,7 +837,7 @@ qemuBlockJobGetConfigDisk(virDomainObjPtr vm,
 
     disksrc = disk->src;
 
-    if (!(ret = virDomainDiskByName(vm->newDef, disk->dst, false)))
+    if (!(ret = virDomainDiskByTarget(vm->newDef, disk->dst)))
         return NULL;
 
     cfgsrc = ret->src;
@@ -882,7 +882,7 @@ qemuBlockJobClearConfigChain(virDomainObjPtr vm,
     if (!vm->newDef || !disk)
         return;
 
-    if (!(cfgdisk = virDomainDiskByName(vm->newDef, disk->dst, false)))
+    if (!(cfgdisk = 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 f50965ff9e752d99a4dddffb090dd3d146be8605..3e8da13794562fdb0ace078b46228b26287bc024 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3198,7 +3198,7 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObjPtr vm,
         invalidData = true;
 
     if ((diskdst = virXPathString("string(./disk/@dst)", ctxt)) &&
-        !(disk = virDomainDiskByName(vm->def, diskdst, false)))
+        !(disk = virDomainDiskByTarget(vm->def, diskdst)))
         invalidData = true;
 
     if ((mirror = virXPathString("string(./disk/@mirror)", ctxt)) &&
@@ -3371,7 +3371,7 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm,
             virDomainDiskDefPtr disk;
 
             if ((dst = virXMLPropString(nodes[i], "dev")) &&
-                (disk = virDomainDiskByName(vm->def, dst, false))) {
+                (disk = virDomainDiskByTarget(vm->def, dst))) {
                 QEMU_DOMAIN_DISK_PRIVATE(disk)->migrating = true;
 
                 if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctxt,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b18477c6d16992e30cb48234c6e74f99cf962e64..6396d7080e16992ef6f0415f57471079cce6d072 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15270,7 +15270,7 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver,
 
     /* modify disk in persistent definition only when the source is the same */
     if (vm->newDef &&
-        (persistdisk = virDomainDiskByName(vm->newDef, dd->disk->dst, false)) &&
+        (persistdisk = virDomainDiskByTarget(vm->newDef, dd->disk->dst)) &&
         virStorageSourceIsSameLocation(dd->disk->src, persistdisk->src)) {
 
         dd->persistdisk = persistdisk;

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 471cb1c5a69309234e4a5e8b7e94b90ded5598ba..3f905363390cb933254db670ff3a0b11492f1c1c 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -318,8 +318,7 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm,
         VIR_DEBUG("Looking up disk target '%s' (capacity=%llu)",
                   nbd->disks[i].target, nbd->disks[i].capacity);
 
-        if (!(disk = virDomainDiskByName(vm->def, nbd->disks[i].target,
-                                         false))) {
+        if (!(disk = virDomainDiskByTarget(vm->def, nbd->disks[i].target))) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("unable to find disk by target: %s"),
                            nbd->disks[i].target);