rpms/kernel/F-7 linux-2.6-kvm-reinit-real-mode-tss.patch, NONE, 1.1 kernel-2.6.spec, 1.3240, 1.3241

Chuck Ebbert (cebbert) fedora-extras-commits at redhat.com
Fri Jun 29 20:36:23 UTC 2007


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3549

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-kvm-reinit-real-mode-tss.patch 
Log Message:
* Fri Jun 29 2007 Chuck Ebbert <cebbert at redhat.com>
- KVM: reinit real-mode TSS before switching back (bz #246054)
- unset CONFIG_USB_SUSPEND: it is causing problems


linux-2.6-kvm-reinit-real-mode-tss.patch:

--- NEW FILE linux-2.6-kvm-reinit-real-mode-tss.patch ---
From: Avi Kivity <avi at qumranet.com>
Date: Wed, 20 Jun 2007 08:20:04 +0000 (+0300)
Subject: KVM: VMX: Reinitialize the real-mode tss when entering real mode
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Favi%2Fkvm.git;a=commitdiff_plain;h=030421334ae91b7f6302a1cfe9c971a8991b4870

KVM: VMX: Reinitialize the real-mode tss when entering real mode

Protected mode code may have corrupted the real-mode tss, so re-initialize
it when switching to real mode.

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

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index b47ddcc..42a9163 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -31,6 +31,8 @@
 MODULE_AUTHOR("Qumranet");
 MODULE_LICENSE("GPL");
 
+static int init_rmode_tss(struct kvm *kvm);
+
 static DEFINE_PER_CPU(struct vmcs *, vmxarea);
 static DEFINE_PER_CPU(struct vmcs *, current_vmcs);
 
@@ -951,6 +953,8 @@ static void enter_rmode(struct kvm_vcpu *vcpu)
 	fix_rmode_seg(VCPU_SREG_DS, &vcpu->rmode.ds);
 	fix_rmode_seg(VCPU_SREG_GS, &vcpu->rmode.gs);
 	fix_rmode_seg(VCPU_SREG_FS, &vcpu->rmode.fs);
+
+	init_rmode_tss(vcpu->kvm);
 }
 
 #ifdef CONFIG_X86_64


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3240
retrieving revision 1.3241
diff -u -r1.3240 -r1.3241
--- kernel-2.6.spec	29 Jun 2007 16:50:24 -0000	1.3240
+++ kernel-2.6.spec	29 Jun 2007 20:35:48 -0000	1.3241
@@ -440,8 +440,6 @@
 Patch206: linux-2.6-x86-fsc-interrupt-controller-quirk.patch
 Patch207: linux-2.6-x86-dell-hpet.patch
 Patch209: linux-2.6-x86-64_pmtrace.patch
-Patch210: linux-2.6-amd-disabled-svm-detect.patch
-Patch211: linux-2.6-amd-disabled-svm-detect-msr-1.patch
 
 # 300 - 399   ppc(64)
 Patch300: linux-2.6-g5-therm-shutdown.patch
@@ -588,6 +586,9 @@
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-ondemand-timer.patch
 Patch1630: linux-2.6-kvm-19.patch
+Patch1631: linux-2.6-amd-disabled-svm-detect.patch
+Patch1632: linux-2.6-amd-disabled-svm-detect-msr-1.patch
+Patch1633: linux-2.6-kvm-reinit-real-mode-tss.patch
 Patch1640: linux-2.6-module-override-modparam-cmdline.patch
 Patch1650: linux-2.6-serial-460800.patch
 Patch1660: linux-2.6-mm-udf-fixes.patch
@@ -1139,10 +1140,6 @@
 %patch207 -p1
 # Add x86-64 PM_TRACE support.
 %patch209 -p1
-# Detect if AMD svm was disabled by BIOS
-%patch210 -p1
-# Fix patch 210 on 32-bit
-%patch211 -p1
 
 #
 # PowerPC
@@ -1359,8 +1356,14 @@
 %patch1610 -p1
 # don't wakeup ondemand timer whilst idle.
 %patch1620 -p1
-# Update KVM.
+# Update KVM. (should we just carry the latest version?)
 %patch1630 -p1
+# KVM: Detect if AMD svm was disabled by BIOS
+%patch1631 -p1
+# KVM: Fix above patch on 32-bit
+%patch1632 -p1
+# KVM: reinit real-mode TSS before switching back
+%patch1633 -p1
 # Allow overriding module parameters from kernel command_line
 #%patch1640 -p1
 # Allow to use 480600 baud on 16C950 UARTs
@@ -2469,6 +2472,10 @@
 
 %changelog
 * Fri Jun 29 2007 Chuck Ebbert <cebbert at redhat.com>
+- KVM: reinit real-mode TSS before switching back (bz #246054)
+- unset CONFIG_USB_SUSPEND: it is causing problems
+
+* Fri Jun 29 2007 Chuck Ebbert <cebbert at redhat.com>
 - AMD SVM: MSRs are 32-bit (bz #246250)
 - ata_piix: add Intel Santa Rosa PATA controller ID (bz #246048)
 




More information about the fedora-extras-commits mailing list