diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2019-01-18 10:57:02 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2019-01-18 10:57:02 +0000 |
| commit | e3739a0a29cf2cf08173bc11462b26af80c3df25 (patch) | |
| tree | 4a71aa7708688aa3af263e5cc1ba736c9b7b5190 /src/VBox/VMM/VMMAll/GIMAllHv.cpp | |
| parent | 86cff33cab6585bf22b0d47c477fb054a3d82229 (diff) | |
| download | VirtualBox-svn-e3739a0a29cf2cf08173bc11462b26af80c3df25.tar.gz | |
VMM (and related changes): Add support for Shanghai/Zhaoxin CPUs. Modified and improved contribution by Journey Ren submitted under MIT license. Thank you!
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@76886 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/VMM/VMMAll/GIMAllHv.cpp')
| -rw-r--r-- | src/VBox/VMM/VMMAll/GIMAllHv.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/VBox/VMM/VMMAll/GIMAllHv.cpp b/src/VBox/VMM/VMMAll/GIMAllHv.cpp index 602c86097bf..92de12b1fa1 100644 --- a/src/VBox/VMM/VMMAll/GIMAllHv.cpp +++ b/src/VBox/VMM/VMMAll/GIMAllHv.cpp @@ -1402,7 +1402,8 @@ VMM_INT_DECL(VBOXSTRICTRC) gimHvHypercallEx(PVMCPU pVCpu, PCPUMCTX pCtx, unsigne CPUMCPUVENDOR const enmGuestCpuVendor = (CPUMCPUVENDOR)pVM->cpum.ro.GuestFeatures.enmCpuVendor; if ( ( uDisOpcode == OP_VMCALL && ( enmGuestCpuVendor == CPUMCPUVENDOR_INTEL - || enmGuestCpuVendor == CPUMCPUVENDOR_VIA)) + || enmGuestCpuVendor == CPUMCPUVENDOR_VIA + || enmGuestCpuVendor == CPUMCPUVENDOR_SHANGHAI)) || ( uDisOpcode == OP_VMMCALL && enmGuestCpuVendor == CPUMCPUVENDOR_AMD)) return gimHvHypercall(pVCpu, pCtx); |