---

yaml --- r: 54079 b: refs/heads/master c: 038881c h: refs/heads/master i: 54077: b118835 54075: 03ae24d 54071: c6f6091 54063: 93880d5 54047: 624d9a1 54015: c905af7 v: v3
git-mirror · May 3, 2007 · fac8031 · fac8031
1 parent 730f4d6
commit fac8031
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 024aa1c02f0a9f938af83f55c727bcb18187eba4
+refs/heads/master: 038881c8bec0e9a796d1782c56e29e7c2456626d
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
@@ -864,7 +864,14 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
 	vmcs_writel(sf->base, var->base);
 	vmcs_write32(sf->limit, var->limit);
 	vmcs_write16(sf->selector, var->selector);
-	if (var->unusable)
+	if (vcpu->rmode.active && var->s) {
+		/*
+		 * Hack real-mode segments into vm86 compatibility.
+		 */
+		if (var->base == 0xffff0000 && var->selector == 0xf000)
+			vmcs_writel(sf->base, 0xf0000);
+		ar = 0xf3;
+	} else if (var->unusable)
 		ar = 1 << 16;
 	else {
 		ar = var->type & 15;