From a7f3d90919470f158903369ca4732c5b6fae9f5a Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 31 Jan 2013 11:36:49 +0100
Subject: [PATCH] free_image: correctly check if base volume is not used

moved parse_volume_id to PVE::Storage::Plugin::parse_volume_id
---
 PVE/Storage.pm        |  7 +------
 PVE/Storage/Plugin.pm | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 710c7ae..2260f06 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -257,15 +257,10 @@ sub parse_vmid {
     return int($vmid);
 }
 
-PVE::JSONSchema::register_format('pve-volume-id', \&parse_volume_id);
 sub parse_volume_id {
     my ($volid, $noerr) = @_;
 
-    if ($volid =~ m/^([a-z][a-z0-9\-\_\.]*[a-z0-9]):(.+)$/i) {
-	return wantarray ? ($1, $2) : $1;
-    }
-    return undef if $noerr;
-    die "unable to parse volume ID '$volid'\n";
+    return PVE::Storage::Plugin::parse_volume_id($volid, $noerr);
 }
 
 sub volume_is_base {
diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index effd02a..0cbf488 100644
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -178,6 +178,17 @@ sub verify_options {
     return $value;
 }
 
+PVE::JSONSchema::register_format('pve-volume-id', \&parse_volume_id);
+sub parse_volume_id {
+    my ($volid, $noerr) = @_;
+
+    if ($volid =~ m/^([a-z][a-z0-9\-\_\.]*[a-z0-9]):(.+)$/i) {
+	return wantarray ? ($1, $2) : $1;
+    }
+    return undef if $noerr;
+    die "unable to parse volume ID '$volid'\n";
+}
+
 
 sub private {
     return $defaultData;
@@ -545,10 +556,29 @@ sub free_image {
 
     if (! -f $path) {
 	warn "disk image '$path' does not exists\n";
-    } else {
-	unlink $path;
+	return undef;
     }
 
+    my ($vtype, $name, $vmid, undef, undef, $isBase) = 
+	$class->parse_volname($volname);
+
+    if ($isBase) {
+	my $vollist = $class->list_images($storeid, $scfg);
+	foreach my $info (@$vollist) {
+	    my (undef, $tmpvolname) = parse_volume_id($info->{volid});
+
+	    my (undef, undef, undef, $basename, $basevmid) = 
+		$class->parse_volname($tmpvolname);
+
+	    if ($basename && $basevmid == $vmid && $basename eq $name) {
+		die "base volume '$volname' is still in use " .
+		    "(use by '$tmpvolname')\n";
+	    }
+	}
+    }
+
+    unlink $path;
+
     return undef;
 }