mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-02 04:15:46 +00:00
qemu: block: Absorb qemuBlockReopenFormatMon into qemuBlockReopenAccess
Move all the code into the now only caller. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
abd1e08c42
commit
dee5b3fb8e
@ -3165,26 +3165,6 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSource *topsrc,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
qemuBlockReopenFormatMon(qemuMonitor *mon,
|
|
||||||
virStorageSource *src)
|
|
||||||
{
|
|
||||||
g_autoptr(virJSONValue) srcprops = NULL;
|
|
||||||
g_autoptr(virJSONValue) reopenoptions = virJSONValueNewArray();
|
|
||||||
|
|
||||||
if (!(srcprops = qemuBlockStorageSourceGetFormatProps(src, src->backingStore)))
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (virJSONValueArrayAppend(reopenoptions, &srcprops) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (qemuMonitorBlockdevReopen(mon, &reopenoptions) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* qemuBlockReopenAccess:
|
* qemuBlockReopenAccess:
|
||||||
* @vm: domain object
|
* @vm: domain object
|
||||||
@ -3203,7 +3183,8 @@ qemuBlockReopenAccess(virDomainObj *vm,
|
|||||||
bool readonly,
|
bool readonly,
|
||||||
virDomainAsyncJob asyncJob)
|
virDomainAsyncJob asyncJob)
|
||||||
{
|
{
|
||||||
qemuDomainObjPrivate *priv = vm->privateData;
|
g_autoptr(virJSONValue) reopenoptions = virJSONValueNewArray();
|
||||||
|
g_autoptr(virJSONValue) srcprops = NULL;
|
||||||
int rc;
|
int rc;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
|
|
||||||
@ -3221,10 +3202,16 @@ qemuBlockReopenAccess(virDomainObj *vm,
|
|||||||
src->readonly = readonly;
|
src->readonly = readonly;
|
||||||
/* from now on all error paths must use 'goto cleanup' */
|
/* from now on all error paths must use 'goto cleanup' */
|
||||||
|
|
||||||
|
if (!(srcprops = qemuBlockStorageSourceGetFormatProps(src, src->backingStore)))
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (virJSONValueArrayAppend(reopenoptions, &srcprops) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0)
|
if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
rc = qemuBlockReopenFormatMon(priv->mon, src);
|
rc = qemuMonitorBlockdevReopen(qemuDomainGetMonitor(vm), &reopenoptions);
|
||||||
|
|
||||||
qemuDomainObjExitMonitor(vm);
|
qemuDomainObjExitMonitor(vm);
|
||||||
if (rc < 0)
|
if (rc < 0)
|
||||||
|
@ -263,11 +263,6 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSource *topsrc,
|
|||||||
GHashTable *blockNamedNodeData,
|
GHashTable *blockNamedNodeData,
|
||||||
virJSONValue **actions);
|
virJSONValue **actions);
|
||||||
|
|
||||||
/* only for use in qemumonitorjsontest */
|
|
||||||
int
|
|
||||||
qemuBlockReopenFormatMon(qemuMonitor *mon,
|
|
||||||
virStorageSource *src);
|
|
||||||
|
|
||||||
int
|
int
|
||||||
qemuBlockReopenReadWrite(virDomainObj *vm,
|
qemuBlockReopenReadWrite(virDomainObj *vm,
|
||||||
virStorageSource *src,
|
virStorageSource *src,
|
||||||
|
Loading…
Reference in New Issue
Block a user