KVM: x86 emulator: convert group 1A to new style

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 6cc4af1b59ff0e48d4762e2ff137ca2715277a48..618fdc8c8d06e3b879e042e80b17b5d31f9f23b5 100644 (file)
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -105,7 +105,7 @@
 #define X16(x) X8(x), X8(x)
 
 enum {
-       NoGrp, Group1A, Group3, Group4, Group5, Group7, Group8, Group9,
+       NoGrp, Group3, Group4, Group5, Group7, Group8, Group9,
 };
 
 struct opcode {
@@ -130,9 +130,11 @@ static struct opcode group1[] = {
        X7(D(Lock)), N
 };
 
-static struct opcode group_table[] = {
-       [Group1A*8] =
+static struct opcode group1A[] = {
        D(DstMem | SrcNone | ModRM | Mov | Stack), N, N, N, N, N, N, N,
+};
+
+static struct opcode group_table[] = {
        [Group3*8] =
        D(DstMem | SrcImm | ModRM), D(DstMem | SrcImm | ModRM),
        D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock),
@@ -231,7 +233,7 @@ static struct opcode opcode_table[256] = {
        D(ByteOp | DstMem | SrcReg | ModRM | Mov), D(DstMem | SrcReg | ModRM | Mov),
        D(ByteOp | DstReg | SrcMem | ModRM | Mov), D(DstReg | SrcMem | ModRM | Mov),
        D(DstMem | SrcNone | ModRM | Mov), D(ModRM | DstReg),
-       D(ImplicitOps | SrcMem16 | ModRM), D(Group | Group1A),
+       D(ImplicitOps | SrcMem16 | ModRM), G(0, group1A),
        /* 0x90 - 0x97 */
        D(DstReg), D(DstReg), D(DstReg), D(DstReg),     D(DstReg), D(DstReg), D(DstReg), D(DstReg),
        /* 0x98 - 0x9F */