mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-07 04:07:17 +00:00
qemuBlockStorageSourceDetachPrepare: Prepare for possibly missing 'format' layer
Setup the data for detaching of the 'format' layer only when it's present. Restructure the logic to follow the same order as qemuBlockStorageSourceAttachPrepareBlockdev in terms of format/slice/storage -blockdev objects, and drop the now-misleading comment for 'slice' of raw disks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
10cc057074
commit
813ccd553b
@ -1771,14 +1771,15 @@ qemuBlockStorageSourceDetachPrepare(virStorageSource *src)
|
||||
|
||||
data = g_new0(qemuBlockStorageSourceAttachData, 1);
|
||||
|
||||
data->formatNodeName = qemuBlockStorageSourceGetFormatNodename(src);
|
||||
data->formatAttached = true;
|
||||
data->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
|
||||
data->storageAttached = true;
|
||||
if ((data->formatNodeName = qemuBlockStorageSourceGetFormatNodename(src)))
|
||||
data->formatAttached = true;
|
||||
|
||||
if ((data->storageSliceNodeName = qemuBlockStorageSourceGetSliceNodename(src)))
|
||||
data->storageSliceAttached = true;
|
||||
|
||||
data->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
|
||||
data->storageAttached = true;
|
||||
|
||||
if (src->pr &&
|
||||
!virStoragePRDefIsManaged(src->pr))
|
||||
data->prmgrAlias = g_strdup(src->pr->mgralias);
|
||||
|
Loading…
x
Reference in New Issue
Block a user