From 09ce75b1d2422e666bdcb7e850bbdbdc5d131d0c Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Tue, 21 Aug 2012 17:07:09 +0300
Subject: [PATCH] --- yaml --- r: 329887 b: refs/heads/master c:
 ce5668034752e52e995c8dc625337380099a088a h: refs/heads/master i:   329885:
 fce979170e4694cce0b315fe95cd9c45bbba5438   329883:
 0015e2af1f13b17ffeadf2e8e784afd2020ad8eb   329879:
 206abe40ae04888cee2085ab023377447ead9471   329871:
 874fec498481cfee848ca5dbae152d3065c6aecb   329855:
 abc11424604d8fa5ad88b1f092a938077e35435d v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/vmx.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1a6ef4a030fa..d3e44985f8d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1390a28b274e2e45f89bac67c435cbcbc5cc0790
+refs/heads/master: ce5668034752e52e995c8dc625337380099a088a
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index 6e6421aeca03..62b2d0cf2a7f 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -3216,6 +3216,7 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
 	vmcs_write32(sf->limit, var->limit);
 	vmcs_write16(sf->selector, var->selector);
 	if (vmx->rmode.vm86_active && var->s) {
+		vmx->rmode.segs[seg] = *var;
 		/*
 		 * Hack real-mode segments into vm86 compatibility.
 		 */