snapshot: Drop pointless function virDomainMomentIsCurrentName

The qemu driver already had a full-blown virDomainMomentObjPtr to
check against, and the test driver ought to have one since we get
better error checking that the user passed in a valid object. Removes
the need for a helper function added in commit commit 4819f54b.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c
index 92cf52dd7dfd851c75b8295fbca873a3190424c1..b9ca5b1318f05444c4e61e5b951cfbc659c80e11 100644 (file)
--- a/src/conf/virdomainmomentobjlist.c
+++ b/src/conf/virdomainmomentobjlist.c
@@ -409,15 +409,6 @@ virDomainMomentGetCurrentName(virDomainMomentObjListPtr moments)
 }
 
 
-/* Return true if name matches the current moment */
-bool
-virDomainMomentIsCurrentName(virDomainMomentObjListPtr moments,
-                             const char *name)
-{
-    return moments->current && STREQ(moments->current->def->name, name);
-}
-
-
 /* Update the current moment, using NULL if no current remains */
 void
 virDomainMomentSetCurrent(virDomainMomentObjListPtr moments,

diff --git a/src/conf/virdomainmomentobjlist.h b/src/conf/virdomainmomentobjlist.h
index b67af24bba3b952f0c150801cea7722f809969b9..6481c771de5009e49979614aa3e2680d9856df2b 100644 (file)
--- a/src/conf/virdomainmomentobjlist.h
+++ b/src/conf/virdomainmomentobjlist.h
@@ -109,8 +109,6 @@ virDomainMomentObjPtr virDomainMomentFindByName(virDomainMomentObjListPtr moment
 int virDomainMomentObjListSize(virDomainMomentObjListPtr moments);
 virDomainMomentObjPtr virDomainMomentGetCurrent(virDomainMomentObjListPtr moments);
 const char *virDomainMomentGetCurrentName(virDomainMomentObjListPtr moments);
-bool virDomainMomentIsCurrentName(virDomainMomentObjListPtr moments,
-                                  const char *name);
 void virDomainMomentSetCurrent(virDomainMomentObjListPtr moments,
                                virDomainMomentObjPtr moment);
 bool virDomainMomentObjListRemove(virDomainMomentObjListPtr moments,

diff --git a/src/conf/virdomainsnapshotobjlist.c b/src/conf/virdomainsnapshotobjlist.c
index 04221134dac293d4907d4a6b3f7ca01d7db5208a..4ddc2a4b6559e9a857ed70bb6c99c3ff1512e0bd 100644 (file)
--- a/src/conf/virdomainsnapshotobjlist.c
+++ b/src/conf/virdomainsnapshotobjlist.c
@@ -187,15 +187,6 @@ virDomainSnapshotGetCurrentName(virDomainSnapshotObjListPtr snapshots)
 }
 
 
-/* Return true if name matches the current snapshot */
-bool
-virDomainSnapshotIsCurrentName(virDomainSnapshotObjListPtr snapshots,
-                               const char *name)
-{
-    return virDomainMomentIsCurrentName(snapshots->base, name);
-}
-
-
 /* Update the current snapshot, using NULL if no current remains */
 void
 virDomainSnapshotSetCurrent(virDomainSnapshotObjListPtr snapshots,

diff --git a/src/conf/virdomainsnapshotobjlist.h b/src/conf/virdomainsnapshotobjlist.h
index 38d34ea010ef1adbc7adc2361223a31cfae19bf4..b83f7a4ba919fa4162f0acd79e692cdf4987bcd4 100644 (file)
--- a/src/conf/virdomainsnapshotobjlist.h
+++ b/src/conf/virdomainsnapshotobjlist.h
@@ -44,8 +44,6 @@ virDomainMomentObjPtr virDomainSnapshotFindByName(virDomainSnapshotObjListPtr sn
                                                   const char *name);
 virDomainMomentObjPtr virDomainSnapshotGetCurrent(virDomainSnapshotObjListPtr snapshots);
 const char *virDomainSnapshotGetCurrentName(virDomainSnapshotObjListPtr snapshots);
-bool virDomainSnapshotIsCurrentName(virDomainSnapshotObjListPtr snapshots,
-                                    const char *name);
 void virDomainSnapshotSetCurrent(virDomainSnapshotObjListPtr snapshots,
                                  virDomainMomentObjPtr snapshot);
 bool virDomainSnapshotObjListRemove(virDomainSnapshotObjListPtr snapshots,

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 9c2d5e75fa6f61d032767d20c804f334f095c34d..73ef24d66f2ae7d0b04ccac29f41a7ca5572e822 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -995,7 +995,6 @@ virDomainSnapshotFindByName;
 virDomainSnapshotForEach;
 virDomainSnapshotGetCurrent;
 virDomainSnapshotGetCurrentName;
-virDomainSnapshotIsCurrentName;
 virDomainSnapshotObjListFree;
 virDomainSnapshotObjListGetNames;
 virDomainSnapshotObjListNew;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 51b434f0d22978e7d536294928d69ec0e44daf16..930ce9d4013491f92483891a17656bb1a7e51fbd 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16201,7 +16201,7 @@ qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot,
     if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot)))
         goto cleanup;
 
-    ret = virDomainSnapshotIsCurrentName(vm->snapshots, snapshot->name);
+    ret = snap == virDomainSnapshotGetCurrent(vm->snapshots);
 
  cleanup:
     virDomainObjEndAPI(&vm);

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index b7e2bbcff45d91494062b1d86baa6ae10f1cce18..d5eecf4b7fc815ecf6a027d15760d7f9fc6ad6da 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -6248,15 +6248,20 @@ testDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot,
                             unsigned int flags)
 {
     virDomainObjPtr vm = NULL;
-    int ret;
+    int ret = -1;
+    virDomainMomentObjPtr snap = NULL;
 
     virCheckFlags(0, -1);
 
     if (!(vm = testDomObjFromSnapshot(snapshot)))
         return -1;
 
-    ret = virDomainSnapshotIsCurrentName(vm->snapshots, snapshot->name);
+    if (!(snap = testSnapObjFromSnapshot(vm, snapshot)))
+        goto cleanup;
+
+    ret = snap == virDomainSnapshotGetCurrent(vm->snapshots);
 
+ cleanup:
     virDomainObjEndAPI(&vm);
     return ret;
 }