This commit is contained in:
committed by
Git OBS Bridge
parent
8a8c811c02
commit
5545adae8a
@@ -1,9 +1,9 @@
|
||||
%patch
|
||||
Index: xen-3.3.1-testing/xen/include/asm-x86/hvm/domain.h
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/xen/include/asm-x86/hvm/domain.h
|
||||
+++ xen-3.3.1-testing/xen/include/asm-x86/hvm/domain.h
|
||||
@@ -82,6 +82,7 @@ struct hvm_domain {
|
||||
--- xen-3.3.1-testing.orig/xen/include/asm-x86/hvm/domain.h 2009-01-05 13:27:58.000000000 -0700
|
||||
+++ xen-3.3.1-testing/xen/include/asm-x86/hvm/domain.h 2009-01-22 13:23:44.000000000 -0700
|
||||
@@ -82,6 +82,7 @@
|
||||
struct vmx_domain vmx;
|
||||
struct svm_domain svm;
|
||||
};
|
||||
@@ -13,8 +13,8 @@ Index: xen-3.3.1-testing/xen/include/asm-x86/hvm/domain.h
|
||||
#endif /* __ASM_X86_HVM_DOMAIN_H__ */
|
||||
Index: xen-3.3.1-testing/xen/arch/x86/hvm/Makefile
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/xen/arch/x86/hvm/Makefile
|
||||
+++ xen-3.3.1-testing/xen/arch/x86/hvm/Makefile
|
||||
--- xen-3.3.1-testing.orig/xen/arch/x86/hvm/Makefile 2009-01-05 13:27:57.000000000 -0700
|
||||
+++ xen-3.3.1-testing/xen/arch/x86/hvm/Makefile 2009-01-22 13:23:44.000000000 -0700
|
||||
@@ -1,5 +1,6 @@
|
||||
subdir-y += svm
|
||||
subdir-y += vmx
|
||||
@@ -24,8 +24,8 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/Makefile
|
||||
obj-y += hvm.o
|
||||
Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/xen/arch/x86/hvm/hvm.c
|
||||
+++ xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
--- xen-3.3.1-testing.orig/xen/arch/x86/hvm/hvm.c 2009-01-05 13:27:57.000000000 -0700
|
||||
+++ xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c 2009-01-22 13:23:44.000000000 -0700
|
||||
@@ -44,6 +44,7 @@
|
||||
#include <asm/mc146818rtc.h>
|
||||
#include <asm/spinlock.h>
|
||||
@@ -34,7 +34,7 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
#include <asm/hvm/vpt.h>
|
||||
#include <asm/hvm/support.h>
|
||||
#include <asm/hvm/cacheattr.h>
|
||||
@@ -361,6 +362,7 @@ void hvm_domain_relinquish_resources(str
|
||||
@@ -361,6 +362,7 @@
|
||||
|
||||
void hvm_domain_destroy(struct domain *d)
|
||||
{
|
||||
@@ -42,7 +42,7 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
hvm_funcs.domain_destroy(d);
|
||||
rtc_deinit(d);
|
||||
stdvga_deinit(d);
|
||||
@@ -644,8 +646,14 @@ int hvm_vcpu_initialise(struct vcpu *v)
|
||||
@@ -644,8 +646,14 @@
|
||||
{
|
||||
int rc;
|
||||
|
||||
@@ -57,7 +57,7 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
|
||||
if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 )
|
||||
goto fail2;
|
||||
@@ -692,12 +700,14 @@ int hvm_vcpu_initialise(struct vcpu *v)
|
||||
@@ -692,12 +700,14 @@
|
||||
hvm_funcs.vcpu_destroy(v);
|
||||
fail2:
|
||||
vlapic_destroy(v);
|
||||
@@ -72,7 +72,7 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
hvm_vcpu_cacheattr_destroy(v);
|
||||
vlapic_destroy(v);
|
||||
hvm_funcs.vcpu_destroy(v);
|
||||
@@ -1645,7 +1655,7 @@ void hvm_cpuid(unsigned int input, unsig
|
||||
@@ -1645,7 +1655,7 @@
|
||||
struct vcpu *v = current;
|
||||
|
||||
if ( cpuid_hypervisor_leaves(input, eax, ebx, ecx, edx) )
|
||||
@@ -81,7 +81,7 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
|
||||
domain_cpuid(v->domain, input, *ecx, eax, ebx, ecx, edx);
|
||||
|
||||
@@ -1657,6 +1667,8 @@ void hvm_cpuid(unsigned int input, unsig
|
||||
@@ -1657,6 +1667,8 @@
|
||||
if ( vlapic_hw_disabled(vcpu_vlapic(v)) )
|
||||
__clear_bit(X86_FEATURE_APIC & 31, edx);
|
||||
}
|
||||
@@ -90,7 +90,7 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
}
|
||||
|
||||
void hvm_rdtsc_intercept(struct cpu_user_regs *regs)
|
||||
@@ -1747,6 +1759,8 @@ int hvm_msr_read_intercept(struct cpu_us
|
||||
@@ -1747,6 +1759,8 @@
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -99,7 +99,7 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
return hvm_funcs.msr_read_intercept(regs);
|
||||
}
|
||||
|
||||
@@ -1835,6 +1849,8 @@ int hvm_msr_write_intercept(struct cpu_u
|
||||
@@ -1835,6 +1849,8 @@
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -108,7 +108,7 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
return hvm_funcs.msr_write_intercept(regs);
|
||||
}
|
||||
|
||||
@@ -2002,6 +2018,10 @@ int hvm_do_hypercall(struct cpu_user_reg
|
||||
@@ -2002,6 +2018,10 @@
|
||||
case 0:
|
||||
break;
|
||||
}
|
||||
@@ -119,7 +119,7 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
|
||||
if ( (eax >= NR_hypercalls) || !hvm_hypercall32_table[eax] )
|
||||
{
|
||||
@@ -2503,6 +2523,15 @@ long do_hvm_op(unsigned long op, XEN_GUE
|
||||
@@ -2503,6 +2523,15 @@
|
||||
rc = -EINVAL;
|
||||
|
||||
break;
|
||||
@@ -137,9 +137,9 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/hvm.c
|
||||
if ( rc == 0 )
|
||||
Index: xen-3.3.1-testing/xen/include/public/arch-x86/hvm/save.h
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/xen/include/public/arch-x86/hvm/save.h
|
||||
+++ xen-3.3.1-testing/xen/include/public/arch-x86/hvm/save.h
|
||||
@@ -38,7 +38,7 @@ struct hvm_save_header {
|
||||
--- xen-3.3.1-testing.orig/xen/include/public/arch-x86/hvm/save.h 2009-01-05 13:27:58.000000000 -0700
|
||||
+++ xen-3.3.1-testing/xen/include/public/arch-x86/hvm/save.h 2009-01-23 08:35:50.000000000 -0700
|
||||
@@ -38,7 +38,7 @@
|
||||
uint32_t version; /* File format version */
|
||||
uint64_t changeset; /* Version of Xen that saved this file */
|
||||
uint32_t cpuid; /* CPUID[0x01][%eax] on the saving machine */
|
||||
@@ -148,7 +148,7 @@ Index: xen-3.3.1-testing/xen/include/public/arch-x86/hvm/save.h
|
||||
};
|
||||
|
||||
DECLARE_HVM_SAVE_TYPE(HEADER, 1, struct hvm_save_header);
|
||||
@@ -421,9 +421,22 @@ struct hvm_hw_mtrr {
|
||||
@@ -421,9 +421,23 @@
|
||||
|
||||
DECLARE_HVM_SAVE_TYPE(MTRR, 14, struct hvm_hw_mtrr);
|
||||
|
||||
@@ -163,6 +163,7 @@ Index: xen-3.3.1-testing/xen/include/public/arch-x86/hvm/save.h
|
||||
+struct hvm_hyperv_cpu {
|
||||
+ uint64_t control_msr;
|
||||
+ uint64_t version_msr;
|
||||
+ uint64_t pad[27]; //KYS: sles10 sp2 compatibility
|
||||
+};
|
||||
+DECLARE_HVM_SAVE_TYPE(HYPERV_CPU, 16, struct hvm_hyperv_cpu);
|
||||
/*
|
||||
@@ -174,8 +175,8 @@ Index: xen-3.3.1-testing/xen/include/public/arch-x86/hvm/save.h
|
||||
#endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */
|
||||
Index: xen-3.3.1-testing/xen/arch/x86/hvm/vlapic.c
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/xen/arch/x86/hvm/vlapic.c
|
||||
+++ xen-3.3.1-testing/xen/arch/x86/hvm/vlapic.c
|
||||
--- xen-3.3.1-testing.orig/xen/arch/x86/hvm/vlapic.c 2009-01-22 13:23:43.000000000 -0700
|
||||
+++ xen-3.3.1-testing/xen/arch/x86/hvm/vlapic.c 2009-01-22 13:23:44.000000000 -0700
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <asm/hvm/hvm.h>
|
||||
#include <asm/hvm/io.h>
|
||||
@@ -184,7 +185,7 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/vlapic.c
|
||||
#include <asm/hvm/vmx/vmx.h>
|
||||
#include <public/hvm/ioreq.h>
|
||||
#include <public/hvm/params.h>
|
||||
@@ -307,6 +308,7 @@ static int vlapic_accept_sipi(struct vcp
|
||||
@@ -307,6 +308,7 @@
|
||||
hvm_vcpu_reset_state(v, trampoline_vector << 8, 0);
|
||||
|
||||
vcpu_unpause(v);
|
||||
@@ -194,8 +195,8 @@ Index: xen-3.3.1-testing/xen/arch/x86/hvm/vlapic.c
|
||||
}
|
||||
Index: xen-3.3.1-testing/xen/include/public/hvm/params.h
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/xen/include/public/hvm/params.h
|
||||
+++ xen-3.3.1-testing/xen/include/public/hvm/params.h
|
||||
--- xen-3.3.1-testing.orig/xen/include/public/hvm/params.h 2009-01-05 13:27:58.000000000 -0700
|
||||
+++ xen-3.3.1-testing/xen/include/public/hvm/params.h 2009-01-22 13:23:44.000000000 -0700
|
||||
@@ -93,6 +93,8 @@
|
||||
/* ACPI S state: currently support S0 and S3 on x86. */
|
||||
#define HVM_PARAM_ACPI_S_STATE 14
|
||||
|
Reference in New Issue
Block a user