revert defaults of prefer_msi and share_intx

diff --git a/Makefile b/Makefile
index c9eded10c11aa433aae2f2496eebcf1b9f9f2f19..238241dc801379ff6086b303568514778cf08ef0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 # also update debian/changelog
 KVMVER=1.0
 
 # also update debian/changelog
 KVMVER=1.0

-KVMPKGREL=8
+KVMPKGREL=9

 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm

diff --git a/debian/changelog b/debian/changelog
index a75f978fceb074a6356a768c4e65c506720c8d93..2a02b326ceb6d893a517b3d630f73c5fdcf22872 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-qemu-kvm (1.0-9) unstable; urgency=low
+
+  * revert patch to change prefer_msi and share_intx defaults
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 03 Apr 2012 07:29:27 +0200
+

 pve-qemu-kvm (1.0-8) unstable; urgency=low
 
   * include latest changes from master (update to commit 
 pve-qemu-kvm (1.0-8) unstable; urgency=low
 
   * include latest changes from master (update to commit 

diff --git a/debian/patches/revert-prefer_msi-and-share_intx-defaults.diff b/debian/patches/revert-prefer_msi-and-share_intx-defaults.diff
new file mode 100644 (file)
index 0000000..5f0e3f0
--- /dev/null
+++ b/debian/patches/revert-prefer_msi-and-share_intx-defaults.diff
@@ -0,0 +1,26 @@
+Recent changes in userscapce code:
+
+http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commit;h=6919115a8715c34cd80baa08422d90496f11f5d7
+
+requires more recent kernel header:
+
+http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commit;h=16cc190a673f3582bca50b983026915e4811f7ab
+
+so we simply revert for now.
+
+Index: new/hw/device-assignment.c
+===================================================================
+--- new.orig/hw/device-assignment.c    2012-04-03 07:23:56.000000000 +0200
++++ new/hw/device-assignment.c 2012-04-03 07:25:07.000000000 +0200
+@@ -1771,9 +1771,9 @@
+     DEFINE_PROP_BIT("iommu", AssignedDevice, features,
+                    ASSIGNED_DEVICE_USE_IOMMU_BIT, true),
+     DEFINE_PROP_BIT("prefer_msi", AssignedDevice, features,
+-                    ASSIGNED_DEVICE_PREFER_MSI_BIT, false),
++                    ASSIGNED_DEVICE_PREFER_MSI_BIT, true),
+     DEFINE_PROP_BIT("share_intx", AssignedDevice, features,
+-                    ASSIGNED_DEVICE_SHARE_INTX_BIT, true),
++                    ASSIGNED_DEVICE_SHARE_INTX_BIT, false),
+     DEFINE_PROP_INT32("bootindex", AssignedDevice, bootindex, -1),
+     DEFINE_PROP_STRING("configfd", AssignedDevice, configfd_name),
+     DEFINE_PROP_END_OF_LIST(),

diff --git a/debian/patches/series b/debian/patches/series
index 767ccfd67a9b96e6dc0dde6c6698a2d231b34d22..1f92c9931c2a370c8a140214635aadeeae38a97b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ set-max-nics.patch
 pve-auth.patch
 update-target-x86_64.conf-to-rhel6.2-version.patch
 libacard-fix-compilaton-with-gcc.4.7.diff
 pve-auth.patch
 update-target-x86_64.conf-to-rhel6.2-version.patch
 libacard-fix-compilaton-with-gcc.4.7.diff

+revert-prefer_msi-and-share_intx-defaults.diff