diff options
Diffstat (limited to 'emulators/virtualbox-ose-kmod/files')
6 files changed, 106 insertions, 28 deletions
diff --git a/emulators/virtualbox-ose-kmod/files/patch-Config.kmk b/emulators/virtualbox-ose-kmod/files/patch-Config.kmk new file mode 100644 index 000000000000..2ce55eb8a12d --- /dev/null +++ b/emulators/virtualbox-ose-kmod/files/patch-Config.kmk @@ -0,0 +1,10 @@ +--- Config.kmk.bak 2009-09-02 18:34:01.000000000 +0200 ++++ Config.kmk 2009-09-02 19:19:09.000000000 +0200 +@@ -781,6 +781,7 @@ + VBOX_WITH_VBOXBFE= + VBOX_WITH_OGL= + VBOX_WITH_KCHMVIEWER= ++ VBOX_WITH_HGSMI= + endif + + # diff --git a/emulators/virtualbox-ose-kmod/files/patch-include-iprt-types.h b/emulators/virtualbox-ose-kmod/files/patch-include-iprt-types.h deleted file mode 100644 index 35f253a391e7..000000000000 --- a/emulators/virtualbox-ose-kmod/files/patch-include-iprt-types.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/iprt/types.h.orig 2009-07-12 21:17:13.000000000 +0200 -+++ include/iprt/types.h 2009-08-12 21:38:17.000000000 +0200 -@@ -92,6 +92,11 @@ - # undef true - # undef bool - -+# elif defined(RT_OS_FREEBSD) -+# define _UINT64_T_DECLARED -+# define _INT64_T_DECLARED -+# include <stddef.h> -+# include <sys/types.h> - # else - # include <stddef.h> - # include <sys/types.h> diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c deleted file mode 100644 index 670495c87b8c..000000000000 --- a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.old 2009-05-04 20:29:23.000000000 +0200 -+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c 2009-05-04 20:30:28.000000000 +0200 -@@ -162,7 +162,11 @@ - if (rc) - { - *ppDev = make_dev(&g_VBoxGuestFreeBSDChrDevSW, -+#if __FreeBSD_version < 800062 - unit2minor(iUnit), -+#else -+ iUnit, -+#endif - UID_ROOT, - GID_WHEEL, - 0644, diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c new file mode 100644 index 000000000000..f5db6a393cf7 --- /dev/null +++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c @@ -0,0 +1,41 @@ +Index: src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c +@@ -215,15 +215,23 @@ static int rtSemEventMultiWait(RTSEMEVEN + + RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); + ++#if __FreeBSD_version >=800026 + if (fInterruptible) + rc = sleepq_timedwait_sig(pEventMultiInt, 0); + else + rc = sleepq_timedwait(pEventMultiInt, 0); ++#else ++ if (fInterruptible) ++ rc = sleepq_timedwait_sig(pEventMultiInt); ++ else ++ rc = sleepq_timedwait(pEventMultiInt); ++#endif + } + else + { + RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); + ++#if __FreeBSD_version >=800026 + if (fInterruptible) + rc = sleepq_wait_sig(pEventMultiInt, 0); + else +@@ -231,6 +239,15 @@ static int rtSemEventMultiWait(RTSEMEVEN + rc = 0; + sleepq_wait(pEventMultiInt, 0); + } ++#else ++ if (fInterruptible) ++ rc = sleepq_wait_sig(pEventMultiInt); ++ else ++ { ++ rc = 0; ++ sleepq_wait(pEventMultiInt); ++ } ++#endif + } + + RTSpinlockAcquire(pEventMultiInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-spinlock-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-spinlock-r0drv-freebsd.c new file mode 100644 index 000000000000..c7c56d5814ee --- /dev/null +++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-spinlock-r0drv-freebsd.c @@ -0,0 +1,14 @@ +Index: src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c +@@ -171,7 +171,12 @@ RTDECL(void) RTSpinlockAcquire(RTSPINLOC + AssertPtr(pThis); + Assert(pThis->u32Magic == RTSPINLOCK_MAGIC); + #ifdef RT_STRICT ++#if 0 ++ /* This can't work because at least RTPowerNotificationRegister calls ++ * RTSpinlockAcquire with *pTmp allocated on the stack. ++ */ + Assert(pTmp->uFlags == 0); ++#endif + pTmp->uFlags = 42; + #endif + diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c new file mode 100644 index 000000000000..c2cdf7963fd7 --- /dev/null +++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c @@ -0,0 +1,41 @@ +Index: src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c +@@ -205,15 +205,23 @@ static int rtSemEventWait(RTSEMEVENT Eve + + RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); + ++#if __FreeBSD_version >=800026 + if (fInterruptible) + rc = sleepq_timedwait_sig(pEventInt, 0); + else + rc = sleepq_timedwait(pEventInt, 0); ++#else ++ if (fInterruptible) ++ rc = sleepq_timedwait_sig(pEventInt); ++ else ++ rc = sleepq_timedwait(pEventInt); ++#endif + } + else + { + RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); + ++#if __FreeBSD_version >=800026 + if (fInterruptible) + rc = sleepq_wait_sig(pEventInt, 0); + else +@@ -221,6 +229,15 @@ static int rtSemEventWait(RTSEMEVENT Eve + rc = 0; + sleepq_wait(pEventInt, 0); + } ++#else ++ if (fInterruptible) ++ rc = sleepq_wait_sig(pEventInt); ++ else ++ { ++ rc = 0; ++ sleepq_wait(pEventInt); ++ } ++#endif + } + + RTSpinlockAcquire(pEventInt->hSpinLock, &Tmp); |