[Xen-changelog] [xen-unstable] hvm/viridian: Ditch the extra assertions/warnings for non-viridian guests.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Paul Durrant <paul.durrant@xxxxxxxxxx>
# Date 1322236083 0
# Node ID 96bbdc894224821fbc14a33e93b55688920c7fd2
# Parent  373bd877cac3a42482074a2d3393d0c78bef7e59
hvm/viridian: Ditch the extra assertions/warnings for non-viridian guests.

Consensus is they are over-aggressive.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
Signed-off-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
---


diff -r 373bd877cac3 -r 96bbdc894224 xen/arch/x86/hvm/viridian.c
--- a/xen/arch/x86/hvm/viridian.c       Fri Nov 25 15:30:41 2011 +0000
+++ b/xen/arch/x86/hvm/viridian.c       Fri Nov 25 15:48:03 2011 +0000
@@ -206,11 +206,8 @@
     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 @@
     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 @@
     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 @@
     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;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog