[Xen-changelog] [xen stable-4.6] x86: make debug output consistent in hvm_set_callback_via

[patchbot@xxxxxxx]

commit eb32a519f5945dc7465f1f4f555e2dd9654250b7
Author:     Malcolm Crossley <malcolm.crossley@xxxxxxxxxx>
AuthorDate: Mon Dec 21 14:07:36 2015 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Dec 21 14:07:36 2015 +0100

    x86: make debug output consistent in hvm_set_callback_via
    
    The unconditional printks in the switch statement of the
    hvm_set_callback_via function results in Xen log spam in non debug
    versions of Xen. The printks are for debug output only so conditionally
    compile the entire switch statement on debug versions of Xen only.
    
    This is XSA-169.
    
    Signed-off-by: Malcolm Crossley <malcolm.crossley@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    master commit: 5c1048565ba5b240f47203bdb67572bee73d639e
    master date: 2015-12-21 13:40:48 +0100
---
 xen/arch/x86/hvm/irq.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index 50fcf73..ed05970 100644
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -382,7 +382,8 @@ void hvm_set_callback_via(struct domain *d, uint64_t via)
 
     spin_unlock(&d->arch.hvm_domain.irq_lock);
 
-    dprintk(XENLOG_G_INFO, "Dom%u callback via changed to ", d->domain_id);
+#ifndef NDEBUG
+    printk(XENLOG_G_INFO "Dom%u callback via changed to ", d->domain_id);
     switch ( via_type )
     {
     case HVMIRQ_callback_gsi:
@@ -398,6 +399,7 @@ void hvm_set_callback_via(struct domain *d, uint64_t via)
         printk("None\n");
         break;
     }
+#endif
 }
 
 struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v)
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

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