[Xen-changelog] [xen staging] x86/oprofile: put SVM only code under CONFIG_HVM

[patchbot@xxxxxxx]

commit 1385a14bfc09672513cb5bf9baafa881c8d93542
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Fri Aug 17 16:12:41 2018 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Tue Aug 21 15:17:14 2018 +0100

    x86/oprofile: put SVM only code under CONFIG_HVM
    
    The code snippet in question is to detect NMI held by SVM until STGI
    is called. When Xen doesn't even support HVM guests there is no need
    to check svm_stgi_label.
    
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/oprofile/op_model_athlon.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/oprofile/op_model_athlon.c 
b/xen/arch/x86/oprofile/op_model_athlon.c
index 2d3763cfad..3d6e26f636 100644
--- a/xen/arch/x86/oprofile/op_model_athlon.c
+++ b/xen/arch/x86/oprofile/op_model_athlon.c
@@ -319,9 +319,11 @@ static int athlon_check_ctrs(unsigned int const cpu,
        unsigned long eip = regs->rip;
        int mode = 0;
        struct vcpu *v = current;
-       struct cpu_user_regs *guest_regs = guest_cpu_user_regs();
        unsigned int const nr_ctrs = model->num_counters;
 
+#if CONFIG_HVM
+       struct cpu_user_regs *guest_regs = guest_cpu_user_regs();
+
        if (!guest_mode(regs) &&
            (eip == (unsigned long)svm_stgi_label)) {
                /* SVM guest was running when NMI occurred */
@@ -329,6 +331,7 @@ static int athlon_check_ctrs(unsigned int const cpu,
                eip = guest_regs->rip;
                mode = xenoprofile_get_mode(v, guest_regs);
        } else
+#endif
                mode = xenoprofile_get_mode(v, regs);
 
        for (i = 0 ; i < nr_ctrs; ++i) {
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog