From ef59d1ca65bb91ddc5f41b33e7a4ae53b2b366af Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 10 Sep 2012 09:55:11 +0200
Subject: [PATCH] do not copy list of unused disk into snapshot config

---
 PVE/QemuServer.pm | 65 ++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 7e369d8e..989e4b1b 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3557,6 +3557,38 @@ sub restore_archive {
 # So we try to avoid locking the file and use 'lock' variable
 # inside the config file instead.
 
+my $snapshot_copy_config = sub {
+    my ($source, $dest) = @_;
+
+    foreach my $k (keys %$source) {
+	next if $k eq 'snapshots';
+	next if $k eq 'lock';
+	next if $k eq 'digest';
+	next if $k =~ m/^unused\d+$/;
+		
+	$dest->{$k} = $source->{$k};
+    }
+};
+
+my $snapshot_apply_config = sub {
+    my ($conf, $snap) = @_;
+
+    # copy snapshot list
+    my $newconf = {
+	snapshots => $conf->{snapshots},
+    };
+
+    # keep list of unused disks
+    foreach my $k (keys %$conf) {
+	next if $k !~ m/^unused\d+$/;
+	$newconf->{$k} = $conf->{$k};
+    }
+
+    &$snapshot_copy_config($snap, $newconf);
+
+    return $newconf;
+};
+
 my $snapshot_prepare = sub {
     my ($vmid, $snapname) = @_;
 
@@ -3580,13 +3612,7 @@ my $snapshot_prepare = sub {
 	    snapstate => "prepare",
 	};
 
-	foreach my $k (keys %$conf) {
-	    next if $k eq 'snapshots';
-	    next if $k eq 'lock';
-	    next if $k eq 'digest';
-
-	    $snap->{$k} = $conf->{$k};
-	}
+	&$snapshot_copy_config($conf, $snap);
 
 	update_config_nolock($vmid, $conf, 1);
     };
@@ -3615,17 +3641,7 @@ my $snapshot_commit = sub {
 	
 	delete $snap->{snapstate};
 
-	# copy snapshot config to current config
-	my $newconf = {
-	    snapshots => $conf->{snapshots},
-	};
-	foreach my $k (keys %$snap) {
-	    next if $k eq 'snapshots';
-	    next if $k eq 'lock';
-	    next if $k eq 'digest';
-
-	    $newconf->{$k} = $snap->{$k};
-	}
+	my $newconf = &$snapshot_apply_config($conf, $snap);
 
 	update_config_nolock($vmid, $newconf, 1);
     };
@@ -3665,17 +3681,8 @@ sub snapshot_rollback {
 
 	if (!$prepare) {
 	    # copy snapshot config to current config
-	    my $newconf = {
-		snapshots => $conf->{snapshots},
-	    };
-	    foreach my $k (keys %$snap) {
-		next if $k eq 'snapshots';
-		next if $k eq 'lock';
-		next if $k eq 'digest';
-		
-		$newconf->{$k} = $snap->{$k};
-		$newconf->{parent} = $snapname;
-	    }
+	    $conf = &$snapshot_apply_config($conf, $snap);
+	    $conf->{parent} = $snapname;
 	}
 
  	update_config_nolock($vmid, $conf, 1);