When using nested SVM we usually want the guest to see the exact CPUID values
we gave it and not some mangled ones.
Hyper-V for example doesn't even start when the "hypervisor present" bit is set.
Signed-off-by: Alexander Graf <agraf@xxxxxxx>
---
target-i386/helper.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 24fcea8..5f56698 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1496,7 +1496,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
* isn't supported in compatibility mode on Intel. so advertise the
* actuall cpu, and say goodbye to migration between different vendors
* is you use compatibility mode. */
- if (kvm_enabled())
+ if (kvm_enabled() && !kvm_nested)
host_cpuid(0, 0, NULL, ebx, ecx, edx);
break;
case 1:
@@ -1506,7 +1506,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*edx = env->cpuid_features;
/* "Hypervisor present" bit required for Microsoft SVVP */
- if (kvm_enabled())
+ if (kvm_enabled() && !kvm_nested)
*ecx |= (1 << 31);
break;
case 2:
--
1.6.0.2
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
