From 64a8f6ec201398791a94a78edff794225edfc684 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 3 Apr 2012 07:30:52 +0200 Subject: [PATCH] revert defaults of prefer_msi and share_intx --- Makefile | 2 +- debian/changelog | 6 +++++ ...rt-prefer_msi-and-share_intx-defaults.diff | 26 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 debian/patches/revert-prefer_msi-and-share_intx-defaults.diff diff --git a/Makefile b/Makefile index c9eded1..238241d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=2.0 # also update debian/changelog KVMVER=1.0 -KVMPKGREL=8 +KVMPKGREL=9 KVMPACKAGE=pve-qemu-kvm KVMDIR=qemu-kvm diff --git a/debian/changelog b/debian/changelog index a75f978..2a02b32 100644 --- 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 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 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 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 767ccfd..1f92c99 100644 --- 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 +revert-prefer_msi-and-share_intx-defaults.diff -- 2.39.2