This commit is contained in:
committed by
Git OBS Bridge
parent
616dfa112f
commit
b4c780fd71
@@ -1,8 +1,8 @@
|
||||
%patch
|
||||
Index: xen-3.4.0-testing/xen/include/asm-x86/hvm/domain.h
|
||||
Index: xen-3.4.1-testing/xen/include/asm-x86/hvm/domain.h
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/include/asm-x86/hvm/domain.h
|
||||
+++ xen-3.4.0-testing/xen/include/asm-x86/hvm/domain.h
|
||||
--- xen-3.4.1-testing.orig/xen/include/asm-x86/hvm/domain.h
|
||||
+++ xen-3.4.1-testing/xen/include/asm-x86/hvm/domain.h
|
||||
@@ -89,6 +89,7 @@ struct hvm_domain {
|
||||
struct vmx_domain vmx;
|
||||
struct svm_domain svm;
|
||||
@@ -11,10 +11,10 @@ Index: xen-3.4.0-testing/xen/include/asm-x86/hvm/domain.h
|
||||
};
|
||||
|
||||
#endif /* __ASM_X86_HVM_DOMAIN_H__ */
|
||||
Index: xen-3.4.0-testing/xen/arch/x86/hvm/Makefile
|
||||
Index: xen-3.4.1-testing/xen/arch/x86/hvm/Makefile
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/arch/x86/hvm/Makefile
|
||||
+++ xen-3.4.0-testing/xen/arch/x86/hvm/Makefile
|
||||
--- xen-3.4.1-testing.orig/xen/arch/x86/hvm/Makefile
|
||||
+++ xen-3.4.1-testing/xen/arch/x86/hvm/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
subdir-y += svm
|
||||
subdir-y += vmx
|
||||
@@ -22,10 +22,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/Makefile
|
||||
|
||||
obj-y += emulate.o
|
||||
obj-y += hvm.o
|
||||
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
|
||||
--- xen-3.4.1-testing.orig/xen/arch/x86/hvm/hvm.c
|
||||
+++ xen-3.4.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
@@ -46,6 +46,7 @@
|
||||
#include <asm/mc146818rtc.h>
|
||||
#include <asm/spinlock.h>
|
||||
@@ -136,10 +136,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
}
|
||||
|
||||
if ( rc == 0 )
|
||||
Index: xen-3.4.0-testing/xen/include/public/arch-x86/hvm/save.h
|
||||
Index: xen-3.4.1-testing/xen/include/public/arch-x86/hvm/save.h
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/include/public/arch-x86/hvm/save.h
|
||||
+++ xen-3.4.0-testing/xen/include/public/arch-x86/hvm/save.h
|
||||
--- xen-3.4.1-testing.orig/xen/include/public/arch-x86/hvm/save.h
|
||||
+++ xen-3.4.1-testing/xen/include/public/arch-x86/hvm/save.h
|
||||
@@ -432,9 +432,26 @@ struct hvm_viridian_context {
|
||||
|
||||
DECLARE_HVM_SAVE_TYPE(VIRIDIAN, 15, struct hvm_viridian_context);
|
||||
@@ -168,10 +168,10 @@ Index: xen-3.4.0-testing/xen/include/public/arch-x86/hvm/save.h
|
||||
+#define HVM_SAVE_CODE_MAX 17
|
||||
|
||||
#endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */
|
||||
Index: xen-3.4.0-testing/xen/arch/x86/hvm/vlapic.c
|
||||
Index: xen-3.4.1-testing/xen/arch/x86/hvm/vlapic.c
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/arch/x86/hvm/vlapic.c
|
||||
+++ xen-3.4.0-testing/xen/arch/x86/hvm/vlapic.c
|
||||
--- xen-3.4.1-testing.orig/xen/arch/x86/hvm/vlapic.c
|
||||
+++ xen-3.4.1-testing/xen/arch/x86/hvm/vlapic.c
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <asm/hvm/hvm.h>
|
||||
#include <asm/hvm/io.h>
|
||||
@@ -188,10 +188,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/vlapic.c
|
||||
|
||||
return X86EMUL_OKAY;
|
||||
}
|
||||
Index: xen-3.4.0-testing/xen/include/public/hvm/params.h
|
||||
Index: xen-3.4.1-testing/xen/include/public/hvm/params.h
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/include/public/hvm/params.h
|
||||
+++ xen-3.4.0-testing/xen/include/public/hvm/params.h
|
||||
--- xen-3.4.1-testing.orig/xen/include/public/hvm/params.h
|
||||
+++ xen-3.4.1-testing/xen/include/public/hvm/params.h
|
||||
@@ -106,6 +106,8 @@
|
||||
/* Boolean: Enable aligning all periodic vpts to reduce interrupts */
|
||||
#define HVM_PARAM_VPT_ALIGN 16
|
||||
|
Reference in New Issue
Block a user