qemu: Refactor storage backend attach/detach setup code to use 'storage' nodename...

Refactor the code settin up data structures used to attach/detach disks
and SCSI hostdevs.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 1fc36569a9818d814ae5c6f9f22ad34bac063e2b..7355cb0b5e2151a84b49eee6d2501fc40da02d3d 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -1484,7 +1484,7 @@ qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSource *src,
                                                                      backendpropsflags)))
         return NULL;
 
-    data->storageNodeName = src->nodestorage;
+    data->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
     data->formatNodeName = src->nodeformat;
 
     if (qemuBlockStorageSourceNeedsStorageSliceLayer(src)) {
@@ -1705,7 +1705,7 @@ qemuBlockStorageSourceDetachPrepare(virStorageSource *src)
 
     data->formatNodeName = src->nodeformat;
     data->formatAttached = true;
-    data->storageNodeName = src->nodestorage;
+    data->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
     data->storageAttached = true;
 
     /* 'raw' format doesn't need the extra 'raw' layer when slicing, thus
@@ -1899,7 +1899,8 @@ qemuBlockStorageSourceDetachOneBlockdev(virDomainObj *vm,
     ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->nodeformat);
 
     if (ret == 0)
-        ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->nodestorage);
+        ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm),
+                                     qemuBlockStorageSourceGetStorageNodename(src));
 
     qemuDomainObjExitMonitor(vm);
 

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 8a7b80719f630d71308418c93aea491ce518585f..40de712c613e88f27f5cb5cb087f46d0317149d0 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5049,7 +5049,7 @@ qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevDef *hostdev,
     }
 
     srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
-    ret->storageNodeName = src->nodestorage;
+    ret->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
     ret->storageAttached = true;
 
     if (srcpriv && srcpriv->secinfo)
@@ -5083,8 +5083,8 @@ qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDef *hostdev,
         return NULL;
     }
 
-    ret->storageNodeName = src->nodestorage;
-    *backendAlias = src->nodestorage;
+    ret->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
+    *backendAlias = qemuBlockStorageSourceGetStorageNodename(src);
 
     if (!(ret->storageProps = qemuBlockStorageSourceGetBackendProps(src,
                                                                     QEMU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_SKIP_UNMAP)))