diff options
author | Paul Durrant <paul.durrant@citrix.com> | 2011-11-25 15:48:03 +0000 |
---|---|---|
committer | Paul Durrant <paul.durrant@citrix.com> | 2011-11-25 15:48:03 +0000 |
commit | 0f90f42770b3f4e4736c288fc5846d0209e5e9ae (patch) | |
tree | 01ece1f873a82b4812aca7d90cd39cab577940d4 /xen/arch/x86/hvm/viridian.c | |
parent | 26ddefddf050f692444bde22226f9726556c5a20 (diff) | |
download | xen-0f90f42770b3f4e4736c288fc5846d0209e5e9ae.tar.gz xen-0f90f42770b3f4e4736c288fc5846d0209e5e9ae.tar.bz2 xen-0f90f42770b3f4e4736c288fc5846d0209e5e9ae.zip |
hvm/viridian: Ditch the extra assertions/warnings for non-viridian guests.
Consensus is they are over-aggressive.
Signed-off-by: Keir Fraser <keir@xen.org>
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Diffstat (limited to 'xen/arch/x86/hvm/viridian.c')
-rw-r--r-- | xen/arch/x86/hvm/viridian.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 6a7067c835..6d3b899d2e 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -206,11 +206,8 @@ int wrmsr_viridian_regs(uint32_t idx, uint64_t val) struct vcpu *v = current; struct domain *d = v->domain; - if ( !is_viridian_domain(d) ) { - gdprintk(XENLOG_WARNING, "%s: %d not a viridian domain\n", __func__, - d->domain_id); + if ( !is_viridian_domain(d) ) return 0; - } switch ( idx ) { @@ -274,11 +271,8 @@ int rdmsr_viridian_regs(uint32_t idx, uint64_t *val) struct vcpu *v = current; struct domain *d = v->domain; - if ( !is_viridian_domain(d) ) { - gdprintk(XENLOG_WARNING, "%s: %d not a viridian domain\n", __func__, - d->domain_id); + if ( !is_viridian_domain(d) ) return 0; - } switch ( idx ) { @@ -417,8 +411,6 @@ static int viridian_load_domain_ctxt(struct domain *d, hvm_domain_context_t *h) if ( hvm_load_entry(VIRIDIAN_DOMAIN, h, &ctxt) != 0 ) return -EINVAL; - ASSERT(is_viridian_domain(d)); - d->arch.hvm_domain.viridian.hypercall_gpa.raw = ctxt.hypercall_gpa; d->arch.hvm_domain.viridian.guest_os_id.raw = ctxt.guest_os_id; @@ -463,8 +455,6 @@ static int viridian_load_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h) if ( hvm_load_entry(VIRIDIAN_VCPU, h, &ctxt) != 0 ) return -EINVAL; - ASSERT(is_viridian_domain(d)); - v->arch.hvm_vcpu.viridian.apic_assist.raw = ctxt.apic_assist; return 0; |