From: Takuya Yoshikawa <takuya.yoshikawa@gmail.com>
To: avi@redhat.com, mtosatti@redhat.com
Cc: kvm@vger.kernel.org, yoshikawa.takuya@oss.ntt.co.jp, gleb@redhat.com
Subject: [PATCH 02/10] KVM: x86 emulator: Rename emulate_xxx() to em_xxx()
Date: Sun, 29 May 2011 21:55:10 +0900 [thread overview]
Message-ID: <20110529215510.05cdbe5e.takuya.yoshikawa@gmail.com> (raw)
In-Reply-To: <20110529215200.17be7761.takuya.yoshikawa@gmail.com>
From: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
The next patch will change these to be called by opcode::execute.
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
---
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
next prev parent reply other threads:[~2011-05-29 12:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-29 12:52 [PATCH 00/10] KVM: x86 emulator: Some cleanups and conversion to opcode::execute Takuya Yoshikawa
2011-05-29 12:53 ` [PATCH 01/10] KVM: x86 emulator: Use the pointers ctxt and c consistently Takuya Yoshikawa
2011-05-29 12:55 ` Takuya Yoshikawa [this message]
2011-05-29 12:56 ` [PATCH 03/10] KVM: x86 emulator: Use opcode::execute for some instructions Takuya Yoshikawa
2011-05-29 12:57 ` [PATCH 04/10] KVM: x86 emulator: Use opcode::execute for TEST(84/85, A8/A9) Takuya Yoshikawa
2011-05-29 12:59 ` [PATCH 05/10] KVM: x86 emulator: Use opcode::execute for XCHG(86/87) Takuya Yoshikawa
2011-05-29 13:00 ` [PATCH 06/10] KVM: x86 emulator: Use opcode::execute for RET(C3) Takuya Yoshikawa
2011-05-29 13:01 ` [PATCH 07/10] KVM: x86 emulator: Use opcode::execute for MOV(8C/8E) Takuya Yoshikawa
2011-05-29 13:02 ` [PATCH 08/10] KVM: x86 emulator: Clean up INT n/INTO/INT 3(CC/CD/CE) Takuya Yoshikawa
2011-05-29 13:04 ` [PATCH 09/10] KVM: x86 emulator: Use opcode::execute for LOOP/JCXZ Takuya Yoshikawa
2011-05-29 13:05 ` [PATCH 10/10] KVM: x86 emulator: Use opcode::execute for CLI/STI(FA/FB) Takuya Yoshikawa
2011-05-31 18:33 ` [PATCH 00/10] KVM: x86 emulator: Some cleanups and conversion to opcode::execute Marcelo Tosatti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110529215510.05cdbe5e.takuya.yoshikawa@gmail.com \
--to=takuya.yoshikawa@gmail.com \
--cc=avi@redhat.com \
--cc=gleb@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=yoshikawa.takuya@oss.ntt.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox