diff options
| author | Michael Meskes <meskes@debian.org> | 2009-11-19 17:48:11 +0100 |
|---|---|---|
| committer | Michael Meskes <meskes@debian.org> | 2009-11-19 17:48:11 +0100 |
| commit | fd892711c6bdc0ef96b6b3ea13b668cb2a38196e (patch) | |
| tree | e6ec126da2bcd6a490d5661118630edf983580ec /src/VBox/VMM/EMHandleRCTmpl.h | |
| parent | 8dc3a7e38d0783262b1aa8c3462e7359d8996d98 (diff) | |
| parent | b35715c68a1bec309bc1990353e35c20a21d5c47 (diff) | |
| download | virtualbox-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/EMHandleRCTmpl.h')
| -rw-r--r-- | src/VBox/VMM/EMHandleRCTmpl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/VBox/VMM/EMHandleRCTmpl.h b/src/VBox/VMM/EMHandleRCTmpl.h index 50b63ec04..f710a0472 100644 --- a/src/VBox/VMM/EMHandleRCTmpl.h +++ b/src/VBox/VMM/EMHandleRCTmpl.h @@ -331,6 +331,11 @@ int emR3HwaccmHandleRC(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, int rc) case VERR_VMX_UNABLE_TO_RESUME_VM: HWACCMR3CheckError(pVM, rc); break; + + /* Up a level; fatal */ + case VERR_VMX_IN_VMX_ROOT_MODE: + case VERR_SVM_IN_USE: + break; #endif /* |