[fedora-virt-maint] rpms/qemu/devel qemu-add-ksm-support.patch, NONE, 1.1 qemu.spec, 1.115, 1.116

[Mark McLoughlin]

Author: markmc

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

Modified Files:
	qemu.spec 
Added Files:
	qemu-add-ksm-support.patch 
Log Message:
* Fri Jul 31 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.2.rc1.rc0
- Add KSM support
- Require bochs-bios >= 2.3.8-0.8 for latest kvm bios updates


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

--- NEW FILE qemu-add-ksm-support.patch ---
>From 511a4f5ab30a36fdaa48fb0d146cfc3f123b4f0a 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

rfc for ksm support to kvm userpsace.

Signed-off-by: Izik Eidus <ieidus 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(-)

diff --git a/exec.c b/exec.c
index 2134697..88bcff5 100644
--- a/exec.c
+++ b/exec.c
@@ -2578,6 +2578,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);
+#ifdef MADV_MERGEABLE
+        madvise(new_block->host, size, MADV_MERGEABLE);
+#endif
     }
     new_block->offset = last_ram_offset;
     new_block->length = size;
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- qemu.spec	30 Jul 2009 16:28:52 -0000	1.115
+++ qemu.spec	31 Jul 2009 15:12:00 -0000	1.116
@@ -4,7 +4,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.91
-Release: 0.1.%{kvmvertag}%{?dist}
+Release: 0.2.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -26,6 +26,9 @@ Patch02: qemu-fix-linux-user-build-on-pp
 # Make sure multiboot.bin/extboot.bin gets installed
 Patch03: qemu-fix-optionrom-install.patch
 
+# Add KSM support - see https://fedoraproject.org/wiki/Features/KSM
+Patch04: qemu-add-ksm-support.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -110,7 +113,7 @@ Group: Development/Tools
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires: gpxe-roms-qemu
 Requires: vgabios
-Requires: bochs-bios >= 2.3.8-0.5
+Requires: bochs-bios >= 2.3.8-0.8
 Provides: kvm = 85
 Obsoletes: kvm < 85
 
@@ -209,6 +212,7 @@ such as kvmtrace and kvm_stat.
 %patch01 -p1
 %patch02 -p1
 %patch03 -p1
+%patch04 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -473,6 +477,10 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Jul 31 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.2.rc1.rc0
+- Add KSM support
+- Require bochs-bios >= 2.3.8-0.8 for latest kvm bios updates
+
 * Thu Jul 30 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.1.rc1.rc0
 - Update to qemu-kvm-0.11.0-rc1-rc0
 - This is a pre-release of the official -rc1