From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takuya Yoshikawa Subject: [PATCH 02/10] KVM: x86 emulator: Rename emulate_xxx() to em_xxx() Date: Sun, 29 May 2011 21:55:10 +0900 Message-ID: <20110529215510.05cdbe5e.takuya.yoshikawa@gmail.com> References: <20110529215200.17be7761.takuya.yoshikawa@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, yoshikawa.takuya@oss.ntt.co.jp, gleb@redhat.com To: avi@redhat.com, mtosatti@redhat.com Return-path: Received: from mail-pz0-f46.google.com ([209.85.210.46]:38420 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753290Ab1E2MzO (ORCPT ); Sun, 29 May 2011 08:55:14 -0400 Received: by pzk9 with SMTP id 9so1292085pzk.19 for ; Sun, 29 May 2011 05:55:13 -0700 (PDT) In-Reply-To: <20110529215200.17be7761.takuya.yoshikawa@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: From: Takuya Yoshikawa The next patch will change these to be called by opcode::execute. Signed-off-by: Takuya Yoshikawa --- arch/x86/kvm/emulate.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index c9fc539..756cbbd 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -1654,7 +1654,7 @@ static int emulate_iret_real(struct x86_emulate_ctxt *ctxt) return rc; } -static int emulate_iret(struct x86_emulate_ctxt *ctxt) +static int em_iret(struct x86_emulate_ctxt *ctxt) { switch(ctxt->mode) { case X86EMUL_MODE_REAL: @@ -1814,7 +1814,7 @@ static int em_grp9(struct x86_emulate_ctxt *ctxt) return X86EMUL_CONTINUE; } -static int emulate_ret_far(struct x86_emulate_ctxt *ctxt) +static int em_ret_far(struct x86_emulate_ctxt *ctxt) { struct decode_cache *c = &ctxt->decode; int rc; @@ -1878,7 +1878,7 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt, ss->p = 1; } -static int emulate_syscall(struct x86_emulate_ctxt *ctxt) +static int em_syscall(struct x86_emulate_ctxt *ctxt) { struct decode_cache *c = &ctxt->decode; struct x86_emulate_ops *ops = ctxt->ops; @@ -1931,7 +1931,7 @@ static int emulate_syscall(struct x86_emulate_ctxt *ctxt) return X86EMUL_CONTINUE; } -static int emulate_sysenter(struct x86_emulate_ctxt *ctxt) +static int em_sysenter(struct x86_emulate_ctxt *ctxt) { struct decode_cache *c = &ctxt->decode; struct x86_emulate_ops *ops = ctxt->ops; @@ -1987,7 +1987,7 @@ static int emulate_sysenter(struct x86_emulate_ctxt *ctxt) return X86EMUL_CONTINUE; } -static int emulate_sysexit(struct x86_emulate_ctxt *ctxt) +static int em_sysexit(struct x86_emulate_ctxt *ctxt) { struct decode_cache *c = &ctxt->decode; struct x86_emulate_ops *ops = ctxt->ops; @@ -3932,7 +3932,7 @@ special_insn: rc = emulate_load_segment(ctxt, VCPU_SREG_DS); break; case 0xcb: /* ret far */ - rc = emulate_ret_far(ctxt); + rc = em_ret_far(ctxt); break; case 0xcc: /* int3 */ irq = 3; @@ -3949,7 +3949,7 @@ special_insn: } break; case 0xcf: /* iret */ - rc = emulate_iret(ctxt); + rc = em_iret(ctxt); break; case 0xd0 ... 0xd1: /* Grp2 */ rc = em_grp2(ctxt); @@ -4113,7 +4113,7 @@ done: twobyte_insn: switch (c->b) { case 0x05: /* syscall */ - rc = emulate_syscall(ctxt); + rc = em_syscall(ctxt); break; case 0x06: rc = em_clts(ctxt); @@ -4175,10 +4175,10 @@ twobyte_insn: rc = X86EMUL_CONTINUE; break; case 0x34: /* sysenter */ - rc = emulate_sysenter(ctxt); + rc = em_sysenter(ctxt); break; case 0x35: /* sysexit */ - rc = emulate_sysexit(ctxt); + rc = em_sysexit(ctxt); break; case 0x40 ... 0x4f: /* cmov */ c->dst.val = c->dst.orig_val = c->src.val; -- 1.7.4.1