This commit is contained in:
committed by
Git OBS Bridge
parent
5be0f1bcb4
commit
616dfa112f
@@ -1,8 +1,8 @@
|
||||
Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
Index: xen-3.4.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/arch/x86/hvm/hvm.c
|
||||
+++ xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
@@ -538,11 +538,12 @@ static int hvm_load_cpu_ctxt(struct doma
|
||||
--- xen-3.4.1-testing.orig/xen/arch/x86/hvm/hvm.c
|
||||
+++ xen-3.4.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
@@ -543,11 +543,12 @@ static int hvm_load_cpu_ctxt(struct doma
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
(!cpu_has_ffxsr && (ctxt.msr_efer & EFER_FFXSE)) ||
|
||||
((ctxt.msr_efer & (EFER_LME|EFER_LMA)) == EFER_LMA) )
|
||||
{
|
||||
@@ -824,10 +825,11 @@ int hvm_set_efer(uint64_t value)
|
||||
@@ -830,10 +831,11 @@ int hvm_set_efer(uint64_t value)
|
||||
|
||||
value &= ~EFER_LMA;
|
||||
|
||||
@@ -29,10 +29,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
(!cpu_has_ffxsr && (value & EFER_FFXSE)) )
|
||||
{
|
||||
gdprintk(XENLOG_WARNING, "Trying to set reserved bit in "
|
||||
Index: xen-3.4.0-testing/xen/arch/x86/hvm/svm/svm.c
|
||||
Index: xen-3.4.1-testing/xen/arch/x86/hvm/svm/svm.c
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/arch/x86/hvm/svm/svm.c
|
||||
+++ xen-3.4.0-testing/xen/arch/x86/hvm/svm/svm.c
|
||||
--- xen-3.4.1-testing.orig/xen/arch/x86/hvm/svm/svm.c
|
||||
+++ xen-3.4.1-testing/xen/arch/x86/hvm/svm/svm.c
|
||||
@@ -53,6 +53,11 @@
|
||||
|
||||
u32 svm_feature_flags;
|
||||
@@ -45,7 +45,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/svm/svm.c
|
||||
#define set_segment_register(name, value) \
|
||||
asm volatile ( "movw %%ax ,%%" STR(name) "" : : "a" (value) )
|
||||
|
||||
@@ -875,6 +880,22 @@ int start_svm(struct cpuinfo_x86 *c)
|
||||
@@ -869,6 +874,22 @@ static int svm_cpu_up(struct cpuinfo_x86
|
||||
/* Initialize core's ASID handling. */
|
||||
svm_asid_init(c);
|
||||
|
||||
@@ -65,13 +65,13 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/svm/svm.c
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if ( cpu != 0 )
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
Index: xen-3.4.0-testing/xen/include/asm-x86/hvm/hvm.h
|
||||
Index: xen-3.4.1-testing/xen/include/asm-x86/hvm/hvm.h
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/include/asm-x86/hvm/hvm.h
|
||||
+++ xen-3.4.0-testing/xen/include/asm-x86/hvm/hvm.h
|
||||
--- xen-3.4.1-testing.orig/xen/include/asm-x86/hvm/hvm.h
|
||||
+++ xen-3.4.1-testing/xen/include/asm-x86/hvm/hvm.h
|
||||
@@ -134,6 +134,12 @@ struct hvm_function_table {
|
||||
extern struct hvm_function_table hvm_funcs;
|
||||
extern int hvm_enabled;
|
||||
|
Reference in New Issue
Block a user