diff options
author | Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp> | 2011-05-29 08:55:10 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-07-12 06:15:58 -0400 |
commit | e01991e71a179ddab494c8e02100ad73bc0010c4 (patch) | |
tree | 3ffb2330bf79b5d45bdeb82be3492e249a1ddd82 /arch | |
parent | 9d74191ab1ea857d1cc27e439316eebf8ae46d19 (diff) |
KVM: x86 emulator: Rename emulate_xxx() to em_xxx()
The next patch will change these to be called by opcode::execute.
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r-- | 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 6c054f847319..4af94424fe87 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c | |||
@@ -1656,7 +1656,7 @@ static int emulate_iret_real(struct x86_emulate_ctxt *ctxt) | |||
1656 | return rc; | 1656 | return rc; |
1657 | } | 1657 | } |
1658 | 1658 | ||
1659 | static int emulate_iret(struct x86_emulate_ctxt *ctxt) | 1659 | static int em_iret(struct x86_emulate_ctxt *ctxt) |
1660 | { | 1660 | { |
1661 | switch(ctxt->mode) { | 1661 | switch(ctxt->mode) { |
1662 | case X86EMUL_MODE_REAL: | 1662 | case X86EMUL_MODE_REAL: |
@@ -1816,7 +1816,7 @@ static int em_grp9(struct x86_emulate_ctxt *ctxt) | |||
1816 | return X86EMUL_CONTINUE; | 1816 | return X86EMUL_CONTINUE; |
1817 | } | 1817 | } |
1818 | 1818 | ||
1819 | static int emulate_ret_far(struct x86_emulate_ctxt *ctxt) | 1819 | static int em_ret_far(struct x86_emulate_ctxt *ctxt) |
1820 | { | 1820 | { |
1821 | struct decode_cache *c = &ctxt->decode; | 1821 | struct decode_cache *c = &ctxt->decode; |
1822 | int rc; | 1822 | int rc; |
@@ -1880,7 +1880,7 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt, | |||
1880 | ss->p = 1; | 1880 | ss->p = 1; |
1881 | } | 1881 | } |
1882 | 1882 | ||
1883 | static int emulate_syscall(struct x86_emulate_ctxt *ctxt) | 1883 | static int em_syscall(struct x86_emulate_ctxt *ctxt) |
1884 | { | 1884 | { |
1885 | struct decode_cache *c = &ctxt->decode; | 1885 | struct decode_cache *c = &ctxt->decode; |
1886 | struct x86_emulate_ops *ops = ctxt->ops; | 1886 | struct x86_emulate_ops *ops = ctxt->ops; |
@@ -1933,7 +1933,7 @@ static int emulate_syscall(struct x86_emulate_ctxt *ctxt) | |||
1933 | return X86EMUL_CONTINUE; | 1933 | return X86EMUL_CONTINUE; |
1934 | } | 1934 | } |
1935 | 1935 | ||
1936 | static int emulate_sysenter(struct x86_emulate_ctxt *ctxt) | 1936 | static int em_sysenter(struct x86_emulate_ctxt *ctxt) |
1937 | { | 1937 | { |
1938 | struct decode_cache *c = &ctxt->decode; | 1938 | struct decode_cache *c = &ctxt->decode; |
1939 | struct x86_emulate_ops *ops = ctxt->ops; | 1939 | struct x86_emulate_ops *ops = ctxt->ops; |
@@ -1989,7 +1989,7 @@ static int emulate_sysenter(struct x86_emulate_ctxt *ctxt) | |||
1989 | return X86EMUL_CONTINUE; | 1989 | return X86EMUL_CONTINUE; |
1990 | } | 1990 | } |
1991 | 1991 | ||
1992 | static int emulate_sysexit(struct x86_emulate_ctxt *ctxt) | 1992 | static int em_sysexit(struct x86_emulate_ctxt *ctxt) |
1993 | { | 1993 | { |
1994 | struct decode_cache *c = &ctxt->decode; | 1994 | struct decode_cache *c = &ctxt->decode; |
1995 | struct x86_emulate_ops *ops = ctxt->ops; | 1995 | struct x86_emulate_ops *ops = ctxt->ops; |
@@ -3948,7 +3948,7 @@ special_insn: | |||
3948 | rc = emulate_load_segment(ctxt, VCPU_SREG_DS); | 3948 | rc = emulate_load_segment(ctxt, VCPU_SREG_DS); |
3949 | break; | 3949 | break; |
3950 | case 0xcb: /* ret far */ | 3950 | case 0xcb: /* ret far */ |
3951 | rc = emulate_ret_far(ctxt); | 3951 | rc = em_ret_far(ctxt); |
3952 | break; | 3952 | break; |
3953 | case 0xcc: /* int3 */ | 3953 | case 0xcc: /* int3 */ |
3954 | irq = 3; | 3954 | irq = 3; |
@@ -3965,7 +3965,7 @@ special_insn: | |||
3965 | } | 3965 | } |
3966 | break; | 3966 | break; |
3967 | case 0xcf: /* iret */ | 3967 | case 0xcf: /* iret */ |
3968 | rc = emulate_iret(ctxt); | 3968 | rc = em_iret(ctxt); |
3969 | break; | 3969 | break; |
3970 | case 0xd0 ... 0xd1: /* Grp2 */ | 3970 | case 0xd0 ... 0xd1: /* Grp2 */ |
3971 | rc = em_grp2(ctxt); | 3971 | rc = em_grp2(ctxt); |
@@ -4127,7 +4127,7 @@ done: | |||
4127 | twobyte_insn: | 4127 | twobyte_insn: |
4128 | switch (c->b) { | 4128 | switch (c->b) { |
4129 | case 0x05: /* syscall */ | 4129 | case 0x05: /* syscall */ |
4130 | rc = emulate_syscall(ctxt); | 4130 | rc = em_syscall(ctxt); |
4131 | break; | 4131 | break; |
4132 | case 0x06: | 4132 | case 0x06: |
4133 | rc = em_clts(ctxt); | 4133 | rc = em_clts(ctxt); |
@@ -4189,10 +4189,10 @@ twobyte_insn: | |||
4189 | rc = X86EMUL_CONTINUE; | 4189 | rc = X86EMUL_CONTINUE; |
4190 | break; | 4190 | break; |
4191 | case 0x34: /* sysenter */ | 4191 | case 0x34: /* sysenter */ |
4192 | rc = emulate_sysenter(ctxt); | 4192 | rc = em_sysenter(ctxt); |
4193 | break; | 4193 | break; |
4194 | case 0x35: /* sysexit */ | 4194 | case 0x35: /* sysexit */ |
4195 | rc = emulate_sysexit(ctxt); | 4195 | rc = em_sysexit(ctxt); |
4196 | break; | 4196 | break; |
4197 | case 0x40 ... 0x4f: /* cmov */ | 4197 | case 0x40 ... 0x4f: /* cmov */ |
4198 | c->dst.val = c->dst.orig_val = c->src.val; | 4198 | c->dst.val = c->dst.orig_val = c->src.val; |