rpms/kernel/F-8 linux-2.6-x86-intel-msr-backport.patch, NONE, 1.1 kernel.spec, 1.532, 1.533

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-intel-msr-backport.patch 
Log Message:
Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)

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

--- NEW FILE linux-2.6-x86-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-8/kernel.spec,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- kernel.spec	15 Sep 2008 02:21:55 -0000	1.532
+++ kernel.spec	19 Sep 2008 13:15:26 -0000	1.533
@@ -591,6 +591,7 @@
 Patch96: linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
 Patch97: linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 Patch98: linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
+Patch99: linux-2.6-x86-intel-msr-backport.patch
 
 #ALSA
 
@@ -1043,6 +1044,8 @@
 ApplyPatch linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
 # fix memmap=exactmap, so kdump kernels work
 ApplyPatch linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
+# backport MSR patch
+ApplyPatch linux-2.6-x86-intel-msr-backport.patch
 
 #
 # PowerPC
@@ -1851,6 +1854,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-23
+- Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)
+
 * Sun Sep 14 2008 Kyle McMartin <kyle at redhat.com> 2.6.26.5-22
 - Turn off CONFIG_ACPI_SYSFS_POWER again, got enabled by mistake when
   the (unaffected, since hal is newer) Fedora 9 config files were copied