From 813ccd553be0a4fdc66461ca5a9607d03af1b041 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 3 Nov 2023 14:29:00 +0100 Subject: [PATCH] qemuBlockStorageSourceDetachPrepare: Prepare for possibly missing 'format' layer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko --- src/qemu/qemu_block.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 9d8b3012c7..1eb55315ae 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -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);