External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-06-29 22:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBlockStorageSourceAttachPrepareBlockdev: Prepare for optionally missing format layer

Browse Source 
Restructure the code logic so that the function is prepared for the
possibility that the 'format' blockdev layer may be missing if not
needed.

To achieve this we need to introduce logic that selects which node
(format/slice/storage) becomes the effective node and thus formats the
correct set of arguments.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-11-03 14:26:35 +01:00
parent b27e8b5a0b
commit 10cc057074
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/qemu/qemu_block.c
View File

@ -1533,22 +1533,34 @@ qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSource *src,
virStorageSource *backingStore)
{
g_autoptr(qemuBlockStorageSourceAttachData) data = NULL;
bool effective = true;
unsigned int backendpropsflags = 0;
data = g_new0(qemuBlockStorageSourceAttachData, 1);
if (!(data->formatProps = qemuBlockStorageSourceGetFormatProps(src, backingStore)) ||
!(data->storageProps = qemuBlockStorageSourceGetBackendProps(src,
backendpropsflags)))
if (qemuBlockStorageSourceGetFormatNodename(src)) {
if (!(data->formatProps = qemuBlockStorageSourceGetFormatProps(src, backingStore)))
return NULL;
data->formatNodeName = qemuBlockStorageSourceGetFormatNodename(src);
effective = false;
}
if ((data->storageSliceNodeName = qemuBlockStorageSourceGetSliceNodename(src))) {
if (!(data->storageSliceProps = qemuBlockStorageSourceGetBlockdevStorageSliceProps(src, effective)))
return NULL;
effective = false;
}
if (effective)
backendpropsflags = QEMU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_EFFECTIVE_NODE;
if (!(data->storageProps = qemuBlockStorageSourceGetBackendProps(src, backendpropsflags)))
return NULL;
data->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
data->formatNodeName = qemuBlockStorageSourceGetFormatNodename(src);
if ((data->storageSliceNodeName = qemuBlockStorageSourceGetSliceNodename(src))) {
if (!(data->storageSliceProps = qemuBlockStorageSourceGetBlockdevStorageSliceProps(src, false)))
return NULL;
}
return g_steal_pointer(&data);
}