From 20ce7069c88a7e43e11684e4a31173cae22bbe37 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Wed, 13 Jun 2012 12:28:33 +0300
Subject: [PATCH] --- yaml --- r: 315891 b: refs/heads/master c:
 a14e579f224ba929fe2f1d9bbbff688ae67e2ec4 h: refs/heads/master i:   315889:
 a1a2caac31456269d24af53874d9182a3ae9d125   315887:
 77beab01a46587dd199e2dcfeee5e5727aac9fc6 v: v3

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

diff --git a/[refs] b/[refs]
index 95e236dca4bb..6344e62a543a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9299836e6379d5703826a540fb3c704223fac520
+refs/heads/master: a14e579f224ba929fe2f1d9bbbff688ae67e2ec4
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index cfa5cc30c1d9..7b575adaf1fd 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -3015,6 +3015,15 @@ static int em_mov_sreg_rm(struct x86_emulate_ctxt *ctxt)
 	return load_segment_descriptor(ctxt, sel, ctxt->modrm_reg);
 }
 
+static int em_lldt(struct x86_emulate_ctxt *ctxt)
+{
+	u16 sel = ctxt->src.val;
+
+	/* Disable writeback. */
+	ctxt->dst.type = OP_NONE;
+	return load_segment_descriptor(ctxt, sel, VCPU_SREG_LDTR);
+}
+
 static int em_invlpg(struct x86_emulate_ctxt *ctxt)
 {
 	int rc;
@@ -3560,7 +3569,7 @@ static struct opcode group5[] = {
 static struct opcode group6[] = {
 	DI(Prot,	sldt),
 	DI(Prot,	str),
-	DI(Prot | Priv,	lldt),
+	II(Prot | Priv | SrcMem16, em_lldt, lldt),
 	DI(Prot | Priv,	ltr),
 	N, N, N, N,
 };