This reverts commit 421c9550f5446729b513ee50f5c44e6f6969b5a2. 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@xxxxxxxxxx> --- /me hides in shame src/qemu/qemu_driver.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 669c12d6ca..8c2670d377 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18443,24 +18443,23 @@ qemuDomainBlockPull(virDomainPtr dom, const char *path, unsigned long bandwidth, unsigned int flags) { virDomainObjPtr vm; - int ret = -1; - virCheckFlags(VIR_DOMAIN_BLOCK_PULL_BANDWIDTH_BYTES, -1); if (!(vm = qemuDomainObjFromDomain(dom))) return -1; - if (virDomainBlockPullEnsureACL(dom->conn, vm->def) < 0) - goto cleanup; - - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) - goto cleanup; + if (virDomainBlockPullEnsureACL(dom->conn, vm->def) < 0) { + virDomainObjEndAPI(&vm); + return -1; + } - ret = qemuDomainBlockPullCommon(vm, path, NULL, bandwidth, flags); + if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) { + virDomainObjEndAPI(&vm); + return -1; + } - cleanup: - virDomainObjEndAPI(&vm); - return ret; + /* qemuDomainBlockPullCommon consumes the reference on @vm */ + return qemuDomainBlockPullCommon(vm, path, NULL, bandwidth, flags); } -- 2.23.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
