diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2021-04-22 18:05:20 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-04-22 18:54:58 +0200 |
| commit | e413567e5b45bde18607c150e5ba1ad4c9f38cc5 (patch) | |
| tree | f2a997081a0a998703583da0ff614b9dfb08ee95 /app-emulation/virtualbox | |
| parent | dev-python/pyopencl: add 2021.1.6 (diff) | |
| download | gentoo-e413567e5b45bde18607c150e5ba1ad4c9f38cc5.tar.gz gentoo-e413567e5b45bde18607c150e5ba1ad4c9f38cc5.tar.bz2 gentoo-e413567e5b45bde18607c150e5ba1ad4c9f38cc5.zip | |
app-emulation/virtualbox: Revbump to fix LsiLogicSAS storage controller
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-emulation/virtualbox')
| -rw-r--r-- | app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch | 41 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild (renamed from app-emulation/virtualbox/virtualbox-6.1.20.ebuild) | 6 |
2 files changed, 46 insertions, 1 deletions
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch b/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch new file mode 100644 index 000000000000..7f1e4b179838 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch @@ -0,0 +1,41 @@ +Index: /trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
+===================================================================
+--- trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (revision 88530)
++++ trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (revision 88643)
+@@ -3678,8 +3678,6 @@
+ LogFlowFunc(("pThis=%#p\n", pThis));
+
+- /* Clear everything first. */
+ AssertPtrReturnVoid(pThisCC->pConfigurationPages);
+ PMptConfigurationPagesSupported pPages = pThisCC->pConfigurationPages;
+- memset(pPages, 0, sizeof(MptConfigurationPagesSupported));
+
+ /* Manufacturing Page 0. */
+Index: /trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h
+===================================================================
+--- trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h (revision 82968)
++++ trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h (revision 88643)
+@@ -3327,13 +3327,17 @@
+
+ #define MPT_CONFIG_PAGE_HEADER_INIT_MANUFACTURING(pg, type, nr, flags) \
++ RT_ZERO(*pg); \
+ MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_MANUFACTURING)
+
+ #define MPT_CONFIG_PAGE_HEADER_INIT_IO_UNIT(pg, type, nr, flags) \
++ RT_ZERO(*pg); \
+ MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_IO_UNIT)
+
+ #define MPT_CONFIG_PAGE_HEADER_INIT_IOC(pg, type, nr, flags) \
++ RT_ZERO(*pg); \
+ MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_IOC)
+
+ #define MPT_CONFIG_PAGE_HEADER_INIT_BIOS(pg, type, nr, flags) \
++ RT_ZERO(*pg); \
+ MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_BIOS)
+
+@@ -3342,4 +3346,5 @@
+ */
+ #define MPT_CONFIG_EXTENDED_PAGE_HEADER_INIT(pg, cb, nr, flags, exttype) \
++ RT_BZERO(pg, cb); \
+ (pg)->u.fields.ExtHeader.u8PageType = (flags) | MPT_CONFIGURATION_PAGE_TYPE_EXTENDED; \
+ (pg)->u.fields.ExtHeader.u8PageNumber = (nr); \
diff --git a/app-emulation/virtualbox/virtualbox-6.1.20.ebuild b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild index 6af250ffce5c..95da7ce00ed7 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.20.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild @@ -139,6 +139,10 @@ REQUIRED_USE=" ${PYTHON_REQUIRED_USE} " +PATCHES=( + "${FILESDIR}/${P}-lsilogicsas_crash_fix.patch" +) + pkg_pretend() { if ! use headless && ! use qt5 ; then einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend." @@ -214,7 +218,7 @@ src_prepare() { eapply "${WORKDIR}/patches" - eapply_user + default } doecho() { |