[libvirt] [PATCH 8.5/13] qemu: Rename qemuDomainSnapshotDiskDataFree to qemuDomainSnapshotDiskDataCleanup

Peter Krempa posted 1 patch 14 weeks ago
Failed in applying to current master (apply log)
src/qemu/qemu_driver.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

[libvirt] [PATCH 8.5/13] qemu: Rename qemuDomainSnapshotDiskDataFree to qemuDomainSnapshotDiskDataCleanup

Posted by Peter Krempa 14 weeks ago
In commit cbb4d229de30b5 I named the function with 'free' suffix, but at
that time it already did some non-freeing tasks. Rename it to make it
obvious that it's not just memory managemet.

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

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 9736933143..f1886e37b6 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15035,10 +15035,10 @@ typedef qemuDomainSnapshotDiskData *qemuDomainSnapshotDiskDataPtr;


 static void
-qemuDomainSnapshotDiskDataFree(qemuDomainSnapshotDiskDataPtr data,
-                               size_t ndata,
-                               virQEMUDriverPtr driver,
-                               virDomainObjPtr vm)
+qemuDomainSnapshotDiskDataCleanup(qemuDomainSnapshotDiskDataPtr data,
+                                  size_t ndata,
+                                  virQEMUDriverPtr driver,
+                                  virDomainObjPtr vm)
 {
     size_t i;

@@ -15145,7 +15145,7 @@ qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr driver,
     ret = 0;

  cleanup:
-    qemuDomainSnapshotDiskDataFree(data, ndata, driver, vm);
+    qemuDomainSnapshotDiskDataCleanup(data, ndata, driver, vm);
     return ret;
 }

@@ -15322,7 +15322,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
         ret = -1;

  cleanup:
-    qemuDomainSnapshotDiskDataFree(diskdata, ndiskdata, driver, vm);
+    qemuDomainSnapshotDiskDataCleanup(diskdata, ndiskdata, driver, vm);
     virErrorRestore(&orig_err);

     return ret;
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 8.5/13] qemu: Rename qemuDomainSnapshotDiskDataFree to qemuDomainSnapshotDiskDataCleanup

Posted by Ján Tomko 14 weeks ago
On Mon, Jun 10, 2019 at 12:31:52PM +0200, Peter Krempa wrote:
>In commit cbb4d229de30b5 I named the function with 'free' suffix, but at
>that time it already did some non-freeing tasks. Rename it to make it
>obvious that it's not just memory managemet.
>
>Signed-off-by: Peter Krempa <pkrempa@redhat.com>
>---
> src/qemu/qemu_driver.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list