Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 7ca096c

Browse files
VMM: HM is mainly an x86 thing. Finally got a chance to correct the HMSVMAll/R0.cpp names to HMR0SVMAll/R0[-x86].cpp.
svn:sync-xref-src-repo-rev: r171293
1 parent 9432933 commit 7ca096c

File tree

14 files changed

+36
-36
lines changed

14 files changed

+36
-36
lines changed

‎src/VBox/VMM/Makefile.kmk‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: Makefile.kmk 111699 2025年11月13日 13:47:40Z knut.osmundsen@oracle.com $
1+
# $Id: Makefile.kmk 111701 2025年11月13日 14:05:10Z knut.osmundsen@oracle.com $
22
## @file
33
# Top-level makefile for the VMM.
44
#
@@ -188,17 +188,17 @@ VBoxVMM_SOURCES = \
188188
VMMR3/VMMR3.cpp \
189189
VMMR3/VMMR3GuruMeditation.cpp \
190190
VMMR3/VMMR3Tests.cpp \
191-
VMMR3/HMR3.cpp \
191+
VMMR3/target-x86/HMR3-x86.cpp \
192192
VMMAll/target-x86/APICAll-x86.cpp \
193193
VMMAll/CPUMAllCpuId.cpp \
194194
VMMAll/CPUMAllRegs.cpp \
195195
VMMAll/CPUMAllMsrs.cpp \
196196
VMMAll/DBGFAll.cpp \
197197
VMMAll/DBGFAllBp.cpp \
198198
$(if-expr defined(VBOX_WITH_DBGF_TRACING), VMMAll/DBGFAllTracer.cpp,) \
199-
VMMAll/HMAll.cpp \
200-
VMMAll/HMSVMAll.cpp \
201-
VMMAll/HMVMXAll.cpp \
199+
VMMAll/target-x86/HMAll-x86.cpp \
200+
VMMAll/target-x86/HMAllSVM-x86.cpp \
201+
VMMAll/target-x86/HMAllVMX-x86.cpp \
202202
VMMAll/IEMAll.cpp \
203203
VMMAll/IEMAllMem.cpp \
204204
VMMAll/IEMAllTlb.cpp \
@@ -530,7 +530,7 @@ ifdef VBOX_WITH_VIRT_ARMV8
530530
VMMR3/VMMR3.cpp \
531531
VMMR3/VMMR3GuruMeditation.cpp \
532532
VMMR3/VMMR3Tests.cpp \
533-
VMMR3/HMR3-armv8.cpp \
533+
VMMR3/target-armv8/HMR3-armv8.cpp \
534534
VMMAll/CPUMAllRegs-armv8.cpp \
535535
VMMAll/CPUMAllSysRegs-armv8.cpp \
536536
VMMAll/DBGFAll.cpp \
@@ -1017,9 +1017,9 @@ if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_BUILD)
10171017
VMMR0/GIMR0Hv.cpp \
10181018
VMMR0/GMMR0.cpp \
10191019
VMMR0/EMR0.cpp \
1020-
VMMR0/HMR0.cpp \
1021-
VMMR0/HMVMXR0.cpp \
1022-
VMMR0/HMSVMR0.cpp \
1020+
VMMR0/target-x86/HMR0-x86.cpp \
1021+
VMMR0/target-x86/HMR0VMX-x86.cpp \
1022+
VMMR0/target-x86/HMR0SVM-x86.cpp \
10231023
VMMR0/IEMR0.cpp \
10241024
VMMR0/IOMR0.cpp \
10251025
VMMR0/IOMR0IoPort.cpp \
@@ -1046,9 +1046,9 @@ if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_BUILD)
10461046
VMMAll/GIMAll.cpp \
10471047
VMMAll/GIMAllHv.cpp \
10481048
VMMAll/GIMAllKvm.cpp \
1049-
VMMAll/HMAll.cpp \
1050-
VMMAll/HMSVMAll.cpp \
1051-
VMMAll/HMVMXAll.cpp \
1049+
VMMAll/target-x86/HMAll-x86.cpp \
1050+
VMMAll/target-x86/HMAllSVM-x86.cpp \
1051+
VMMAll/target-x86/HMAllVMX-x86.cpp \
10521052
VMMAll/IEMAll.cpp \
10531053
VMMAll/IEMAllMem.cpp \
10541054
VMMAll/IEMAllTlb.cpp \
@@ -1095,8 +1095,8 @@ if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_BUILD)
10951095
VMMR0_SOURCES.amd64 += \
10961096
VMMR0/CPUMR0A.asm \
10971097
VMMRZ/CPUMRZA.asm \
1098-
VMMR0/HMR0A.asm \
1099-
VMMR0/HMR0UtilA.asm \
1098+
VMMR0/target-x86/HMR0A-x86.asm \
1099+
VMMR0/target-x86/HMR0UtilA-x86.asm \
11001100
$(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/target-x86/IEMAllAImpl-x86-amd64.asm,) \
11011101
VMMAll/VMMAllA.asm
11021102

‎src/VBox/VMM/VMMAll/HMAll.cpp‎ renamed to ‎src/VBox/VMM/VMMAll/target-x86/HMAll-x86.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: HMAll.cpp 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $ */
1+
/* $Id: HMAll-x86.cpp 111701 2025-11-13 14:05:10Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* HM - All contexts.
44
*/

‎src/VBox/VMM/VMMAll/HMSVMAll.cpp‎ renamed to ‎src/VBox/VMM/VMMAll/target-x86/HMAllSVM-x86.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: HMSVMAll.cpp 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $ */
1+
/* $Id: HMAllSVM-x86.cpp 111701 2025-11-13 14:05:10Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* HM SVM (AMD-V) - All contexts.
44
*/

‎src/VBox/VMM/VMMAll/HMVMXAll.cpp‎ renamed to ‎src/VBox/VMM/VMMAll/target-x86/HMAllVMX-x86.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: HMVMXAll.cpp 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $ */
1+
/* $Id: HMAllVMX-x86.cpp 111701 2025-11-13 14:05:10Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* HM VMX (VT-x) - All contexts.
44
*/

‎src/VBox/VMM/VMMR0/target-x86/.gitignore‎

Whitespace-only changes.

‎src/VBox/VMM/VMMR0/HMR0.cpp‎ renamed to ‎src/VBox/VMM/VMMR0/target-x86/HMR0-x86.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: HMR0.cpp 111076 2025-09-22 08:10:34Z ramshankar.venkataraman@oracle.com $ */
1+
/* $Id: HMR0-x86.cpp 111701 2025-11-13 14:05:10Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Hardware Assisted Virtualization Manager (HM) - Host Context Ring-0.
44
*/
@@ -51,8 +51,8 @@
5151
#include <iprt/string.h>
5252
#include <iprt/thread.h>
5353
#include <iprt/x86.h>
54-
#include "HMVMXR0.h"
55-
#include "HMSVMR0.h"
54+
#include "HMR0VMX-x86.h"
55+
#include "HMR0SVM-x86.h"
5656

5757

5858
/*********************************************************************************************************************************

‎src/VBox/VMM/VMMR0/HMR0A.asm‎ renamed to ‎src/VBox/VMM/VMMR0/target-x86/HMR0A-x86.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; $Id: HMR0A.asm 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $
1+
; $Id: HMR0A-x86.asm 111701 2025-11-13 14:05:10Z knut.osmundsen@oracle.com $
22
;; @file
33
; HM - Ring-0 VMX, SVM world-switch and helper routines.
44
;

‎src/VBox/VMM/VMMR0/HMSVMR0.cpp‎ renamed to ‎src/VBox/VMM/VMMR0/target-x86/HMR0SVM-x86.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: HMSVMR0.cpp 111177 2025-09-30 07:47:26Z knut.osmundsen@oracle.com $ */
1+
/* $Id: HMR0SVM-x86.cpp 111701 2025-11-13 14:05:10Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* HM SVM (AMD-V) - Host Context Ring-0.
44
*/
@@ -46,7 +46,7 @@
4646
#include "HMInternal.h"
4747
#include <VBox/vmm/vmcc.h>
4848
#include <VBox/err.h>
49-
#include "HMSVMR0.h"
49+
#include "HMR0SVM-x86.h"
5050
#include "dtrace/VBoxVMM.h"
5151

5252
#ifdef DEBUG_ramshankar

‎src/VBox/VMM/VMMR0/HMSVMR0.h‎ renamed to ‎src/VBox/VMM/VMMR0/target-x86/HMR0SVM-x86.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: HMSVMR0.h 111076 2025-09-22 08:10:34Z ramshankar.venkataraman@oracle.com $ */
1+
/* $Id: HMR0SVM-x86.h 111701 2025-11-13 14:05:10Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* HM SVM (AMD-V) - Internal header file.
44
*/
@@ -25,8 +25,8 @@
2525
* SPDX-License-Identifier: GPL-3.0-only
2626
*/
2727

28-
#ifndef VMM_INCLUDED_SRC_VMMR0_HMSVMR0_h
29-
#define VMM_INCLUDED_SRC_VMMR0_HMSVMR0_h
28+
#ifndef VMM_INCLUDED_SRC_VMMR0_target_x86_HMR0SVM_x86_h
29+
#define VMM_INCLUDED_SRC_VMMR0_target_x86_HMR0SVM_x86_h
3030
#ifndef RT_WITHOUT_PRAGMA_ONCE
3131
# pragma once
3232
#endif
@@ -77,5 +77,5 @@ DECLASM(void) SVMR0InvlpgA(RTGCPTR GCVirt, uint32_t u32ASID);
7777

7878
RT_C_DECLS_END
7979

80-
#endif /* !VMM_INCLUDED_SRC_VMMR0_HMSVMR0_h */
80+
#endif /* !VMM_INCLUDED_SRC_VMMR0_target_x86_HMR0SVM_x86_h */
8181

‎src/VBox/VMM/VMMR0/HMR0UtilA.asm‎ renamed to ‎src/VBox/VMM/VMMR0/target-x86/HMR0UtilA-x86.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; $Id: HMR0UtilA.asm 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $
1+
; $Id: HMR0UtilA-x86.asm 111701 2025-11-13 14:05:10Z knut.osmundsen@oracle.com $
22
;; @file
33
; HM - Ring-0 VMX & SVM Helpers.
44
;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /