From 1c06086781ea3f6774f36a1135c84c2d28990e4b Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 8 Dec 2011 10:24:56 +0100
Subject: [PATCH] do not use ehci by default

Because the ehci driver blocks migration (ehci is currently not migratable)
---
 Makefile          |  2 +-
 PVE/QemuServer.pm | 15 +++++++++++++--
 changelog.Debian  |  6 ++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 635d4345..6e43e746 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=10
+PKGREL=11
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 4b4ef415..508f5d2d 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1952,12 +1952,23 @@ sub config_to_command {
 
     push @$cmd, '-incoming', $migrate_uri if $migrate_uri;
 
+    my $use_usb2 = 0;
+    for (my $i = 0; $i < $MAX_USB_DEVICES; $i++)  {
+	next if !$conf->{"usb$i"};
+	$use_usb2 = 1;
+    }
     # include usb device config
-    push @$cmd, '-readconfig', '/usr/share/qemu-server/pve-usb.cfg';
+    push @$cmd, '-readconfig', '/usr/share/qemu-server/pve-usb.cfg' if $use_usb2;
 
     # enable absolute mouse coordinates (needed by vnc)
     my $tablet = defined($conf->{tablet}) ? $conf->{tablet} : $defaults->{tablet};
-    push @$cmd, '-device', 'usb-tablet,bus=ehci.0,port=6' if $tablet;
+    if ($tablet) {
+	if ($use_usb2) {
+	    push @$cmd, '-device', 'usb-tablet,bus=ehci.0,port=6';
+	} else {
+	    push @$cmd, '-usbdevice', 'tablet';
+	}
+    }
 
     # host pci devices
     for (my $i = 0; $i < $MAX_HOSTPCI_DEVICES; $i++)  {
diff --git a/changelog.Debian b/changelog.Debian
index 90f1569c..bb1a557a 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-11) unstable; urgency=low
+
+  * do not use ehci by default
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 08 Dec 2011 10:26:36 +0100
+
 qemu-server (2.0-10) unstable; urgency=low
 
   * set qm exit codes currectly