External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-02 04:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Peter Krempa 2023-09-25 17:00:36 +02:00
parent 3bb5d48055
commit b00ce640ec
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_block.c
View File

@ -1484,7 +1484,7 @@ qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSource *src,
backendpropsflags))) backendpropsflags)))
return NULL; return NULL;
data->storageNodeName = src->nodestorage; data->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
data->formatNodeName = src->nodeformat; data->formatNodeName = src->nodeformat;
if (qemuBlockStorageSourceNeedsStorageSliceLayer(src)) { if (qemuBlockStorageSourceNeedsStorageSliceLayer(src)) {
@ -1705,7 +1705,7 @@ qemuBlockStorageSourceDetachPrepare(virStorageSource *src)
data->formatNodeName = src->nodeformat; data->formatNodeName = src->nodeformat;
data->formatAttached = true; data->formatAttached = true;
data->storageNodeName = src->nodestorage; data->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
data->storageAttached = true; data->storageAttached = true;
/* 'raw' format doesn't need the extra 'raw' layer when slicing, thus /* '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); ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->nodeformat);
if (ret == 0) if (ret == 0)
ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->nodestorage); ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm),
qemuBlockStorageSourceGetStorageNodename(src));
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitor(vm);

6
src/qemu/qemu_command.c
View File

@ -5049,7 +5049,7 @@ qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevDef *hostdev,
} }
srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
ret->storageNodeName = src->nodestorage; ret->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
ret->storageAttached = true; ret->storageAttached = true;
if (srcpriv && srcpriv->secinfo) if (srcpriv && srcpriv->secinfo)
@ -5083,8 +5083,8 @@ qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDef *hostdev,
return NULL; return NULL;
} }
ret->storageNodeName = src->nodestorage; ret->storageNodeName = qemuBlockStorageSourceGetStorageNodename(src);
*backendAlias = src->nodestorage; *backendAlias = qemuBlockStorageSourceGetStorageNodename(src);
if (!(ret->storageProps = qemuBlockStorageSourceGetBackendProps(src, if (!(ret->storageProps = qemuBlockStorageSourceGetBackendProps(src,
QEMU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_SKIP_UNMAP))) QEMU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_SKIP_UNMAP)))