summaryrefslogtreecommitdiff
path: root/src/VBox/VMM/VM.cpp
diff options
context:
space:
mode:
authorMichael Meskes <meskes@debian.org>2009-11-19 17:48:11 +0100
committerMichael Meskes <meskes@debian.org>2009-11-19 17:48:11 +0100
commitfd892711c6bdc0ef96b6b3ea13b668cb2a38196e (patch)
treee6ec126da2bcd6a490d5661118630edf983580ec /src/VBox/VMM/VM.cpp
parent8dc3a7e38d0783262b1aa8c3462e7359d8996d98 (diff)
parentb35715c68a1bec309bc1990353e35c20a21d5c47 (diff)
downloadvirtualbox-debian/3.0.10-dfsg-2bpo50+1.tar.gz
Merge branch 'master' into lennydebian/3.0.10-dfsg-2bpo50+1
Conflicts: debian/changelog
Diffstat (limited to 'src/VBox/VMM/VM.cpp')
-rw-r--r--src/VBox/VMM/VM.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/VBox/VMM/VM.cpp b/src/VBox/VMM/VM.cpp
index b444f87e8..1927608b9 100644
--- a/src/VBox/VMM/VM.cpp
+++ b/src/VBox/VMM/VM.cpp
@@ -279,6 +279,15 @@ VMMR3DECL(int) VMR3Create(uint32_t cCPUs, PFNVMATERROR pfnVMAtError, void *pvU
#endif
break;
+ case VERR_SVM_IN_USE:
+#ifdef RT_OS_LINUX
+ pszError = N_("VirtualBox can't enable the AMD-V extension. "
+ "Please disable the KVM kernel extension, recompile your kernel and reboot");
+#else
+ pszError = N_("VirtualBox can't enable the AMD-V extension. Please close all other virtualization programs.");
+#endif
+ break;
+
case VERR_VERSION_MISMATCH:
pszError = N_("VMMR0 driver version mismatch. Please terminate all VMs, make sure that "
"VBoxNetDHCP is not running and try again. If you still get this error, "