We're about to turn the rdmsr() macro into a real function, at which point Eclair complains that we're now shadowing an identifer.
Rename rdmsr to is_rdmsr. No functional change. Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com> --- CC: Jan Beulich <jbeul...@suse.com> CC: Roger Pau Monné <roger....@citrix.com> --- xen/arch/x86/hvm/svm/svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 4fc6206edac0..90f19d98422a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2087,14 +2087,14 @@ static int cf_check svm_msr_write_intercept( static void svm_do_msr_access(struct cpu_user_regs *regs) { struct vcpu *curr = current; - bool rdmsr = curr->arch.hvm.svm.vmcb->exitinfo1 == 0; - int rc, inst_len = svm_get_insn_len(curr, rdmsr ? INSTR_RDMSR - : INSTR_WRMSR); + bool is_rdmsr = curr->arch.hvm.svm.vmcb->exitinfo1 == 0; + int rc, inst_len = svm_get_insn_len(curr, is_rdmsr ? INSTR_RDMSR + : INSTR_WRMSR); if ( inst_len == 0 ) return; - if ( rdmsr ) + if ( is_rdmsr ) { uint64_t msr_content = 0; -- 2.39.5