This commit is contained in:
parent
5be0f1bcb4
commit
616dfa112f
@ -34,7 +34,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
#include <asm/hvm/vpt.h>
|
||||
#include <asm/hvm/support.h>
|
||||
#include <asm/hvm/cacheattr.h>
|
||||
@@ -374,6 +375,7 @@ void hvm_domain_relinquish_resources(str
|
||||
@@ -377,6 +378,7 @@ void hvm_domain_relinquish_resources(str
|
||||
|
||||
void hvm_domain_destroy(struct domain *d)
|
||||
{
|
||||
@ -42,7 +42,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
hvm_funcs.domain_destroy(d);
|
||||
rtc_deinit(d);
|
||||
stdvga_deinit(d);
|
||||
@@ -674,8 +676,14 @@ int hvm_vcpu_initialise(struct vcpu *v)
|
||||
@@ -680,8 +682,14 @@ int hvm_vcpu_initialise(struct vcpu *v)
|
||||
{
|
||||
int rc;
|
||||
|
||||
@ -57,7 +57,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
|
||||
if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 )
|
||||
goto fail2;
|
||||
@@ -726,6 +734,7 @@ int hvm_vcpu_initialise(struct vcpu *v)
|
||||
@@ -732,6 +740,7 @@ int hvm_vcpu_initialise(struct vcpu *v)
|
||||
hvm_funcs.vcpu_destroy(v);
|
||||
fail2:
|
||||
vlapic_destroy(v);
|
||||
@ -65,7 +65,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
fail1:
|
||||
return rc;
|
||||
}
|
||||
@@ -733,6 +742,7 @@ int hvm_vcpu_initialise(struct vcpu *v)
|
||||
@@ -739,6 +748,7 @@ int hvm_vcpu_initialise(struct vcpu *v)
|
||||
void hvm_vcpu_destroy(struct vcpu *v)
|
||||
{
|
||||
tasklet_kill(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet);
|
||||
@ -73,7 +73,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
hvm_vcpu_cacheattr_destroy(v);
|
||||
vlapic_destroy(v);
|
||||
hvm_funcs.vcpu_destroy(v);
|
||||
@@ -1684,7 +1694,7 @@ void hvm_cpuid(unsigned int input, unsig
|
||||
@@ -1690,7 +1700,7 @@ void hvm_cpuid(unsigned int input, unsig
|
||||
return;
|
||||
|
||||
if ( cpuid_hypervisor_leaves(input, eax, ebx, ecx, edx) )
|
||||
@ -82,7 +82,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
|
||||
domain_cpuid(v->domain, input, *ecx, eax, ebx, ecx, edx);
|
||||
|
||||
@@ -1696,6 +1706,8 @@ void hvm_cpuid(unsigned int input, unsig
|
||||
@@ -1702,6 +1712,8 @@ void hvm_cpuid(unsigned int input, unsig
|
||||
if ( vlapic_hw_disabled(vcpu_vlapic(v)) )
|
||||
__clear_bit(X86_FEATURE_APIC & 31, edx);
|
||||
}
|
||||
@ -91,7 +91,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
}
|
||||
|
||||
void hvm_rdtsc_intercept(struct cpu_user_regs *regs)
|
||||
@@ -1795,6 +1807,8 @@ int hvm_msr_read_intercept(struct cpu_us
|
||||
@@ -1801,6 +1813,8 @@ int hvm_msr_read_intercept(struct cpu_us
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -100,7 +100,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
return hvm_funcs.msr_read_intercept(regs);
|
||||
}
|
||||
|
||||
@@ -1883,6 +1897,8 @@ int hvm_msr_write_intercept(struct cpu_u
|
||||
@@ -1889,6 +1903,8 @@ int hvm_msr_write_intercept(struct cpu_u
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -109,7 +109,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
return hvm_funcs.msr_write_intercept(regs);
|
||||
}
|
||||
|
||||
@@ -2050,6 +2066,10 @@ int hvm_do_hypercall(struct cpu_user_reg
|
||||
@@ -2056,6 +2072,10 @@ int hvm_do_hypercall(struct cpu_user_reg
|
||||
case 0:
|
||||
break;
|
||||
}
|
||||
@ -120,7 +120,7 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
|
||||
|
||||
if ( (eax & 0x80000000) && is_viridian_domain(curr->domain) )
|
||||
return viridian_hypercall(regs);
|
||||
@@ -2566,6 +2586,15 @@ long do_hvm_op(unsigned long op, XEN_GUE
|
||||
@@ -2572,6 +2592,15 @@ long do_hvm_op(unsigned long op, XEN_GUE
|
||||
rc = -EINVAL;
|
||||
|
||||
break;
|
||||
|
@ -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;
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f813543c4c975b9d0d95ecf2c4f8f08a8780673a45a1fd301ac2c225210da52c
|
||||
size 22573690
|
3
xen-3.4.1-testing-src.tar.bz2
Normal file
3
xen-3.4.1-testing-src.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b6bbe3ebbd1de1bdf1ba15bf8d62e6ef43ad3601836b1b117c38cde6a3c1abe6
|
||||
size 22571644
|
10
xen.changes
10
xen.changes
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 23 11:09:29 MDT 2009 - carnold@novell.com
|
||||
|
||||
- Update to Xen 3.4.1 RC4 c/s 19664.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:28:51 MDT 2009 - carnold@novell.com
|
||||
|
||||
- Update to Xen 3.4.1 RC3 c/s 19657.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 11 14:17:22 MDT 2009 - carnold@novell.com
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user