Quantcast

[xen master] VMX: constrain vmx_intr_assist() debugging code to debug builds

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[xen master] VMX: constrain vmx_intr_assist() debugging code to debug builds

patchbot
commit d595e126c96976d056d7877e4319b3f2f3d246b1
Author:     Jan Beulich <[hidden email]>
AuthorDate: Mon May 8 13:36:28 2017 +0200
Commit:     Jan Beulich <[hidden email]>
CommitDate: Mon May 8 13:36:28 2017 +0200

    VMX: constrain vmx_intr_assist() debugging code to debug builds
   
    This is because that code, added by commit 997382b771 ("y86/vmx: dump
    PIR and vIRR before ASSERT()"), was meant to be removed by the time we
    finalize 4.9, but the root cause of the ASSERT() wrongly(?) triggering
    still wasn't found.
   
    Take the opportunity and also correct the format specifiers, which I
    had got wrong when editing said change while committing.
   
    Signed-off-by: Jan Beulich <[hidden email]>
    Acked-by: Kevin Tian <[hidden email]>
    Release-Acked-by: Julien Grall <[hidden email]>
---
 xen/arch/x86/hvm/vmx/intr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c
index 1eb9f38..e1d0190 100644
--- a/xen/arch/x86/hvm/vmx/intr.c
+++ b/xen/arch/x86/hvm/vmx/intr.c
@@ -318,6 +318,7 @@ void vmx_intr_assist(void)
         */
         if ( pt_vector != -1 )
         {
+#ifndef NDEBUG
             /*
              * We assert that intack.vector is the highest priority vector for
              * only an interrupt from vlapic can reach this point and the
@@ -334,7 +335,7 @@ void vmx_intr_assist(void)
                 const uint32_t *word;
                 unsigned int i;
 
-                printk(XENLOG_ERR "%pv: intack: %02x:%u pt: %02x\n",
+                printk(XENLOG_ERR "%pv: intack: %u:%02x pt: %02x\n",
                        current, intack.source, intack.vector, pt_vector);
 
                 vlapic = vcpu_vlapic(v);
@@ -357,6 +358,7 @@ void vmx_intr_assist(void)
                     printk("\n");
                 }
             }
+#endif
             ASSERT(intack.vector >= pt_vector);
             vmx_set_eoi_exit_bitmap(v, intack.vector);
         }
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog
Loading...