mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-31 14:07:16 +00:00
Revert "qemu: Don't repeat virDomainObjEndAPI in qemuDomainBlockPull"
This reverts commit 421c9550f5
qemuDomainBlockPullCommon calls virDomainObjEndAPI internally so the
original commit made us shed two references of @vm instead of one
getting us into a premature free of @vm.
This is not a straight revert as qemuDomainBlockPull was modified
meanwhile. I've also added a warning comment that @vm is consumed.
https://bugzilla.redhat.com/show_bug.cgi?id=1777230
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
c8579871a9
commit
a10eb61340
@ -18443,24 +18443,23 @@ qemuDomainBlockPull(virDomainPtr dom, const char *path, unsigned long bandwidth,
|
|||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
virDomainObjPtr vm;
|
virDomainObjPtr vm;
|
||||||
int ret = -1;
|
|
||||||
|
|
||||||
virCheckFlags(VIR_DOMAIN_BLOCK_PULL_BANDWIDTH_BYTES, -1);
|
virCheckFlags(VIR_DOMAIN_BLOCK_PULL_BANDWIDTH_BYTES, -1);
|
||||||
|
|
||||||
if (!(vm = qemuDomainObjFromDomain(dom)))
|
if (!(vm = qemuDomainObjFromDomain(dom)))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (virDomainBlockPullEnsureACL(dom->conn, vm->def) < 0)
|
if (virDomainBlockPullEnsureACL(dom->conn, vm->def) < 0) {
|
||||||
goto cleanup;
|
virDomainObjEndAPI(&vm);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0)
|
if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) {
|
||||||
goto cleanup;
|
virDomainObjEndAPI(&vm);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
ret = qemuDomainBlockPullCommon(vm, path, NULL, bandwidth, flags);
|
/* qemuDomainBlockPullCommon consumes the reference on @vm */
|
||||||
|
return qemuDomainBlockPullCommon(vm, path, NULL, bandwidth, flags);
|
||||||
cleanup:
|
|
||||||
virDomainObjEndAPI(&vm);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user