OBS User unknown
2009-07-04 11:09:00 +00:00
committed by Git OBS Bridge
parent 5be0f1bcb4
commit 616dfa112f
6 changed files with 42 additions and 1861 deletions

View File

@@ -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;