Skip to content

Commit 1a744e0

Browse files
committed
patches: update for version 20240502
1 parent 9d202d4 commit 1a744e0

File tree

57 files changed

+803
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+803
-179
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,15 @@ sudo systemctl reload systemd-udevd
138138
If you want to use the graphics virtualization features of modern Intel processors, please refer to our
139139
[SR-IOV Graphics Virtualization HowTo](README.intel-sriov-graphics.md).
140140

141+
## Nested Virtualization
142+
143+
If you want to use nested virtualization, you need to run the following command:
144+
```shell
145+
VBoxManage modifyvm <vm_name> --nested-hw-virt on
146+
```
147+
148+
Please note that nested virtualization is only supported for Intel CPUs. Nested virtualization on AMD is currently unsupported.
149+
141150
## How to engage
142151

143152
If you would like to use our KVM backend or if you have a need for custom

patches/0001-config-add-Cyberus-configuration-adjustments.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ config: define for VBOX_WITH_KVM_IRQCHIP_FULL
1818
2 files changed, 29 insertions(+)
1919

2020
diff --git a/Config.kmk b/Config.kmk
21-
index 38833aa29..d353b0920 100644
21+
index 38833aa29f..d353b0920f 100644
2222
--- a/Config.kmk
2323
+++ b/Config.kmk
2424
@@ -1584,6 +1584,19 @@ ifdef VBOX_HEADLESS
@@ -66,7 +66,7 @@ index 38833aa29..d353b0920 100644
6666
VBOX_GCC_std := -std=c++11
6767
# else if "$(VBOX_GCC_VERSION_CXX)" vge 70000 # Language feature P0512R0 was v8, rest v7 or earlier. Most lib stuff present in 7, complete in v12.
6868
diff --git a/configure b/configure
69-
index 4b69712cd..22709bf93 100755
69+
index 4b69712cd6..22709bf934 100755
7070
--- a/configure
7171
+++ b/configure
7272
@@ -86,6 +86,7 @@ SETUP_WINE=
@@ -104,5 +104,5 @@ index 4b69712cd..22709bf93 100755
104104
[ $WITH_LIBTPMS -eq 0 ] && cnf_append "VBOX_WITH_LIBTPMS" ""
105105
[ $WITH_LIBLZMA -eq 0 ] && cnf_append "VBOX_WITH_LIBLZMA" ""
106106
--
107-
2.44.0
107+
2.43.0
108108

patches/0002-NEM-Implement-KVM-backend.patch

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ account for the CPUID values VBox wants to offer to the guest.
288288
26 files changed, 1895 insertions(+), 98 deletions(-)
289289

290290
diff --git a/include/VBox/vmm/nem.h b/include/VBox/vmm/nem.h
291-
index 0d960a7ee..26d055fcd 100644
291+
index 0d960a7eee..26d055fcd0 100644
292292
--- a/include/VBox/vmm/nem.h
293293
+++ b/include/VBox/vmm/nem.h
294294
@@ -43,6 +43,14 @@
@@ -503,7 +503,7 @@ index 0d960a7ee..26d055fcd 100644
503503
* @{ */
504504
/** Set if the range is replacing RAM rather that unused space. */
505505
diff --git a/include/VBox/vmm/pdmdev.h b/include/VBox/vmm/pdmdev.h
506-
index f895eb86f..525d82e03 100644
506+
index f895eb86f5..525d82e030 100644
507507
--- a/include/VBox/vmm/pdmdev.h
508508
+++ b/include/VBox/vmm/pdmdev.h
509509
@@ -64,6 +64,49 @@
@@ -649,7 +649,7 @@ index f895eb86f..525d82e03 100644
649649
uint32_t u32TheEnd;
650650
} PDMIOAPICHLP;
651651
diff --git a/include/iprt/mangling.h b/include/iprt/mangling.h
652-
index 0c8c027f1..7b27bba35 100644
652+
index 0c8c027f1b..7b27bba35d 100644
653653
--- a/include/iprt/mangling.h
654654
+++ b/include/iprt/mangling.h
655655
@@ -2555,6 +2555,7 @@
@@ -661,7 +661,7 @@ index 0c8c027f1..7b27bba35 100644
661661
# define RTThreadPreemptDisable RT_MANGLER(RTThreadPreemptDisable) /* r0drv */
662662
# define RTThreadPreemptIsEnabled RT_MANGLER(RTThreadPreemptIsEnabled) /* r0drv */
663663
diff --git a/include/iprt/thread.h b/include/iprt/thread.h
664-
index 7d9257ec4..243d76de7 100644
664+
index 7d9257ec4c..243d76de75 100644
665665
--- a/include/iprt/thread.h
666666
+++ b/include/iprt/thread.h
667667
@@ -555,6 +555,12 @@ RTDECL(int) RTThreadPoke(RTTHREAD hThread);
@@ -678,7 +678,7 @@ index 7d9257ec4..243d76de7 100644
678678
# ifdef IN_RING0
679679

680680
diff --git a/src/VBox/Devices/PC/DevACPI.cpp b/src/VBox/Devices/PC/DevACPI.cpp
681-
index abf2ba5e2..672b9afae 100644
681+
index abf2ba5e25..672b9afae0 100644
682682
--- a/src/VBox/Devices/PC/DevACPI.cpp
683683
+++ b/src/VBox/Devices/PC/DevACPI.cpp
684684
@@ -812,7 +812,11 @@ struct ACPITBLISO
@@ -769,7 +769,7 @@ index abf2ba5e2..672b9afae 100644
769769
madt.header_addr()->u8Checksum = acpiR3Checksum(madt.data(), madt.size());
770770
acpiR3PhysCopy(pDevIns, addr, madt.data(), madt.size());
771771
diff --git a/src/VBox/Devices/PC/DevIoApic.cpp b/src/VBox/Devices/PC/DevIoApic.cpp
772-
index a69d8e3f0..f56c66725 100644
772+
index a69d8e3f02..f56c66725d 100644
773773
--- a/src/VBox/Devices/PC/DevIoApic.cpp
774774
+++ b/src/VBox/Devices/PC/DevIoApic.cpp
775775
@@ -32,6 +32,14 @@
@@ -1102,7 +1102,7 @@ index a69d8e3f0..f56c66725 100644
11021102
* Validate and read the configuration.
11031103
*/
11041104
diff --git a/src/VBox/Devices/PC/DevPIC.cpp b/src/VBox/Devices/PC/DevPIC.cpp
1105-
index b4e195952..f44e2c6f7 100644
1105+
index b4e195952e..f44e2c6f73 100644
11061106
--- a/src/VBox/Devices/PC/DevPIC.cpp
11071107
+++ b/src/VBox/Devices/PC/DevPIC.cpp
11081108
@@ -366,6 +366,16 @@ static DECLCALLBACK(void) picSetIrq(PPDMDEVINS pDevIns, int iIrq, int iLevel, ui
@@ -1199,7 +1199,7 @@ index b4e195952..f44e2c6f7 100644
11991199
return VINF_SUCCESS;
12001200
}
12011201
diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk
1202-
index 6543b624f..205c66e93 100644
1202+
index 6543b624f6..205c66e930 100644
12031203
--- a/src/VBox/HostDrivers/Support/Makefile.kmk
12041204
+++ b/src/VBox/HostDrivers/Support/Makefile.kmk
12051205
@@ -191,6 +191,7 @@ SUPR3_DEFS = \
@@ -1211,7 +1211,7 @@ index 6543b624f..205c66e93 100644
12111211
VBOX_PERMIT_EVEN_MORE
12121212
SUPR3_INCS := $(PATH_SUB_CURRENT)
12131213
diff --git a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp
1214-
index 5bdcda63c..61ffb906d 100644
1214+
index 5bdcda63c4..61ffb906da 100644
12151215
--- a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp
12161216
+++ b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp
12171217
@@ -255,6 +255,10 @@ DECLHIDDEN(int) suplibOsPageAlloc(PSUPLIBDATA pThis, size_t cPages, uint32_t fFl
@@ -1226,7 +1226,7 @@ index 5bdcda63c..61ffb906d 100644
12261226
if ( !pThis->fSysMadviseWorks
12271227
&& (fFlags & (SUP_PAGE_ALLOC_F_FOR_LOCKING | SUP_PAGE_ALLOC_F_LARGE_PAGES)) == SUP_PAGE_ALLOC_F_FOR_LOCKING)
12281228
diff --git a/src/VBox/Main/Makefile.kmk b/src/VBox/Main/Makefile.kmk
1229-
index 5711816d7..6f5d1a707 100644
1229+
index 5711816d74..6f5d1a7071 100644
12301230
--- a/src/VBox/Main/Makefile.kmk
12311231
+++ b/src/VBox/Main/Makefile.kmk
12321232
@@ -1088,7 +1088,9 @@ if !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_EXTPACKS) # Note this goes on f
@@ -1241,7 +1241,7 @@ index 5711816d7..6f5d1a707 100644
12411241
$(PATH_SDK_$(VBOX_WINPSDK)_LIB)/psapi.lib \
12421242
$(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
12431243
diff --git a/src/VBox/Runtime/r3/posix/thread-posix.cpp b/src/VBox/Runtime/r3/posix/thread-posix.cpp
1244-
index cd621ce0a..c89c600e4 100644
1244+
index cd621ce0a1..c89c600e46 100644
12451245
--- a/src/VBox/Runtime/r3/posix/thread-posix.cpp
12461246
+++ b/src/VBox/Runtime/r3/posix/thread-posix.cpp
12471247
@@ -727,6 +727,10 @@ RTDECL(int) RTThreadControlPokeSignal(RTTHREAD hThread, bool fEnable)
@@ -1256,7 +1256,7 @@ index cd621ce0a..c89c600e4 100644
12561256
#endif
12571257

12581258
diff --git a/src/VBox/Runtime/testcase/Makefile.kmk b/src/VBox/Runtime/testcase/Makefile.kmk
1259-
index c3a097b82..4ecc3e535 100644
1259+
index c3a097b821..4ecc3e535a 100644
12601260
--- a/src/VBox/Runtime/testcase/Makefile.kmk
12611261
+++ b/src/VBox/Runtime/testcase/Makefile.kmk
12621262
@@ -559,6 +559,7 @@ ifdef VBOX_WITH_TESTCASES # The whole file
@@ -1268,7 +1268,7 @@ index c3a097b82..4ecc3e535 100644
12681268
$(QUIET)$(SED) -n -e 's/^ *LOG_GROUP_\([A-Z0-9_]*\),.*$(DOLLAR)/{ LOG_GROUP_\1, "\1" },/p' --output "$@" "$<"
12691269
endif # !VBOX_ONLY_VALIDATIONKIT
12701270
diff --git a/src/VBox/VMM/VMMAll/APICAll.cpp b/src/VBox/VMM/VMMAll/APICAll.cpp
1271-
index 6041a8433..e2df2ec20 100644
1271+
index 6041a8433a..e2df2ec202 100644
12721272
--- a/src/VBox/VMM/VMMAll/APICAll.cpp
12731273
+++ b/src/VBox/VMM/VMMAll/APICAll.cpp
12741274
@@ -2726,6 +2726,16 @@ VMM_INT_DECL(VBOXSTRICTRC) APICLocalInterrupt(PVMCPUCC pVCpu, uint8_t u8Pin, uin
@@ -1289,7 +1289,7 @@ index 6041a8433..e2df2ec20 100644
12891289
/* If the APIC is enabled, the interrupt is subject to LVT programming. */
12901290
if (APICIsEnabled(pVCpu))
12911291
diff --git a/src/VBox/VMM/VMMAll/PGMAllBth.h b/src/VBox/VMM/VMMAll/PGMAllBth.h
1292-
index 50b7a30e8..9d4bd8ca6 100644
1292+
index 50b7a30e84..9d4bd8ca62 100644
12931293
--- a/src/VBox/VMM/VMMAll/PGMAllBth.h
12941294
+++ b/src/VBox/VMM/VMMAll/PGMAllBth.h
12951295
@@ -5046,7 +5046,10 @@ PGM_BTH_DECL(int, MapCR3)(PVMCPUCC pVCpu, RTGCPHYS GCPhysCR3)
@@ -1304,7 +1304,7 @@ index 50b7a30e8..9d4bd8ca6 100644
13041304
# if PGM_GST_TYPE == PGM_TYPE_PAE
13051305
if ( !pVCpu->pgm.s.CTX_SUFF(fPaePdpesAndCr3Mapped)
13061306
diff --git a/src/VBox/VMM/VMMAll/TMAll.cpp b/src/VBox/VMM/VMMAll/TMAll.cpp
1307-
index 677decdd8..8edc178af 100644
1307+
index 677decdd81..8edc178af1 100644
13081308
--- a/src/VBox/VMM/VMMAll/TMAll.cpp
13091309
+++ b/src/VBox/VMM/VMMAll/TMAll.cpp
13101310
@@ -208,7 +208,10 @@ VMMDECL(void) TMNotifyEndOfExecution(PVMCC pVM, PVMCPUCC pVCpu, uint64_t uTsc)
@@ -1320,7 +1320,7 @@ index 677decdd8..8edc178af 100644
13201320
uint64_t cNsExecutingDelta;
13211321
if (uCpuHz < _4G)
13221322
diff --git a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp
1323-
index 9244bd850..2e34aeaf6 100644
1323+
index 9244bd850b..2e34aeaf6d 100644
13241324
--- a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp
13251325
+++ b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp
13261326
@@ -952,7 +952,11 @@ VMM_INT_DECL(uint64_t) TMVirtualSyncGetWithDeadlineNoCheck(PVMCC pVM, uint64_t *
@@ -1336,7 +1336,7 @@ index 9244bd850..2e34aeaf6 100644
13361336
}
13371337

13381338
diff --git a/src/VBox/VMM/VMMR3/APIC.cpp b/src/VBox/VMM/VMMR3/APIC.cpp
1339-
index 6753ac608..b5ff86cc7 100644
1339+
index 6753ac6080..b5ff86cc7f 100644
13401340
--- a/src/VBox/VMM/VMMR3/APIC.cpp
13411341
+++ b/src/VBox/VMM/VMMR3/APIC.cpp
13421342
@@ -36,6 +36,7 @@
@@ -1403,7 +1403,7 @@ index 6753ac608..b5ff86cc7 100644
14031403
APIC_REG_COUNTER(&pApicCpu->StatPostIntrCnt, "%u", "APIC/VCPU stats / number of apicPostInterrupt calls.");
14041404
for (size_t i = 0; i < RT_ELEMENTS(pApicCpu->aStatVectors); i++)
14051405
diff --git a/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp b/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp
1406-
index a22882500..c448c9ecd 100644
1406+
index a22882500f..c448c9ecd8 100644
14071407
--- a/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp
14081408
+++ b/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp
14091409
@@ -1419,6 +1419,51 @@ static int cpumR3CpuIdSanitize(PVM pVM, PCPUM pCpum, PCPUMCPUIDCONFIG pConfig)
@@ -1475,7 +1475,7 @@ index a22882500..c448c9ecd 100644
14751475

14761476
/*
14771477
diff --git a/src/VBox/VMM/VMMR3/EM.cpp b/src/VBox/VMM/VMMR3/EM.cpp
1478-
index bd15b8872..5e52065aa 100644
1478+
index bd15b8872c..5e52065aab 100644
14791479
--- a/src/VBox/VMM/VMMR3/EM.cpp
14801480
+++ b/src/VBox/VMM/VMMR3/EM.cpp
14811481
@@ -219,7 +219,11 @@ VMMR3_INT_DECL(int) EMR3Init(PVM pVM)
@@ -1506,7 +1506,7 @@ index bd15b8872..5e52065aa 100644
15061506
break;
15071507
}
15081508
diff --git a/src/VBox/VMM/VMMR3/GIMHv.cpp b/src/VBox/VMM/VMMR3/GIMHv.cpp
1509-
index 0452facbe..1da906512 100644
1509+
index 0452facbe3..1da9065120 100644
15101510
--- a/src/VBox/VMM/VMMR3/GIMHv.cpp
15111511
+++ b/src/VBox/VMM/VMMR3/GIMHv.cpp
15121512
@@ -34,6 +34,9 @@
@@ -1631,7 +1631,7 @@ index 0452facbe..1da906512 100644
16311631

16321632
/*
16331633
diff --git a/src/VBox/VMM/VMMR3/NEMR3Native-linux.cpp b/src/VBox/VMM/VMMR3/NEMR3Native-linux.cpp
1634-
index fa7314159..38251a556 100644
1634+
index fa73141590..38251a5568 100644
16351635
--- a/src/VBox/VMM/VMMR3/NEMR3Native-linux.cpp
16361636
+++ b/src/VBox/VMM/VMMR3/NEMR3Native-linux.cpp
16371637
@@ -38,20 +38,29 @@
@@ -3020,7 +3020,7 @@ index fa7314159..38251a556 100644
30203020
*/
30213021
-
30223022
diff --git a/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp b/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp
3023-
index f11f0b215..d723f5453 100644
3023+
index f11f0b2151..d723f54531 100644
30243024
--- a/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp
30253025
+++ b/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp
30263026
@@ -34,6 +34,7 @@
@@ -3162,7 +3162,7 @@ index f11f0b215..d723f5453 100644
31623162
};
31633163

31643164
diff --git a/src/VBox/VMM/VMMR3/PGMPhys.cpp b/src/VBox/VMM/VMMR3/PGMPhys.cpp
3165-
index fb9fd6682..b54be5208 100644
3165+
index fb9fd66828..b54be52089 100644
31663166
--- a/src/VBox/VMM/VMMR3/PGMPhys.cpp
31673167
+++ b/src/VBox/VMM/VMMR3/PGMPhys.cpp
31683168
@@ -1862,7 +1862,12 @@ int pgmR3PhysRamPreAllocate(PVM pVM)
@@ -3179,7 +3179,7 @@ index fb9fd6682..b54be5208 100644
31793179

31803180
/*
31813181
diff --git a/src/VBox/VMM/VMMR3/VMM.cpp b/src/VBox/VMM/VMMR3/VMM.cpp
3182-
index e235184c5..787df961f 100644
3182+
index e235184c56..787df961f1 100644
31833183
--- a/src/VBox/VMM/VMMR3/VMM.cpp
31843184
+++ b/src/VBox/VMM/VMMR3/VMM.cpp
31853185
@@ -1092,6 +1092,11 @@ static DECLCALLBACK(int) vmmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion,
@@ -3195,7 +3195,7 @@ index e235184c5..787df961f 100644
31953195
}
31963196

31973197
diff --git a/src/VBox/VMM/include/GIMHvInternal.h b/src/VBox/VMM/include/GIMHvInternal.h
3198-
index 960dc36c6..14b00b739 100644
3198+
index 960dc36c6c..14b00b7394 100644
31993199
--- a/src/VBox/VMM/include/GIMHvInternal.h
32003200
+++ b/src/VBox/VMM/include/GIMHvInternal.h
32013201
@@ -202,6 +202,8 @@
@@ -3208,7 +3208,7 @@ index 960dc36c6..14b00b739 100644
32083208

32093209

32103210
diff --git a/src/VBox/VMM/include/NEMInternal.h b/src/VBox/VMM/include/NEMInternal.h
3211-
index e0817e219..35a7665f4 100644
3211+
index e0817e219c..35a7665f4f 100644
32123212
--- a/src/VBox/VMM/include/NEMInternal.h
32133213
+++ b/src/VBox/VMM/include/NEMInternal.h
32143214
@@ -35,13 +35,24 @@
@@ -3276,5 +3276,5 @@ index e0817e219..35a7665f4 100644
32763276
#endif /* !VMM_INCLUDED_SRC_include_NEMInternal_h */
32773277
-
32783278
--
3279-
2.44.0
3279+
2.43.0
32803280

0 commit comments

Comments
 (0)