---

yaml --- r: 197741 b: refs/heads/master c: f7a7119 h: refs/heads/master i: 197739: ffea8f7 v: v3
git-mirror · May 17, 2010 · a79013d · a79013d
1 parent c60bf31
commit a79013d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e46479f852adab6027e4950d69400d967bf7bc6f
+refs/heads/master: f7a711971edd952352a89698db1d36f469e25f77
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
@@ -4171,9 +4171,13 @@ int cpuid_maxphyaddr(struct kvm_vcpu *vcpu)
 {
 	struct kvm_cpuid_entry2 *best;
 
+	best = kvm_find_cpuid_entry(vcpu, 0x80000000, 0);
+	if (!best || best->eax < 0x80000008)
+		goto not_found;
 	best = kvm_find_cpuid_entry(vcpu, 0x80000008, 0);
 	if (best)
 		return best->eax & 0xff;
+not_found:
 	return 36;
 }