rpms/kvm/devel kvm-fix-bios.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 kvm.spec, 1.36, 1.37 sources, 1.22, 1.23

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/kvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3213

Modified Files:
	.cvsignore kvm.spec sources 
Added Files:
	kvm-fix-bios.patch 
Log Message:
* Tue Jan 15 2008 Bill Nottingham <notting at redhat.com>: - 59-1  
- add upstream patch to fix VMs that no longer boot (#427317)     
- update to kvm-59



kvm-fix-bios.patch:

--- NEW FILE kvm-fix-bios.patch ---
commit 6b8bb99a9cde386d72b4b7c22b92f4bdec333dab
Author: Avi Kivity <avi at ...>
Date:   Thu Jan 3 12:20:21 2008 +0200

    kvm: qemu: restore IO_MEM_ROM mark to bios when registering the memory with kvm

    We removed the IO_MEM_ROM mark for qemu, since the tpr optimization needs to
    update the bios.  However, kvm_cpu_register_physical_memory() uses the mark
    for other purposes, so keep it.  The removal broke bootstrap on older kernels.

    Signed-off-by: Avi Kivity <avi at ...>

diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index 5a1b7d4..179585f 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -865,8 +865,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
     if (kvm_allowed)
         kvm_cpu_register_physical_memory(0x100000 - isa_bios_size,
                                          isa_bios_size,
-                                         (bios_offset + bios_size - isa_bios_size)
-					 /* | IO_MEM_ROM */);
+                                         (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM);
 #endif

 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	27 Dec 2007 18:24:36 -0000	1.22
+++ .cvsignore	16 Jan 2008 04:07:00 -0000	1.23
@@ -1 +1 @@
-kvm-58.tar.gz
+kvm-59.tar.gz


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kvm.spec	27 Dec 2007 18:56:19 -0000	1.36
+++ kvm.spec	16 Jan 2008 04:07:00 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 58
-Release: 2%{?dist}
+Version: 59
+Release: 1%{?dist}
 License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -9,6 +9,7 @@
 Source1: kvm.modules
 Patch0: kvm-58-defaults.patch
 Patch1: kvm-bootmenu.patch
+Patch2: kvm-fix-bios.patch
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
@@ -39,7 +40,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .defaults
-%patch1 -p1 
+%patch1 -p1
+%patch2 -p1
 
 %build
 # we need to install the data bits in a different path
@@ -86,6 +88,10 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Tue Jan 15 2008 Bill Nottingham <notting at redhat.com>: - 59-1
+- add upstream patch to fix VMs that no longer boot (#427317)
+- update to kvm-59
+
 * Thu Dec 27 2007 Jeremy Katz <katzj at redhat.com> - 58-2
 - Fix up defaults patch to apply
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	27 Dec 2007 18:24:36 -0000	1.22
+++ sources	16 Jan 2008 04:07:00 -0000	1.23
@@ -1 +1 @@
-e217c48ad0d741ade09b1cbf672fb50b  kvm-58.tar.gz
+59fc43ab950c003a94004e08806ee675  kvm-59.tar.gz