[pve-devel] [PATCH storage 2/3] plugin: remove volume_snapshot_list

[Fabian Ebner]

which was only used by replication, but now replication uses
volume_snapshot_info instead.

Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---

Breaks old pve-guest-common.

Requires APIVER+APIAGE bump (it's in the next patch).

 PVE/Storage.pm               | 16 ----------------
 PVE/Storage/Plugin.pm        |  9 ---------
 PVE/Storage/ZFSPlugin.pm     |  6 ------
 PVE/Storage/ZFSPoolPlugin.pm |  9 ---------
 4 files changed, 40 deletions(-)

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index f9582d0..5d389be 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -380,22 +380,6 @@ sub volume_snapshot_info {
     return $plugin->volume_snapshot_info($scfg, $storeid, $volname);
 }
 
-sub volume_snapshot_list {
-    my ($cfg, $volid) = @_;
-
-    my ($storeid, $volname) = parse_volume_id($volid, 1);
-    if ($storeid) {
-	my $scfg = storage_config($cfg, $storeid);
-	my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
-	return $plugin->volume_snapshot_list($scfg, $storeid, $volname);
-    } elsif ($volid =~ m|^(/.+)$| && -e $volid) {
-	die "send file/device '$volid' is not possible\n";
-    } else {
-	die "unable to parse volume ID '$volid'\n";
-    }
-    # return an empty array if dataset does not exist.
-}
-
 sub get_image_dir {
     my ($cfg, $storeid, $vmid) = @_;
 
diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index d4b3615..42eabdf 100644
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -1222,15 +1222,6 @@ sub volume_snapshot_info {
     die "volume_snapshot_info is not implemented for $class";
 }
 
-sub volume_snapshot_list {
-    my ($class, $scfg, $storeid, $volname) = @_;
-
-    # implement in subclass
-    die "Volume_snapshot_list is not implemented for $class";
-
-    # return an empty array if dataset does not exist.
-}
-
 sub activate_storage {
     my ($class, $storeid, $scfg, $cache) = @_;
 
diff --git a/PVE/Storage/ZFSPlugin.pm b/PVE/Storage/ZFSPlugin.pm
index 5b84d85..d4dc2a4 100644
--- a/PVE/Storage/ZFSPlugin.pm
+++ b/PVE/Storage/ZFSPlugin.pm
@@ -391,12 +391,6 @@ sub volume_has_feature {
     return undef;
 }
 
-sub volume_snapshot_list {
-    my ($class, $scfg, $storeid, $volname) = @_;
-    # return an empty array if dataset does not exist.
-    die "Volume_snapshot_list is not implemented for ZFS over iSCSI.\n";
-}
-
 sub activate_storage {
     my ($class, $storeid, $scfg, $cache) = @_;
 
diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index 01d0743..278438b 100644
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -532,15 +532,6 @@ sub volume_snapshot_info {
     return $info;
 }
 
-sub volume_snapshot_list {
-    my ($class, $scfg, $storeid, $volname) = @_;
-
-    my $snaps = [];
-    # return an empty array if dataset does not exist.
-    eval { $snaps = $class->zfs_get_sorted_snapshot_list($scfg, $volname, ['-S', 'name']); };
-    return $snaps;
-}
-
 my sub dataset_mounted_heuristic {
     my ($dataset) = @_;
 
-- 
2.30.2