From 6b5f162071a0045ee18eb4e0e775962d5f5151f8 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 30 May 2013 13:22:39 +0200
Subject: [PATCH] --- yaml --- r: 376607 b: refs/heads/master c:
 103f98ea64a1b0a67d8a1b23070b4db3533db2b8 h: refs/heads/master i:   376605:
 1a9bf15bdf495a6d5d2d98d8833f609660f29890   376603:
 aa1ca50e0dd27b1fd9ab60c889f6da8091d68760   376599:
 2979c52c77e09c69773cf4f868f9342ebf956058   376591:
 86446bbc84a5092077bcecf752bcb04f159a341b   376575:
 e7a9d99e6b686700eb79e676652ae574dc74b928 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kvm/emulate.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e06177410b33..b3a0f5bac877 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4cb9df5d1f79950b34e78ec5d1b1b59d6e9c7b7
+refs/heads/master: 103f98ea64a1b0a67d8a1b23070b4db3533db2b8
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index 8db0010ed150..0f42c2a48166 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -3997,7 +3997,8 @@ static const struct opcode twobyte_table[256] = {
 	DI(ImplicitOps | Priv, invd), DI(ImplicitOps | Priv, wbinvd), N, N,
 	N, D(ImplicitOps | ModRM), N, N,
 	/* 0x10 - 0x1F */
-	N, N, N, N, N, N, N, N, D(ImplicitOps | ModRM), N, N, N, N, N, N, N,
+	N, N, N, N, N, N, N, N,
+	D(ImplicitOps | ModRM), N, N, N, N, N, N, D(ImplicitOps | ModRM),
 	/* 0x20 - 0x2F */
 	DIP(ModRM | DstMem | Priv | Op3264, cr_read, check_cr_read),
 	DIP(ModRM | DstMem | Priv | Op3264, dr_read, check_dr_read),
@@ -4836,6 +4837,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 	case 0x08:		/* invd */
 	case 0x0d:		/* GrpP (prefetch) */
 	case 0x18:		/* Grp16 (prefetch/nop) */
+	case 0x1f:		/* nop */
 		break;
 	case 0x20: /* mov cr, reg */
 		ctxt->dst.val = ops->get_cr(ctxt, ctxt->modrm_reg);