From 2dbe827e385f0793260a1faa2de5895f1583d46f Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 22 Feb 2013 09:52:45 +0100
Subject: [PATCH] disable hotplug by default

This reverts commit 6c52b6794e10fb5e4bdad2b417b60496afc067a5

Testing revealed that this has too many side effect, so we do not want
to change that for the 2.3 release.
---
 Makefile          | 2 +-
 PVE/QemuServer.pm | 6 +++---
 changelog.Debian  | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9a0c823a..fb561211 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.3
 
 VERSION=2.3
 PACKAGE=qemu-server
-PKGREL=11
+PKGREL=12
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index fb672eb3..d3a8ff6d 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -167,7 +167,7 @@ my $confdesc = {
         optional => 1,
         type => 'boolean',
         description => "Allow hotplug for disk and network device",
-        default => 1,
+        default => 0,
     },
     reboot => {
 	optional => 1,
@@ -2519,7 +2519,7 @@ sub vm_deviceplug {
 	return 1;
     }
 
-    return 1 if defined($conf->{hotplug}) && !$conf->{hotplug};
+    return 1 if !$conf->{hotplug};
 
     my $devices_list = vm_devices_list($vmid);
     return 1 if defined($devices_list->{$deviceid});
@@ -2586,7 +2586,7 @@ sub vm_deviceunplug {
 	return 1;
     }
 
-    return 1 if defined($conf->{hotplug}) && !$conf->{hotplug};
+    return 1 if !$conf->{hotplug};
 
     my $devices_list = vm_devices_list($vmid);
     return 1 if !defined($devices_list->{$deviceid});
diff --git a/changelog.Debian b/changelog.Debian
index 302c1787..fd9a8881 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.3-12) unstable; urgency=low
+
+  * disable hotplug by default (revert previous change)
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 22 Feb 2013 09:52:13 +0100
+
 qemu-server (2.3-11) unstable; urgency=low
 
   * fix backup parameters for pve-qemu-kvm 1.4-4