From: Jan Beulich Date: Wed, 7 Dec 2016 12:54:41 +0000 (+0100) Subject: x86/HVM: drop hvm_emulate_one_no_write() X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3254 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=56673a8eb7c90d8fbe2a69a3b52a6f5fc8194d6a;p=xen.git x86/HVM: drop hvm_emulate_one_no_write() It was pointlessly non-static, and being static and a simple wrapper it can as well be folded into its single caller. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant Reviewed-by: Andrew Cooper --- diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index f4c57475f3..ebd59edb63 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -1776,12 +1776,6 @@ int hvm_emulate_one( return _hvm_emulate_one(hvmemul_ctxt, &hvm_emulate_ops); } -int hvm_emulate_one_no_write( - struct hvm_emulate_ctxt *hvmemul_ctxt) -{ - return _hvm_emulate_one(hvmemul_ctxt, &hvm_emulate_ops_no_write); -} - int hvm_emulate_one_mmio(unsigned long mfn, unsigned long gla) { static const struct x86_emulate_ops hvm_intercept_ops_mmcfg = { @@ -1841,7 +1835,7 @@ void hvm_emulate_one_vm_event(enum emul_kind kind, unsigned int trapnr, switch ( kind ) { case EMUL_KIND_NOWRITE: - rc = hvm_emulate_one_no_write(&ctx); + rc = _hvm_emulate_one(&ctx, &hvm_emulate_ops_no_write); break; case EMUL_KIND_SET_CONTEXT_INSN: { struct vcpu *curr = current; diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index d64d83468e..68a95e4527 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -43,8 +43,6 @@ enum emul_kind { int hvm_emulate_one( struct hvm_emulate_ctxt *hvmemul_ctxt); -int hvm_emulate_one_no_write( - struct hvm_emulate_ctxt *hvmemul_ctxt); void hvm_emulate_one_vm_event(enum emul_kind kind, unsigned int trapnr, unsigned int errcode);