Skip to content

Commit 1c0683c

Browse files
committed
patches: update for version 20240828
1 parent 8f9982e commit 1c0683c

11 files changed

+546
-588
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ After having all the prerequisites installed, the build process can be condensed
5353
to the following steps:
5454

5555
```shell
56-
$ # Download the VirtualBox 7.0.18 source package from Oracle.
57-
$ tar xf VirtualBox-7.0.18.tar.bz2
56+
$ # Download the VirtualBox 7.0.20 source package from Oracle.
57+
$ tar xf VirtualBox-7.0.20.tar.bz2
5858
$ git clone https://github.com/cyberus-technology/virtualbox-kvm vbox-kvm
59-
$ cd VirtualBox-7.0.18
59+
$ cd VirtualBox-7.0.20
6060
$ git init
6161
$ git add *
6262
$ git commit -m "VirtualBox vanilla code"

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

Lines changed: 523 additions & 118 deletions
Large diffs are not rendered by default.

patches/0002-pci-passthrough-add-VFIO-implementation.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2053,7 +2053,7 @@ index 0000000000..d8cf3ef1b0
20532053
+ return {barValue & std::numeric_limits<uint32_t>::max()};
20542054
+}
20552055
diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk
2056-
index a17e655fa7..d2bef9129d 100644
2056+
index 3e22f141b8..90f01dbd20 100644
20572057
--- a/src/VBox/Devices/Makefile.kmk
20582058
+++ b/src/VBox/Devices/Makefile.kmk
20592059
@@ -187,6 +187,8 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SU
@@ -2077,7 +2077,7 @@ index a17e655fa7..d2bef9129d 100644
20772077
ifn1of ($(KBUILD_TARGET), darwin)
20782078
VBoxDD_SOURCES += Storage/HBDMgmt-generic.cpp
20792079
diff --git a/src/VBox/Devices/build/VBoxDD.cpp b/src/VBox/Devices/build/VBoxDD.cpp
2080-
index 36b12c694f..d601e45546 100644
2080+
index 1e88822d41..8e51da7c4f 100644
20812081
--- a/src/VBox/Devices/build/VBoxDD.cpp
20822082
+++ b/src/VBox/Devices/build/VBoxDD.cpp
20832083
@@ -218,6 +218,9 @@ extern "C" DECLEXPORT(int) VBoxDevicesRegister(PPDMDEVREGCB pCallbacks, uint32_t
@@ -2091,7 +2091,7 @@ index 36b12c694f..d601e45546 100644
20912091
if (RT_FAILURE(rc))
20922092
return rc;
20932093
diff --git a/src/VBox/Devices/build/VBoxDD.h b/src/VBox/Devices/build/VBoxDD.h
2094-
index 9350f42885..d208ea1e7f 100644
2094+
index e451abcdd5..0927d8a327 100644
20952095
--- a/src/VBox/Devices/build/VBoxDD.h
20962096
+++ b/src/VBox/Devices/build/VBoxDD.h
20972097
@@ -107,6 +107,7 @@ extern const PDMDEVREG g_DeviceEFI;
@@ -2292,10 +2292,10 @@ index a8d36d0717..b4665d696c 100644
22922292
/* ISA/LPC controller */
22932293
{"lpc", 0, 31, 0, 0},
22942294
diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-client/ConsoleImpl2.cpp
2295-
index 3576c49354..7a4ee5db5f 100644
2295+
index cf57754ded..cc919754dc 100644
22962296
--- a/src/VBox/Main/src-client/ConsoleImpl2.cpp
22972297
+++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp
2298-
@@ -674,6 +674,66 @@ HRESULT Console::i_attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *pBusMgr,
2298+
@@ -677,6 +677,66 @@ HRESULT Console::i_attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *pBusMgr,
22992299
#endif
23002300

23012301

@@ -2362,7 +2362,7 @@ index 3576c49354..7a4ee5db5f 100644
23622362
/**
23632363
* Updates the device type for a LED.
23642364
*
2365-
@@ -1734,6 +1794,8 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
2365+
@@ -1737,6 +1797,8 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
23662366
}
23672367
}
23682368

patches/0003-virtio-gpu-Add-virtiogpu-implementation.patch

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4060,7 +4060,7 @@ index 0000000000..fd6a56241c
40604060
+DECLCALLBACK(void) vbvavirtioGpuPortReportHostCursorCapabilities(PPDMIDISPLAYPORT, bool, bool);
40614061
+DECLCALLBACK(void) vbvavirtioGpuPortReportHostCursorPosition(PPDMIDISPLAYPORT, uint32_t, uint32_t, bool);
40624062
diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk
4063-
index d2bef9129d..a4caa91016 100644
4063+
index 90f01dbd20..69e96a4d82 100644
40644064
--- a/src/VBox/Devices/Makefile.kmk
40654065
+++ b/src/VBox/Devices/Makefile.kmk
40664066
@@ -197,6 +197,10 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SU
@@ -4088,10 +4088,10 @@ index d2bef9129d..a4caa91016 100644
40884088
VBoxDD_SOURCES += Storage/HBDMgmt-generic.cpp
40894089
endif
40904090
diff --git a/src/VBox/Devices/VirtIO/VirtioCore.cpp b/src/VBox/Devices/VirtIO/VirtioCore.cpp
4091-
index f0ed6e4219..6e33955f09 100644
4091+
index a0deddd698..669cf335c0 100644
40924092
--- a/src/VBox/Devices/VirtIO/VirtioCore.cpp
40934093
+++ b/src/VBox/Devices/VirtIO/VirtioCore.cpp
4094-
@@ -1446,7 +1446,7 @@ static int virtioNudgeGuest(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint8_t uCa
4094+
@@ -1451,7 +1451,7 @@ static int virtioNudgeGuest(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint8_t uCa
40954095

40964096
if (!pVirtio->fMsiSupport)
40974097
{
@@ -4101,10 +4101,10 @@ index f0ed6e4219..6e33955f09 100644
41014101
}
41024102
else if (uMsixVector != VIRTIO_MSI_NO_VECTOR)
41034103
diff --git a/src/VBox/Devices/build/VBoxDD.cpp b/src/VBox/Devices/build/VBoxDD.cpp
4104-
index d601e45546..e7497c649f 100644
4104+
index 8e51da7c4f..ea4353a2c7 100644
41054105
--- a/src/VBox/Devices/build/VBoxDD.cpp
41064106
+++ b/src/VBox/Devices/build/VBoxDD.cpp
4107-
@@ -250,6 +250,9 @@ extern "C" DECLEXPORT(int) VBoxDevicesRegister(PPDMDEVREGCB pCallbacks, uint32_t
4107+
@@ -254,6 +254,9 @@ extern "C" DECLEXPORT(int) VBoxDevicesRegister(PPDMDEVREGCB pCallbacks, uint32_t
41084108
if (RT_FAILURE(rc))
41094109
return rc;
41104110
#endif
@@ -4115,7 +4115,7 @@ index d601e45546..e7497c649f 100644
41154115
return VINF_SUCCESS;
41164116
}
41174117
diff --git a/src/VBox/Devices/build/VBoxDD.h b/src/VBox/Devices/build/VBoxDD.h
4118-
index d208ea1e7f..63dedfaa64 100644
4118+
index 0927d8a327..fbd4f800c9 100644
41194119
--- a/src/VBox/Devices/build/VBoxDD.h
41204120
+++ b/src/VBox/Devices/build/VBoxDD.h
41214121
@@ -109,6 +109,7 @@ extern const PDMDEVREG g_DevicePciRaw;
@@ -4957,10 +4957,10 @@ index b4665d696c..1085b52865 100644
49574957
/* ISA/LPC controller */
49584958
{"lpc", 0, 31, 0, 0},
49594959
diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-client/ConsoleImpl2.cpp
4960-
index 7a4ee5db5f..b571253e26 100644
4960+
index cc919754dc..112341cefe 100644
49614961
--- a/src/VBox/Main/src-client/ConsoleImpl2.cpp
49624962
+++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp
4963-
@@ -674,7 +674,7 @@ HRESULT Console::i_attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *pBusMgr,
4963+
@@ -677,7 +677,7 @@ HRESULT Console::i_attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *pBusMgr,
49644964
#endif
49654965

49664966

@@ -4969,7 +4969,7 @@ index 7a4ee5db5f..b571253e26 100644
49694969
{
49704970
HRESULT hrc {S_OK};
49714971
PCFGMNODE pInst{NULL};
4972-
@@ -734,6 +734,39 @@ HRESULT Console::i_attachVfioDevices(BusAssignmentManager *pBusMgr, PCFGMNODE pD
4972+
@@ -737,6 +737,39 @@ HRESULT Console::i_attachVfioDevices(BusAssignmentManager *pBusMgr, PCFGMNODE pD
49734973
return hrc;
49744974
}
49754975

@@ -5009,7 +5009,7 @@ index 7a4ee5db5f..b571253e26 100644
50095009
/**
50105010
* Updates the device type for a LED.
50115011
*
5012-
@@ -1482,6 +1515,26 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
5012+
@@ -1485,6 +1518,26 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
50135013
bool fGimDebug = false;
50145014
com::Utf8Str strGimDebugAddress = "127.0.0.1";
50155015
uint32_t uGimDebugPort = 50000;
@@ -5036,7 +5036,7 @@ index 7a4ee5db5f..b571253e26 100644
50365036
if (strParavirtDebug.isNotEmpty())
50375037
{
50385038
/* Hyper-V debug options. */
5039-
@@ -1534,8 +1587,6 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
5039+
@@ -1537,8 +1590,6 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
50405040
/* Update HyperV CFGM node with active debug options. */
50415041
if (fGimHvDebug)
50425042
{
@@ -5045,7 +5045,7 @@ index 7a4ee5db5f..b571253e26 100644
50455045
InsertConfigString(pHvNode, "VendorID", strGimHvVendor);
50465046
InsertConfigInteger(pHvNode, "VSInterface", fGimHvVsIf ? 1 : 0);
50475047
InsertConfigInteger(pHvNode, "HypercallDebugInterface", fGimHvHypercallIf ? 1 : 0);
5048-
@@ -1984,6 +2035,23 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
5048+
@@ -1987,6 +2038,23 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
50495049
if (FAILED(vrc))
50505050
return vrc;
50515051
break;
@@ -5069,7 +5069,7 @@ index 7a4ee5db5f..b571253e26 100644
50695069
default:
50705070
AssertMsgFailed(("Invalid graphicsController=%d\n", enmGraphicsController));
50715071
return pVMM->pfnVMR3SetError(pUVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
5072-
@@ -4374,7 +4442,8 @@ int Console::i_configGraphicsController(PCFGMNODE pDevices,
5072+
@@ -4387,7 +4455,8 @@ int Console::i_configGraphicsController(PCFGMNODE pDevices,
50735073
const ComPtr<IMachine> &ptrMachine,
50745074
const ComPtr<IGraphicsAdapter> &ptrGraphicsAdapter,
50755075
const ComPtr<IBIOSSettings> &ptrBiosSettings,
@@ -5079,7 +5079,7 @@ index 7a4ee5db5f..b571253e26 100644
50795079
{
50805080
// InsertConfig* throws
50815081
try
5082-
@@ -4391,11 +4460,24 @@ int Console::i_configGraphicsController(PCFGMNODE pDevices,
5082+
@@ -4404,11 +4473,24 @@ int Console::i_configGraphicsController(PCFGMNODE pDevices,
50835083

50845084
hrc = pBusMgr->assignPCIDevice(pcszDevice, pInst); H();
50855085
InsertConfigNode(pInst, "Config", &pCfg);

patches/0004-NEM-KVM-allow-guests-to-use-fused-multiply-add-FMA.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

patches/0005-NEM-KVM-don-t-redirect-HYPERV-exits-to-GIM.patch

Lines changed: 0 additions & 41 deletions
This file was deleted.

patches/0006-NEM-KVM-add-boiler-plate-code-for-nested-guest-check.patch

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)