From: Paul Durrant <paul.durrant@citrix.com>
Date: Fri, 25 Nov 2011 15:48:03 +0000 (+0000)
Subject: hvm/viridian: Ditch the extra assertions/warnings for non-viridian guests.
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0f90f42770b3f4e4736c288fc5846d0209e5e9ae;p=xen.git

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

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;