[pve-devel] r5792 - in pve-qemu-kvm/trunk: . debian debian/patches

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-04-07 06:27:01 +0200 (Thu, 07 Apr 2011)
New Revision: 5792

Modified:
   pve-qemu-kvm/trunk/Makefile
   pve-qemu-kvm/trunk/debian/changelog
   pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff
Log:
fix KSM


Modified: pve-qemu-kvm/trunk/Makefile
===================================================================
--- pve-qemu-kvm/trunk/Makefile	2011-04-06 05:15:22 UTC (rev 5791)
+++ pve-qemu-kvm/trunk/Makefile	2011-04-07 04:27:01 UTC (rev 5792)
@@ -2,7 +2,7 @@
 
 # also update debian/changelog
 KVMVER=0.14.0
-KVMPKGREL=2
+KVMPKGREL=3
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm

Modified: pve-qemu-kvm/trunk/debian/changelog
===================================================================
--- pve-qemu-kvm/trunk/debian/changelog	2011-04-06 05:15:22 UTC (rev 5791)
+++ pve-qemu-kvm/trunk/debian/changelog	2011-04-07 04:27:01 UTC (rev 5792)
@@ -1,3 +1,9 @@
+pve-qemu-kvm (0.14.0-3) unstable; urgency=low
+
+  * enable KSM again
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 07 Apr 2011 06:26:16 +0200
+
 pve-qemu-kvm (0.14.0-2) unstable; urgency=low
 
   * also install vgabios-qxl.bin vgabios-stdvga.bin vgabios-vmware.bin

Modified: pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff	2011-04-06 05:15:22 UTC (rev 5791)
+++ pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff	2011-04-07 04:27:01 UTC (rev 5792)
@@ -1,17 +1,17 @@
-just define MADV_MERGEABLE
----
-
-Index: new/exec.c
+Index: new/osdep.h
 ===================================================================
---- new.orig/exec.c	2011-02-25 06:39:52.000000000 +0100
-+++ new/exec.c	2011-02-25 06:59:16.000000000 +0100
-@@ -59,6 +59,9 @@
- #endif
- #endif
+--- new.orig/osdep.h	2011-04-07 06:12:48.000000000 +0200
++++ new/osdep.h	2011-04-07 06:22:27.000000000 +0200
+@@ -94,6 +94,12 @@
  
+ #if defined(CONFIG_MADVISE)
+ 
 +/* our libc does not define it */
-+#define MADV_MERGEABLE   12
++#define MADV_WILLNEED   3               /* will need these pages */
++#define MADV_DONTNEED   4               /* don't need these pages */
++#define MADV_DONTFORK   10              /* don't inherit across fork */
++#define MADV_MERGEABLE   12             /* KSM may merge identical pages */
 +
- //#define DEBUG_TB_INVALIDATE
- //#define DEBUG_FLUSH
- //#define DEBUG_TLB
+ #define QEMU_MADV_WILLNEED  MADV_WILLNEED
+ #define QEMU_MADV_DONTNEED  MADV_DONTNEED
+ #ifdef MADV_DONTFORK