[libvirt] [PATCH 4/4] qemu: Don't repeat virDomainObjEndAPI in qemuDomainBlockPull

Peter Krempa pkrempa at redhat.com
Fri Sep 27 13:05:16 UTC 2019


Use VIR_AUTORELEASE instead.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0988071708..ed59e64c10 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18911,21 +18911,19 @@ static int
 qemuDomainBlockPull(virDomainPtr dom, const char *path, unsigned long bandwidth,
                     unsigned int flags)
 {
-    virDomainObjPtr vm;
+    VIR_AUTORELEASE(virDomainObjPtr) vm = NULL;
+
     virCheckFlags(VIR_DOMAIN_BLOCK_PULL_BANDWIDTH_BYTES, -1);

     if (!(vm = qemuDomObjFromDomain(dom)))
         return -1;

-    if (virDomainBlockPullEnsureACL(dom->conn, vm->def) < 0) {
-        virDomainObjEndAPI(&vm);
+    if (virDomainBlockPullEnsureACL(dom->conn, vm->def) < 0)
         return -1;
-    }

     if (virDomainListCheckpoints(vm->checkpoints, NULL, dom, NULL, 0) > 0) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                        _("cannot perform block pull while checkpoint exists"));
-        virDomainObjEndAPI(&vm);
         return -1;
     }

-- 
2.21.0




More information about the libvir-list mailing list