From 49f9db93c07bcef3a015fd5f82c2434bb72c60c4 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 15 Feb 2012 10:48:55 +0100
Subject: [PATCH] correctly remove cdrom and iscsi devices

---
 Makefile         | 2 +-
 PVE/API2/Qemu.pm | 3 ++-
 changelog.Debian | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 388e8f00..1193544d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=16
+PKGREL=17
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 9402ad38..66fcd444 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -596,9 +596,10 @@ my $delete_drive = sub {
 	    } else {
 		PVE::QemuServer::add_unused_volume($conf, $volid, $vmid);
 	    }
-	    delete $conf->{$key};
 	}
     }
+
+    delete $conf->{$key};
 };
 
 my $vmconfig_delete_option = sub {
diff --git a/changelog.Debian b/changelog.Debian
index f7c7b110..04df73e5 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-17) unstable; urgency=low
+
+  * fix cdrom removal bug
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 15 Feb 2012 10:48:30 +0100
+
 qemu-server (2.0-16) unstable; urgency=low
 
   * ignore -tdf (avoid kvm warning) - this is no longer needed