| Message ID | 5846C1690200007800125AA3@prv-mh.provo.novell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: 06 December 2016 12:47 > To: xen-devel <xen-devel@lists.xenproject.org> > Cc: Paul Durrant <Paul.Durrant@citrix.com> > Subject: [PATCH] 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 <jbeulich@suse.com> Reviewed-by: Paul Durrant <paul.durrant@citrix.com> > > --- a/xen/arch/x86/hvm/emulate.c > +++ b/xen/arch/x86/hvm/emulate.c > @@ -1775,12 +1775,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 = { > @@ -1840,7 +1834,7 @@ void hvm_emulate_one_vm_event(enum emul_ > 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; > --- 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); > >
On 06/12/16 12:47, Jan Beulich wrote: > 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 <jbeulich@suse.com> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -1775,12 +1775,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 = { @@ -1840,7 +1834,7 @@ void hvm_emulate_one_vm_event(enum emul_ 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; --- 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);