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 32936f8

Browse files
VMM: Moved the NEMR3Native* source files into the corresponding target-x86/armv8 directires.
svn:sync-xref-src-repo-rev: r171298
1 parent f036a5a commit 32936f8

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

‎src/VBox/VMM/Makefile.kmk‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: Makefile.kmk 111702 2025年11月13日 14:09:21Z knut.osmundsen@oracle.com $
1+
# $Id: Makefile.kmk 111706 2025年11月13日 14:54:45Z knut.osmundsen@oracle.com $
22
## @file
33
# Top-level makefile for the VMM.
44
#
@@ -316,21 +316,22 @@ ifdef VBOX_WITH_IEM_RECOMPILER
316316
endif
317317

318318
ifdef VBOX_WITH_NATIVE_NEM
319-
VBoxVMM_SOURCES.linux.amd64 += VMMR3/NEMR3Native-linux.cpp
319+
VBoxVMM_SOURCES.linux.amd64 += \
320+
VMMR3/target-x86/NEMR3Native-linux-x86.cpp
320321

321322
VBoxVMM_SOURCES.win.amd64 += \
322-
VMMR3/NEMR3Native-win.cpp \
323+
VMMR3/target-x86/NEMR3Native-win-x86.cpp \
323324
VMMR3/target-x86/APICR3Nem-win-x86.cpp
324325

325326
VBoxVMM_DEFS.win.amd64 += VBOX_WITH_NATIVE_NEM
326327
VBoxVMM_SDKS.win += VBoxNtDll
327-
VMMR3/NEMR3Native-win.cpp_DEFS.amd64 = _AMD64_
328-
VMMR3/NEMR3Native-win.cpp_INCS = \
328+
VMMR3/target-x86/NEMR3Native-win-x86.cpp_DEFS.amd64 = _AMD64_
329+
VMMR3/target-x86/NEMR3Native-win-x86.cpp_INCS = \
329330
$(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/um \
330331
$(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
331332

332333
VBoxVMM_SOURCES.darwin.amd64 += \
333-
VMMR3/NEMR3Native-darwin.cpp
334+
VMMR3/target-x86/NEMR3Native-darwin-x86.cpp
334335
VBoxVMM_DEFS.darwin.amd64 += VBOX_WITH_NATIVE_NEM
335336
endif
336337

@@ -601,18 +602,18 @@ ifdef VBOX_WITH_VIRT_ARMV8
601602
VMMR3/PGMR3DbgA.asm
602603

603604
VBoxVMMArm_SOURCES.darwin.arm64 += \
604-
VMMR3/NEMR3Native-darwin-armv8.cpp \
605+
VMMR3/target-armv8/NEMR3Native-darwin-armv8.cpp \
605606
VMMR3/GICR3Nem-darwin.cpp
606607
VBoxVMMArm_DEFS.darwin.arm64 += VBOX_WITH_NATIVE_NEM
607608
VBoxVMMArm_LDFLAGS.darwin.arm64 = -framework Hypervisor
608609

609610
VBoxVMMArm_SOURCES.linux.arm64 += \
610-
VMMR3/NEMR3Native-linux-armv8.cpp \
611+
VMMR3/target-armv8/NEMR3Native-linux-armv8.cpp \
611612
VMMR3/GICR3Nem-linux.cpp
612613
VBoxVMMArm_DEFS.linux.arm64 += VBOX_WITH_NATIVE_NEM
613614

614615
VBoxVMMArm_SOURCES.win.arm64 += \
615-
VMMR3/NEMR3Native-win-armv8.cpp \
616+
VMMR3/target-armv8/NEMR3Native-win-armv8.cpp \
616617
VMMR3/GICR3Nem-win.cpp
617618
VBoxVMMArm_DEFS.win.arm64 += VBOX_WITH_NATIVE_NEM
618619

@@ -935,7 +936,8 @@ VMMStatic_SOURCES.$(KBUILD_TARGET_ARCH) = \
935936
, $($(VMMStatic_EXTENDS)_SOURCES.$(KBUILD_TARGET_ARCH)))
936937
VMMStatic_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = \
937938
$(filter-out \
938-
VMMR3/NEMR3Native-% \
939+
VMMR3/target-$(KBUILD_TARGET)/NEMR3Native-% \
940+
VMMR3/target-$(KBUILD_TARGET)/NEMR3Native-% \
939941
VMMR3/GICR3Nem-% \
940942
VMMR3/target-x86/APICR3Nem-% \
941943
, $($(VMMStatic_EXTENDS)_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)))

‎src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp‎ renamed to ‎src/VBox/VMM/VMMR3/target-armv8/NEMR3Native-darwin-armv8.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: NEMR3Native-darwin-armv8.cpp 111176 2025-09-30 07:36:29Z knut.osmundsen@oracle.com $ */
1+
/* $Id: NEMR3Native-darwin-armv8.cpp 111706 2025-11-13 14:54:45Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* NEM - Native execution manager, native ring-3 macOS backend using Hypervisor.framework, ARMv8 variant.
44
*

‎src/VBox/VMM/VMMR3/NEMR3Native-linux-armv8.cpp‎ renamed to ‎src/VBox/VMM/VMMR3/target-armv8/NEMR3Native-linux-armv8.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: NEMR3Native-linux-armv8.cpp 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $ */
1+
/* $Id: NEMR3Native-linux-armv8.cpp 111706 2025-11-13 14:54:45Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* NEM - Native execution manager, native ring-3 Linux backend arm64 version.
44
*/
@@ -322,7 +322,7 @@ static int nemR3LnxInitSetupVm(PVM pVM, PRTERRINFO pErrInfo);
322322

323323

324324
/* Instantiate the common bits we share with the x86 KVM backend. */
325-
#include "NEMR3NativeTemplate-linux.cpp.h"
325+
#include "../NEMR3NativeTemplate-linux.cpp.h"
326326

327327

328328
/**

‎src/VBox/VMM/VMMR3/NEMR3Native-win-armv8.cpp‎ renamed to ‎src/VBox/VMM/VMMR3/target-armv8/NEMR3Native-win-armv8.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: NEMR3Native-win-armv8.cpp 111176 2025-09-30 07:36:29Z knut.osmundsen@oracle.com $ */
1+
/* $Id: NEMR3Native-win-armv8.cpp 111706 2025-11-13 14:54:45Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* NEM - Native execution manager, native ring-3 Windows backend.
44
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: NEMR3Native-darwin.cpp 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $ */
1+
/* $Id: NEMR3Native-darwin-x86.cpp 111706 2025-11-13 14:54:45Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* NEM - Native execution manager, native ring-3 macOS backend using Hypervisor.framework.
44
*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: NEMR3Native-linux.cpp 111177 2025-09-30 07:47:26Z knut.osmundsen@oracle.com $ */
1+
/* $Id: NEMR3Native-linux-x86.cpp 111706 2025-11-13 14:54:45Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* NEM - Native execution manager, native ring-3 Linux backend.
44
*/
@@ -58,7 +58,7 @@ static int nemR3LnxInitSetupVm(PVM pVM, PRTERRINFO pErrInfo);
5858

5959

6060
/* Instantiate the common bits we share with the ARMv8 KVM backend. */
61-
#include "NEMR3NativeTemplate-linux.cpp.h"
61+
#include "../NEMR3NativeTemplate-linux.cpp.h"
6262

6363

6464

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: NEMR3Native-win.cpp 111345 2025-10-13 12:54:08Z ramshankar.venkataraman@oracle.com $ */
1+
/* $Id: NEMR3Native-win-x86.cpp 111706 2025-11-13 14:54:45Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* NEM - Native execution manager, native ring-3 Windows backend.
44
*

0 commit comments

Comments
(0)

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