3 files changed, 0 insertions, 120 deletions

diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
deleted file mode 100644
index f8b9743c21c8..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c	2013-09-06 06:30:30.000000000 -0600
-+++ src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c	2013-09-18 12:01:45.000000000 -0600
-@@ -79,8 +79,13 @@
-             return VERR_NO_EXEC_MEMORY;
- 
-         /* Addr contains a start address vm_map_find will start searching for suitable space at. */
-+#if __FreeBSD_version >= 1000055
-+        int rc = vm_map_find(kernel_map, pVmObject, 0, &Addr,
-+                             cbAllocated, 0, VMFS_ANY_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
-+#else
-         int rc = vm_map_find(kernel_map, pVmObject, 0, &Addr,
-                              cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0);
-+#endif
-         if (rc == KERN_SUCCESS)
-         {
-             rc = vm_map_wire(kernel_map, Addr, Addr + cbAllocated,
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
deleted file mode 100644
index b666b7ed0362..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
+++ /dev/null
@@ -1,56 +0,0 @@
-From Alan L. Cox on FreeBSD-current:
-
-    I just glanced at the virtualbox code for a couple minutes.  For
-    FreeBSD 9 and 10, these lock acquires are completely unnecessary, and
-    have been since FreeBSD 9.0.  Just delete them.  They may be equally
-    unnecessary under FreeBSD 8, but I didn't look carefully enough to
-    answer that question.
-
-[1] http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html
----
- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-index 5c90cf3..1176b51 100644
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-@@ -164,14 +164,19 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
-         {
-             VM_OBJECT_LOCK(pMemFreeBSD->pObject);
-             vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
-+#if __FreeBSD_version < 900000
-+            /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */
-             vm_page_lock_queues();
-+#endif
-             for (vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
-                  pPage != NULL;
-                  pPage = vm_page_next(pPage))
-             {
-                 vm_page_unwire(pPage, 0);
-             }
-+#if __FreeBSD_version < 900000
-             vm_page_unlock_queues();
-+#endif
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-             vm_object_deallocate(pMemFreeBSD->pObject);
-             break;
-@@ -263,11 +268,15 @@ static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
-             while (iPage-- > 0)
-             {
-                 pPage = vm_page_lookup(pObject, iPage);
-+#if __FreeBSD_version < 900000
-                 vm_page_lock_queues();
-+#endif
-                 if (fWire)
-                     vm_page_unwire(pPage, 0);
-                 vm_page_free(pPage);
-+#if __FreeBSD_version < 900000
-                 vm_page_unlock_queues();
-+#endif
-             }
-             VM_OBJECT_UNLOCK(pObject);
-             return rcNoMem;
--- 
-1.7.11.5
-
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
deleted file mode 100644
index 6dfe0b99208e..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2013-09-06 12:30:30.000000000 +0000
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-09-21 18:12:53.000000000 +0000
-@@ -286,9 +286,15 @@
-     pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, cPages);
- 
-     /* No additional object reference for auto-deallocation upon unmapping. */
-+#if __FreeBSD_version >= 1000055
-+    rc = vm_map_find(kernel_map, pMemFreeBSD->pObject, 0,
-+                     &MapAddress, pMemFreeBSD->Core.cb, 0, VMFS_ANY_SPACE,
-+                     fExecutable ? VM_PROT_ALL : VM_PROT_RW, VM_PROT_ALL, 0);
-+#else
-     rc = vm_map_find(kernel_map, pMemFreeBSD->pObject, 0,
-                      &MapAddress, pMemFreeBSD->Core.cb, VMFS_ANY_SPACE,
-                      fExecutable ? VM_PROT_ALL : VM_PROT_RW, VM_PROT_ALL, 0);
-+#endif
- 
-     if (rc == KERN_SUCCESS)
-     {
-@@ -551,6 +557,9 @@
-                      0,                             /* offset */
-                      &MapAddress,                   /* addr (IN/OUT) */
-                      cb,                            /* length */
-+#if __FreeBSD_version >= 1000055
-+                     0,                             /* max addr */
-+#endif
-                      pvFixed == (void *)-1 ? VMFS_ANY_SPACE : VMFS_NO_SPACE,
-                                                     /* find_space */
-                      VM_PROT_NONE,                  /* protection */
-@@ -628,6 +637,9 @@
-                      offSub,                /* Start offset in the object */
-                      &Addr,                 /* Start address IN/OUT */
-                      cbSub,                 /* Size of the mapping */
-+#if __FreeBSD_version >= 1000055
-+                     0,                     /* Upper bound of mapping */
-+#endif
-                      VMFS_ANY_SPACE,        /* Whether a suitable address should be searched for first */
-                      ProtectionFlags,       /* protection flags */
-                      VM_PROT_ALL,           /* Maximum protection flags */
-@@ -704,6 +716,9 @@
-                      0,                     /* Start offset in the object */
-                      &AddrR3,               /* Start address IN/OUT */
-                      pMemToMap->cb,         /* Size of the mapping */
-+#if __FreeBSD_version >= 1000055
-+                     0,                     /* Upper bound of the mapping */
-+#endif
-                      R3PtrFixed == (RTR3PTR)-1 ? VMFS_ANY_SPACE : VMFS_NO_SPACE,
-                                             /* Whether a suitable address should be searched for first */
-                      ProtectionFlags,       /* protection flags */