[fedora-virt-maint] rpms/qemu/devel qemu-add-ksm-support.patch, 1.3, 1.4 qemu-fix-msix-error-handling-on-older-kernels.patch, 1.2, 1.3 qemu-fix-no-kvm-segfault.patch, 1.3, 1.4 qemu.spec, 1.129, 1.130

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4399

Modified Files:
	qemu-add-ksm-support.patch 
	qemu-fix-msix-error-handling-on-older-kernels.patch 
	qemu-fix-no-kvm-segfault.patch qemu.spec 
Log Message:
* Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-4
- Fix for KSM patch from Justin Forbes


qemu-add-ksm-support.patch:
 exec.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: qemu-add-ksm-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-add-ksm-support.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qemu-add-ksm-support.patch	7 Sep 2009 14:22:19 -0000	1.3
+++ qemu-add-ksm-support.patch	16 Sep 2009 22:20:32 -0000	1.4
@@ -1,4 +1,4 @@
-From 4d64a615f69458c202561fcc01e8e0505fa46ee9 Mon Sep 17 00:00:00 2001
+From ef44e9475ab38ec73b30e83241279170fac06b22 Mon Sep 17 00:00:00 2001
 From: Izik Eidus <ieidus at redhat.com>
 Date: Tue, 28 Jul 2009 19:14:26 +0300
 Subject: [PATCH] kvm userspace: ksm support
@@ -6,17 +6,28 @@ Subject: [PATCH] kvm userspace: ksm supp
 rfc for ksm support to kvm userpsace.
 
 Signed-off-by: Izik Eidus <ieidus at redhat.com>
+signed-off-by: Justin M. Forbes <jforbes at redhat.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
 Fedora-patch: qemu-add-ksm-support.patch
 ---
- exec.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ exec.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/exec.c b/exec.c
-index 0655b4b..b93f7b8 100644
+index 0655b4b..a0e2203 100644
 --- a/exec.c
 +++ b/exec.c
-@@ -2579,6 +2579,9 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size)
+@@ -65,6 +65,9 @@
+ #undef DEBUG_TB_CHECK
+ #endif
+ 
++/* Quick hack to enable KSM support */
++#define MADV_MERGEABLE 12 /* KSM may merge identical pages */
++
+ #define SMC_BITMAP_USE_THRESHOLD 10
+ 
+ #if defined(TARGET_SPARC64)
+@@ -2579,6 +2582,9 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size)
      new_block->host = file_ram_alloc(size, mem_path);
      if (!new_block->host) {
          new_block->host = qemu_vmalloc(size);

qemu-fix-msix-error-handling-on-older-kernels.patch:
 msix.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Index: qemu-fix-msix-error-handling-on-older-kernels.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-msix-error-handling-on-older-kernels.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-fix-msix-error-handling-on-older-kernels.patch	7 Sep 2009 14:22:20 -0000	1.2
+++ qemu-fix-msix-error-handling-on-older-kernels.patch	16 Sep 2009 22:20:32 -0000	1.3
@@ -1,4 +1,4 @@
-From 0b341eda83cd2f01134d5b13300d97c07a3abced Mon Sep 17 00:00:00 2001
+From 80380f566e2c1d4c9e02e0c0dff405ecc86d134e Mon Sep 17 00:00:00 2001
 From: Michael S. Tsirkin <mst at redhat.com>
 Date: Thu, 23 Jul 2009 16:34:13 +0300
 Subject: [PATCH] Fix error handling in msix vector add

qemu-fix-no-kvm-segfault.patch:
 vl.c |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

Index: qemu-fix-no-kvm-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-no-kvm-segfault.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qemu-fix-no-kvm-segfault.patch	7 Sep 2009 14:22:20 -0000	1.3
+++ qemu-fix-no-kvm-segfault.patch	16 Sep 2009 22:20:32 -0000	1.4
@@ -1,4 +1,4 @@
-From 00782050707fbb999bfffe722794490d2211a0a9 Mon Sep 17 00:00:00 2001
+From 70415c7d31bf6420d1a2d685fe14661ce1cfd9cb Mon Sep 17 00:00:00 2001
 From: Dustin Kirkland <kirkland at canonical.com>
 Date: Fri, 4 Sep 2009 14:38:30 -0500
 Subject: [PATCH] qemu-kvm: fix segfault when running kvm without /dev/kvm


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- qemu.spec	16 Sep 2009 20:18:42 -0000	1.129
+++ qemu.spec	16 Sep 2009 22:20:32 -0000	1.130
@@ -3,7 +3,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -526,6 +526,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-4
+- Fix for KSM patch from Justin Forbes
+
 * Wed Sep 16 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.92-3
 - Add ksmtuned, also from Dan Kenigsberg
 - Use %_initddir macro