diff options
author | Amit Shah <amit.shah@redhat.com> | 2009-03-23 17:51:29 -0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-02 10:57:08 -0700 |
commit | 11cccb1f39e3607ea776b512c2258229cbaf855b (patch) | |
tree | ac8a8b43e8375020954343fc1152cbd2d56c0ad6 | |
parent | 6ccf86c186a8c02b7d30015145259b65d92972cd (diff) |
KVM: x86 emulator: Fix handling of VMMCALL instruction
(cherry picked from fbce554e940a983d005e29849636d0ef54b3eb18)
The VMMCALL instruction doesn't get recognised and isn't processed
by the emulator.
This is seen on an Intel host that tries to execute the VMMCALL
instruction after a guest live migrates from an AMD host.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | arch/x86/kvm/x86_emulate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c index ea051173b0d..a958c0e75d4 100644 --- a/arch/x86/kvm/x86_emulate.c +++ b/arch/x86/kvm/x86_emulate.c @@ -299,7 +299,7 @@ static u16 group_table[] = { static u16 group2_table[] = { [Group7*8] = - SrcNone | ModRM, 0, 0, 0, + SrcNone | ModRM, 0, 0, SrcNone | ModRM, SrcNone | ModRM | DstMem | Mov, 0, SrcMem16 | ModRM | Mov, 0, }; |