rpms/kernel/F-9 linux-2.6-intel-msr-backport.patch, NONE, 1.1 kernel.spec, 1.768, 1.769

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19331

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-intel-msr-backport.patch 
Log Message:
* Wed Sep 17 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-42
- From Chris Lalancette <clalance at redhat.com>:
   Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)


linux-2.6-intel-msr-backport.patch:

--- NEW FILE linux-2.6-intel-msr-backport.patch ---
--- linux-2.6.26.noarch/arch/x86/kvm/vmx.c.orig	2008-09-17 15:49:13.000000000 +0200
+++ linux-2.6.26.noarch/arch/x86/kvm/vmx.c	2008-09-17 15:51:33.000000000 +0200
@@ -914,6 +914,18 @@ static int vmx_set_msr(struct kvm_vcpu *
 	case MSR_IA32_TIME_STAMP_COUNTER:
 		guest_write_tsc(data);
 		break;
+	case MSR_P6_PERFCTR0:
+	case MSR_P6_PERFCTR1:
+	case MSR_P6_EVNTSEL0:
+	case MSR_P6_EVNTSEL1:
+		/*
+		 * Just discard all writes to the performance counters; this
+		 * should keep both older linux and windows 64-bit guests
+		 * happy
+		 */
+		pr_unimpl(vcpu, "unimplemented perfctr wrmsr: 0x%x data 0x%llx\n", msr_index, data);
+
+		break;
 	default:
 		vmx_load_host_state(vmx);
 		msr = find_msr_entry(vmx, msr_index);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.768
retrieving revision 1.769
diff -u -r1.768 -r1.769
--- kernel.spec	15 Sep 2008 23:50:36 -0000	1.768
+++ kernel.spec	17 Sep 2008 21:59:05 -0000	1.769
@@ -692,6 +692,7 @@
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
 
+Patch2700: linux-2.6-intel-msr-backport.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1275,6 +1276,7 @@
 # get rid of imacfb and make efifb work everywhere it was used
 ApplyPatch linux-2.6-merge-efifb-imacfb.patch
 
+ApplyPatch linux-2.6-intel-msr-backport.patch
 # ---------- below all scheduled for 2.6.24 -----------------
 
 # END OF PATCH APPLICATIONS
@@ -1866,6 +1868,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Sep 17 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-42
+- From Chris Lalancette <clalance at redhat.com>:
+   Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)
+
 * Mon Sep 15 2008 Roland McGrath <roland at redhat.com> - 2.6.26.5-41
 - utrace: Fix common oops in ptrace EPERM case.