snapshot: drop dead parameters

The previous optimizations lead to some follow-on cleanups.

* src/conf/domain_conf.c (virDomainSnapshotForEachChild)
(virDomainSnapshotForEachDescendant): Drop dead parameter.
(virDomainSnapshotActOnDescendant)
(virDomainSnapshotObjListNumFrom)
(virDomainSnapshotObjListGetNamesFrom): Update callers.
* src/qemu/qemu_driver.c (qemuDomainSnapshotNumChildren)
(qemuDomainSnapshotListChildrenNames, qemuDomainSnapshotDelete):
Likewise.
* src/conf/domain_conf.h: Update prototypes.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f346531e05ff68750892330a87a79a6bcaa2eeb3..c47c47ffc278f7ecfe9b1bb57ea0f349a6998e3c 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -12192,7 +12192,6 @@ cleanup:
 }
 
 int virDomainSnapshotObjListGetNamesFrom(virDomainSnapshotObjPtr snapshot,
-                                         virDomainSnapshotObjListPtr snapshots,
                                          char **const names, int maxnames,
                                          unsigned int flags)
 {
@@ -12202,11 +12201,11 @@ int virDomainSnapshotObjListGetNamesFrom(virDomainSnapshotObjPtr snapshot,
     data.flags = flags & ~VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS;
 
     if (flags & VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS)
-        virDomainSnapshotForEachDescendant(snapshots, snapshot,
+        virDomainSnapshotForEachDescendant(snapshot,
                                            virDomainSnapshotObjListCopyNames,
                                            &data);
     else
-        virDomainSnapshotForEachChild(snapshots, snapshot,
+        virDomainSnapshotForEachChild(snapshot,
                                       virDomainSnapshotObjListCopyNames, &data);
 
     if (data.oom) {
@@ -12263,7 +12262,6 @@ int virDomainSnapshotObjListNum(virDomainSnapshotObjListPtr snapshots,
 
 int
 virDomainSnapshotObjListNumFrom(virDomainSnapshotObjPtr snapshot,
-                                virDomainSnapshotObjListPtr snapshots,
                                 unsigned int flags)
 {
     struct virDomainSnapshotNumData data = { 0, 0 };
@@ -12271,11 +12269,11 @@ virDomainSnapshotObjListNumFrom(virDomainSnapshotObjPtr snapshot,
     data.flags = flags & ~VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS;
 
     if (flags & VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS)
-        virDomainSnapshotForEachDescendant(snapshots, snapshot,
+        virDomainSnapshotForEachDescendant(snapshot,
                                            virDomainSnapshotObjListCount,
                                            &data);
     else if (data.flags)
-        virDomainSnapshotForEachChild(snapshots, snapshot,
+        virDomainSnapshotForEachChild(snapshot,
                                       virDomainSnapshotObjListCount, &data);
     else
         data.count = snapshot->nchildren;
@@ -12300,8 +12298,7 @@ void virDomainSnapshotObjListRemove(virDomainSnapshotObjListPtr snapshots,
  * other entries in snapshots.  Return the number of children
  * visited.  No particular ordering is guaranteed.  */
 int
-virDomainSnapshotForEachChild(virDomainSnapshotObjListPtr snapshots ATTRIBUTE_UNUSED,
-                              virDomainSnapshotObjPtr snapshot,
+virDomainSnapshotForEachChild(virDomainSnapshotObjPtr snapshot,
                               virHashIterator iter,
                               void *data)
 {
@@ -12330,7 +12327,7 @@ virDomainSnapshotActOnDescendant(void *payload,
     struct snapshot_act_on_descendant *curr = data;
 
     (curr->iter)(payload, name, curr->data);
-    curr->number += 1 + virDomainSnapshotForEachDescendant(NULL, obj,
+    curr->number += 1 + virDomainSnapshotForEachDescendant(obj,
                                                            curr->iter,
                                                            curr->data);
 }
@@ -12339,8 +12336,7 @@ virDomainSnapshotActOnDescendant(void *payload,
  * other entries in snapshots.  Return the number of descendants
  * visited.  No particular ordering is guaranteed.  */
 int
-virDomainSnapshotForEachDescendant(virDomainSnapshotObjListPtr snapshots ATTRIBUTE_UNUSED,
-                                   virDomainSnapshotObjPtr snapshot,
+virDomainSnapshotForEachDescendant(virDomainSnapshotObjPtr snapshot,
                                    virHashIterator iter,
                                    void *data)
 {
@@ -12349,7 +12345,7 @@ virDomainSnapshotForEachDescendant(virDomainSnapshotObjListPtr snapshots ATTRIBU
     act.number = 0;
     act.iter = iter;
     act.data = data;
-    virDomainSnapshotForEachChild(NULL, snapshot,
+    virDomainSnapshotForEachChild(snapshot,
                                   virDomainSnapshotActOnDescendant, &act);
 
     return act.number;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 9b3870a3cbd6fd113c01234f36c05177a6a0070d..ce9321561e4b092b667ae446b36193d1be7ecca4 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1464,9 +1464,6 @@ struct _virDomainSnapshotObj {
     virDomainSnapshotObjPtr sibling; /* NULL if last child of parent */
     size_t nchildren;
     virDomainSnapshotObjPtr first_child; /* NULL if no children */
-
-    /* Internal use only */
-    int mark; /* Used in identifying descendents. */
 };
 
 typedef struct _virDomainSnapshotObjList virDomainSnapshotObjList;
@@ -1508,22 +1505,18 @@ int virDomainSnapshotObjListGetNames(virDomainSnapshotObjListPtr snapshots,
 int virDomainSnapshotObjListNum(virDomainSnapshotObjListPtr snapshots,
                                 unsigned int flags);
 int virDomainSnapshotObjListGetNamesFrom(virDomainSnapshotObjPtr snapshot,
-                                         virDomainSnapshotObjListPtr snapshots,
                                          char **const names, int maxnames,
                                          unsigned int flags);
 int virDomainSnapshotObjListNumFrom(virDomainSnapshotObjPtr snapshot,
-                                    virDomainSnapshotObjListPtr snapshots,
                                     unsigned int flags);
 virDomainSnapshotObjPtr virDomainSnapshotFindByName(const virDomainSnapshotObjListPtr snapshots,
                                                     const char *name);
 void virDomainSnapshotObjListRemove(virDomainSnapshotObjListPtr snapshots,
                                     virDomainSnapshotObjPtr snapshot);
-int virDomainSnapshotForEachChild(virDomainSnapshotObjListPtr snapshots,
-                                  virDomainSnapshotObjPtr snapshot,
+int virDomainSnapshotForEachChild(virDomainSnapshotObjPtr snapshot,
                                   virHashIterator iter,
                                   void *data);
-int virDomainSnapshotForEachDescendant(virDomainSnapshotObjListPtr snapshots,
-                                       virDomainSnapshotObjPtr snapshot,
+int virDomainSnapshotForEachDescendant(virDomainSnapshotObjPtr snapshot,
                                        virHashIterator iter,
                                        void *data);
 int virDomainSnapshotUpdateRelations(virDomainSnapshotObjListPtr snapshots);

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 143805ed87ce7fc0e672df9fbe27e787da7d0925..ec01cd5f767d039838e3c3e105938dadfd953aac 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9502,8 +9502,7 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot,
         goto cleanup;
     }
 
-    n = virDomainSnapshotObjListGetNamesFrom(snap, &vm->snapshots,
-                                             names, nameslen, flags);
+    n = virDomainSnapshotObjListGetNamesFrom(snap, names, nameslen, flags);
 
 cleanup:
     if (vm)
@@ -9546,7 +9545,7 @@ qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot,
      * VIR_DOMAIN_SNAPSHOT_LIST_METADATA makes no difference to our
      * answer.  */
 
-    n = virDomainSnapshotObjListNumFrom(snap, &vm->snapshots, flags);
+    n = virDomainSnapshotObjListNumFrom(snap, flags);
 
 cleanup:
     if (vm)
@@ -10163,7 +10162,7 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot,
             snap->def->state == VIR_DOMAIN_DISK_SNAPSHOT)
             external++;
         if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN)
-            virDomainSnapshotForEachDescendant(&vm->snapshots, snap,
+            virDomainSnapshotForEachDescendant(snap,
                                                qemuDomainSnapshotCountExternal,
                                                &external);
         if (external) {
@@ -10184,8 +10183,7 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot,
         rem.metadata_only = metadata_only;
         rem.err = 0;
         rem.current = false;
-        virDomainSnapshotForEachDescendant(&vm->snapshots,
-                                           snap,
+        virDomainSnapshotForEachDescendant(snap,
                                            qemuDomainSnapshotDiscardAll,
                                            &rem);
         if (rem.err < 0)
@@ -10210,7 +10208,7 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot,
         rep.vm = vm;
         rep.err = 0;
         rep.last = NULL;
-        virDomainSnapshotForEachChild(&vm->snapshots, snap,
+        virDomainSnapshotForEachChild(snap,
                                       qemuDomainSnapshotReparentChildren,
                                       &rep);
         if (rep.err < 0)