[Xen-devel] [PATCH 23/34] x86/oprofile: put SVM only code under CONFIG_HVM

[Wei Liu <wei.liu2@xxxxxxxxxx>]

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>
---
 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 2d3763c..3d6e26f 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) {
-- 
git-series 0.9.1

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel