From: Jan Beulich Date: Tue, 3 Jan 2017 08:44:43 +0000 (+0100) Subject: x86/HVM: constify VMFUNC emulation hook X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3070 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6d9d597713ad8ef1d83d6479f5864818a177db20;p=xen.git x86/HVM: constify VMFUNC emulation hook ... to clarify that the register state does not get altered (behind the back of the emulator). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 68db0cb645..15d66a279c 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2006,7 +2006,7 @@ static void vmx_vcpu_update_vmfunc_ve(struct vcpu *v) vmx_vmcs_exit(v); } -static int vmx_vcpu_emulate_vmfunc(struct cpu_user_regs *regs) +static int vmx_vcpu_emulate_vmfunc(const struct cpu_user_regs *regs) { int rc = X86EMUL_EXCEPTION; struct vcpu *curr = current; diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 9817646304..8c95c08559 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -208,7 +208,7 @@ struct hvm_function_table { void (*altp2m_vcpu_update_p2m)(struct vcpu *v); void (*altp2m_vcpu_update_vmfunc_ve)(struct vcpu *v); bool_t (*altp2m_vcpu_emulate_ve)(struct vcpu *v); - int (*altp2m_vcpu_emulate_vmfunc)(struct cpu_user_regs *regs); + int (*altp2m_vcpu_emulate_vmfunc)(const struct cpu_user_regs *regs); /* * Parameters and callbacks for hardware-assisted TSC scaling,