edf6bf0381
23955-x86-pv-cpuid-xsave.patch 23957-cpufreq-error-paths.patch - Upstream patches from Jan 23933-pt-bus2bridge-update.patch 23726-x86-intel-flexmigration-v2.patch 23925-x86-AMD-ARAT-Fam12.patch 23246-x86-xsave-enable.patch 23897-x86-mce-offline-again.patch - Update to Xen 4.1.2_rc3 c/s 23171 - bnc#720054 - Changed /etc/udev/rules.d/40-xen.rules to not run Xen's vif-bridge script when not running Xen. This is not a solution to the bug but an improvement in the rules regardless. Updated udev-rules.patch - Upstream patches from Jan 23868-vtd-RMRR-validation.patch 23871-x86-microcode-amd-silent.patch 23898-cc-option-grep.patch - Add pciback init script and sysconf file, giving users a simple mechanism to configure pciback. init.pciback sysconfig.pciback - update scripts to use xl -f, or xm if xend is running: xen-updown.sh, init.xendomains, xmclone.sh OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=146
48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
# HG changeset patch
|
|
# User Keir Fraser <keir@xen.org>
|
|
# Date 1307691167 -3600
|
|
# Node ID 2ef6bbee50371e1135236035ed1a9a7b8748e09f
|
|
# Parent 0a29c8c3ddf7395ea8e68c5f4cd8633023490022
|
|
x86/vmx: Small fixes to MSR_IA32_VMX_PROCBASED_CTLS feature probing.
|
|
|
|
Should check for VIRTUAL_INTR_PENDING as we unconditionally make use
|
|
of it. Also check for CR8 exiting unconditionally on x86/64, as this
|
|
is of use to nestedvmx, and every 64-bit cpu should support it.
|
|
|
|
Signed-off-by: Eddie Dong <eddie.dong@intel.com>
|
|
Signed-off-by: Keir Fraser <keir@xen.org>
|
|
|
|
Index: xen-4.1.2-testing/xen/arch/x86/hvm/vmx/vmcs.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/xen/arch/x86/hvm/vmx/vmcs.c
|
|
+++ xen-4.1.2-testing/xen/arch/x86/hvm/vmx/vmcs.c
|
|
@@ -148,6 +148,11 @@ static int vmx_init_vmcs_config(void)
|
|
MSR_IA32_VMX_PINBASED_CTLS, &mismatch);
|
|
|
|
min = (CPU_BASED_HLT_EXITING |
|
|
+ CPU_BASED_VIRTUAL_INTR_PENDING |
|
|
+#ifdef __x86_64__
|
|
+ CPU_BASED_CR8_LOAD_EXITING |
|
|
+ CPU_BASED_CR8_STORE_EXITING |
|
|
+#endif
|
|
CPU_BASED_INVLPG_EXITING |
|
|
CPU_BASED_CR3_LOAD_EXITING |
|
|
CPU_BASED_CR3_STORE_EXITING |
|
|
@@ -166,13 +171,9 @@ static int vmx_init_vmcs_config(void)
|
|
MSR_IA32_VMX_PROCBASED_CTLS, &mismatch);
|
|
_vmx_cpu_based_exec_control &= ~CPU_BASED_RDTSC_EXITING;
|
|
#ifdef __x86_64__
|
|
- if ( !(_vmx_cpu_based_exec_control & CPU_BASED_TPR_SHADOW) )
|
|
- {
|
|
- min |= CPU_BASED_CR8_LOAD_EXITING | CPU_BASED_CR8_STORE_EXITING;
|
|
- _vmx_cpu_based_exec_control = adjust_vmx_controls(
|
|
- "CPU-Based Exec Control", min, opt,
|
|
- MSR_IA32_VMX_PROCBASED_CTLS, &mismatch);
|
|
- }
|
|
+ if ( _vmx_cpu_based_exec_control & CPU_BASED_TPR_SHADOW )
|
|
+ _vmx_cpu_based_exec_control &=
|
|
+ ~(CPU_BASED_CR8_LOAD_EXITING | CPU_BASED_CR8_STORE_EXITING);
|
|
#endif
|
|
|
|
if ( _vmx_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS )
|