[Xen-changelog] [xen master] x86/oprofile: use unambiguous register names

[patchbot@xxxxxxx]

commit 8d55e69d2da56c0e7d641eeb6b8fcb4e1af0d6f6
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Dec 21 16:59:13 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Dec 21 16:59:13 2016 +0100

    x86/oprofile: use unambiguous register names
    
    This is in preparation of eliminating the mis-naming of 64-bit fields
    with 32-bit register names (eflags instead of rflags etc).
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/oprofile/backtrace.c       |  2 +-
 xen/arch/x86/oprofile/op_model_athlon.c | 10 ++++------
 xen/arch/x86/oprofile/op_model_p4.c     |  2 +-
 xen/arch/x86/oprofile/op_model_ppro.c   |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/xen/arch/x86/oprofile/backtrace.c 
b/xen/arch/x86/oprofile/backtrace.c
index 94bd24c..f0fbb42 100644
--- a/xen/arch/x86/oprofile/backtrace.c
+++ b/xen/arch/x86/oprofile/backtrace.c
@@ -150,7 +150,7 @@ static int valid_hypervisor_stack(const struct frame_head 
*head,
 void xenoprof_backtrace(struct vcpu *vcpu, const struct cpu_user_regs *regs,
                        unsigned long depth, int mode)
 {
-    const struct frame_head *head = (void *)regs->ebp;
+    const struct frame_head *head = (void *)regs->rbp;
 
     if (mode > 1) {
         while (depth-- && valid_hypervisor_stack(head, regs))
diff --git a/xen/arch/x86/oprofile/op_model_athlon.c 
b/xen/arch/x86/oprofile/op_model_athlon.c
index c0a81ed..2d3763c 100644
--- a/xen/arch/x86/oprofile/op_model_athlon.c
+++ b/xen/arch/x86/oprofile/op_model_athlon.c
@@ -316,22 +316,20 @@ static int athlon_check_ctrs(unsigned int const cpu,
        uint64_t msr_content;
        int i;
        int ovf = 0;
-       unsigned long eip = regs->eip;
+       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 (!guest_mode(regs) &&
-           (regs->eip == (unsigned long)svm_stgi_label)) {
+           (eip == (unsigned long)svm_stgi_label)) {
                /* SVM guest was running when NMI occurred */
                ASSERT(is_hvm_vcpu(v));
-               eip = guest_regs->eip;
+               eip = guest_regs->rip;
                mode = xenoprofile_get_mode(v, guest_regs);
-       } else {
-               eip = regs->eip;
+       } else
                mode = xenoprofile_get_mode(v, regs);
-       }
 
        for (i = 0 ; i < nr_ctrs; ++i) {
                CTR_READ(msr_content, msrs, i);
diff --git a/xen/arch/x86/oprofile/op_model_p4.c 
b/xen/arch/x86/oprofile/op_model_p4.c
index 29fe3bc..b08ba53 100644
--- a/xen/arch/x86/oprofile/op_model_p4.c
+++ b/xen/arch/x86/oprofile/op_model_p4.c
@@ -617,7 +617,7 @@ static int p4_check_ctrs(unsigned int const cpu,
        uint64_t msr_content;
        int i;
        int ovf = 0;
-       unsigned long eip = regs->eip;
+       unsigned long eip = regs->rip;
        int mode = xenoprofile_get_mode(current, regs);
 
        stag = get_stagger();
diff --git a/xen/arch/x86/oprofile/op_model_ppro.c 
b/xen/arch/x86/oprofile/op_model_ppro.c
index 89649d0..72c504a 100644
--- a/xen/arch/x86/oprofile/op_model_ppro.c
+++ b/xen/arch/x86/oprofile/op_model_ppro.c
@@ -135,7 +135,7 @@ static int ppro_check_ctrs(unsigned int const cpu,
        u64 val;
        int i;
        int ovf = 0;
-       unsigned long eip = regs->eip;
+       unsigned long eip = regs->rip;
        int mode = xenoprofile_get_mode(current, regs);
        struct arch_msr_pair *msrs_content = vcpu_vpmu(current)->context;
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

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