External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: block: Extract logic from qemuBlockReopenReadWrite/ReadOnly

Browse Source 
We want to preserve the wrappers for clarity but the inner logic can be
extracted to a common function qemuBlockReopenAccess. In further patches
the code from qemuBlockReopenFormat will be merged into the new wrapper
as well as logic for handling scenarios with missing 'format' layers
will be added.

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-22 14:27:19 +01:00
parent 834d283bcf
commit 214794c9c7
1 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/qemu/qemu_block.c
View File

@ -3230,32 +3230,53 @@ qemuBlockReopenFormat(virDomainObj *vm,
}
/**
* qemuBlockReopenAccess:
* @vm: domain object
* @src: storage source to reopen
* @readonly: requested readonly mode
* @asyncJob: qemu async job type
*
* Reopen @src image to ensure that it is in @readonly. Does nothing if it is
* already in the requested state.
*
* Callers must use qemuBlockReopenReadWrite/qemuBlockReopenReadOnly functions.
*/
static int
qemuBlockReopenAccess(virDomainObj *vm,
virStorageSource *src,
bool readonly,
virDomainAsyncJob asyncJob)
{
if (src->readonly == readonly)
return 0;
src->readonly = readonly;
if (qemuBlockReopenFormat(vm, src, asyncJob) < 0) {
src->readonly = !readonly;
return -1;
}
return 0;
}
/**
* qemuBlockReopenReadWrite:
* @vm: domain object
* @src: storage source to reopen
* @asyncJob: qemu async job type
*
* Wrapper that reopens @src read-write. We currently depend on qemu
* reopening the storage with 'auto-read-only' enabled for us.
* After successful reopen @src's 'readonly' flag is modified. Does nothing
* if @src is already read-write.
* Semantic wrapper that reopens @src read-write. After successful reopen @src's
* 'readonly' flag is modified. Does nothing if @src is already read-write.
*/
int
qemuBlockReopenReadWrite(virDomainObj *vm,
virStorageSource *src,
virDomainAsyncJob asyncJob)
{
if (!src->readonly)
return 0;
src->readonly = false;
if (qemuBlockReopenFormat(vm, src, asyncJob) < 0) {
src->readonly = true;
return -1;
}
return 0;
return qemuBlockReopenAccess(vm, src, false, asyncJob);
}
@ -3265,26 +3286,15 @@ qemuBlockReopenReadWrite(virDomainObj *vm,
* @src: storage source to reopen
* @asyncJob: qemu async job type
*
* Wrapper that reopens @src read-only. We currently depend on qemu
* reopening the storage with 'auto-read-only' enabled for us.
* After successful reopen @src's 'readonly' flag is modified. Does nothing
* if @src is already read-only.
* Semantic wrapper that reopens @src read-only. After successful reopen @src's
* 'readonly' flag is modified. Does nothing if @src is already read-only.
*/
int
qemuBlockReopenReadOnly(virDomainObj *vm,
virStorageSource *src,
virDomainAsyncJob asyncJob)
{
if (src->readonly)
return 0;
src->readonly = true;
if (qemuBlockReopenFormat(vm, src, asyncJob) < 0) {
src->readonly = false;
return -1;
}
return 0;
return qemuBlockReopenAccess(vm, src, true, asyncJob);
}
/**