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 e1fc28c

Browse files
VMM: The PGM shadow pool code is effectively x86 specific forever, so just move it into the target-x86 dirs.
svn:sync-xref-src-repo-rev: r171300
1 parent ea297b6 commit e1fc28c

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

‎src/VBox/VMM/.scm-settings‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: .scm-settings 111704 2025年11月13日 14:43:46Z knut.osmundsen@oracle.com $
1+
# $Id: .scm-settings 111708 2025年11月13日 15:04:05Z knut.osmundsen@oracle.com $
22
## @file
33
# Source code massager settings for the VMM.
44
#
@@ -50,14 +50,14 @@
5050
/*.cpp: --only-guest-host-page
5151
/*.h: --only-guest-host-page
5252
# Except in the pool where more care/work is needed.
53-
/VMMAll/PGMAllPool.cpp: --no-page-restrictions
54-
/VMMR3/PGMR3Pool.cpp: --no-page-restrictions
55-
/testcase/tstVMStructSize.cpp: --no-page-restrictions
53+
/VMMAll/target-x86/PGMAllPool-x86.cpp: --no-page-restrictions
54+
/VMMR3/target-x86/PGMR3Pool-x86.cpp: --no-page-restrictions
55+
/testcase/tstVMStructSize.cpp: --no-page-restrictions
5656

5757
# Forbid ASMMemIsZeroPage and ASMMemZeroPage.
5858
/*.cpp: --no-ASMMemPage-use
5959
/*.h: --no-ASMMemPage-use
6060
# Except in the pool where more care/work is needed.
61-
/VMMR3/PGMPool.cpp: --unrestricted-ASMMemPage-use
62-
/VMMAll/PGMAllPool.cpp: --unrestricted-ASMMemPage-use
61+
/VMMR3/target-x86/PGMPool-x86.cpp: --unrestricted-ASMMemPage-use
62+
/VMMAll/target-x86/PGMAllPool-x86.cpp: --unrestricted-ASMMemPage-use
6363

‎src/VBox/VMM/Makefile.kmk‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: Makefile.kmk 111707 2025年11月13日 14:58:37Z knut.osmundsen@oracle.com $
1+
# $Id: Makefile.kmk 111708 2025年11月13日 15:04:05Z knut.osmundsen@oracle.com $
22
## @file
33
# Top-level makefile for the VMM.
44
#
@@ -248,8 +248,8 @@ VBoxVMM_SOURCES = \
248248
VMMAll/VMMAll.cpp
249249
ifn1of (VBOX_WITH_ONLY_PGM_NEM_MODE, $(VBoxVMM_DEFS))
250250
VBoxVMM_SOURCES += \
251-
VMMR3/PGMR3Pool.cpp \
252-
VMMAll/PGMAllPool.cpp
251+
VMMR3/target-x86/PGMR3Pool-x86.cpp \
252+
VMMAll/target-x86/PGMAllPool-x86.cpp
253253
endif
254254
VBoxVMM_SOURCES.amd64 += \
255255
VMMR3/CPUMR3Host-x86.cpp \
@@ -364,7 +364,7 @@ else
364364
endif
365365

366366
ifdef VBOX_WITH_GCC_SANITIZER
367-
VMMR3/PGMR3Pool.cpp_CXXFLAGS.linux += -fno-sanitize=address
367+
VMMR3/target-x86/PGMR3Pool-x86.cpp_CXXFLAGS.linux += -fno-sanitize=address
368368
endif
369369

370370
#ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
@@ -1032,7 +1032,7 @@ if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_BUILD)
10321032
VMMR0/PDMR0Driver.cpp \
10331033
VMMR0/PDMR0Queue.cpp \
10341034
VMMR0/PGMR0.cpp \
1035-
VMMR0/PGMR0Pool.cpp \
1035+
VMMR0/target-x86/PGMR0Pool-x86.cpp \
10361036
VMMR0/PGMR0SharedPage.cpp \
10371037
VMMR0/TMR0.cpp \
10381038
VMMRZ/CPUMRZ.cpp \
@@ -1085,7 +1085,7 @@ if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_BUILD)
10851085
VMMAll/PGMAll.cpp \
10861086
VMMAll/PGMAllHandler.cpp \
10871087
VMMAll/PGMAllPhys.cpp \
1088-
VMMAll/PGMAllPool.cpp \
1088+
VMMAll/target-x86/PGMAllPool-x86.cpp \
10891089
VMMAll/target-x86/SELMAll-x86.cpp \
10901090
VMMAll/TMAll.cpp \
10911091
VMMAll/TMAllCpu.cpp \
@@ -1259,8 +1259,8 @@ VMMAll/VMMAll.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
12591259
# Disable annoying warnings about array subscript above array bounds in aPages[]
12601260
#
12611261
ifneq ($(KBUILD_TARGET),win)
1262-
VMMR3/PGMR3Pool.cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
1263-
VMMAll/PGMAllPool.cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
1262+
VMMR3/target-x86/PGMR3Pool-x86.cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
1263+
VMMAll/target-x86/PGMAllPool-x86.cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
12641264
VMMAll/PGMAll.cpp_CXXFLAGS = -Wno-unused-function
12651265
VMMAll/IEMAll.cpp_CXXFLAGS = -Wno-unused-function
12661266
VMMR0/GMMR0.cpp_CXXFLAGS = -Wno-unused-value

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: PGMAllPool.cpp 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $ */
1+
/* $Id: PGMAllPool-x86.cpp 111708 2025-11-13 15:04:05Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* PGM Shadow Page Pool.
44
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: PGMR0Pool.cpp 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $ */
1+
/* $Id: PGMR0Pool-x86.cpp 111708 2025-11-13 15:04:05Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* PGM Shadow Page Pool, ring-0 specific bits.
44
*/

‎src/VBox/VMM/VMMR3/PGMR3Pool.cpp‎ renamed to ‎src/VBox/VMM/VMMR3/target-x86/PGMR3Pool-x86.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: PGMR3Pool.cpp 111695 2025年11月13日 13:31:17Z knut.osmundsen@oracle.com $ */
1+
/* $Id: PGMR3Pool-x86.cpp 111708 2025年11月13日 15:04:05Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* PGM Shadow Page Pool.
44
*/

0 commit comments

Comments
(0)

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