Attachment 218208 Details for Bug 249326 – Update VirtualBox patches

[patch] Update VirtualBox patches

svnpatch-vbox.patch (text/plain), 4.24 KB, created by Adriaan de Groot on 2020-09-23 13:15:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adriaan de Groot

Created: 2020-09-23 13:15:55 UTC

Size: 4.24 KB

patch

obsolete

>Index: emulators/virtualbox-ose/Makefile
>===================================================================
>--- emulators/virtualbox-ose/Makefile	(revision 549723)
>+++ emulators/virtualbox-ose/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	virtualbox-ose
> PORTVERSION=	5.2.44
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	emulators
> MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
> DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
>Index: emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_memobj-r0drv-freebsd.c
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_memobj-r0drv-freebsd.c	(revision 549723)
>+++ emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_memobj-r0drv-freebsd.c	(working copy)
>@@ -114,6 +114,16 @@
>                  vm_page_unlock_queues();
>  #endif
>              }
>+@@ -323,7 +323,8 @@
>+     size_t      cPages = atop(pMemFreeBSD->Core.cb);
>+     int         rc;
>+ 
>+-    pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, cPages);
>++    pMemFreeBSD->pObject = vm_pager_allocate(OBJT_PHYS, NULL,
>++      pMemFreeBSD->Core.cb, VM_PROT_ALL, 0, curthread->td_ucred);
>+ 
>+     /* No additional object reference for auto-deallocation upon unmapping. */
>+ #if __FreeBSD_version >= 1000055
> @@ -364,58 +364,77 @@ static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFRE
>  }
>  DECLHIDDEN(int) rtR0MemObjNativeAllocPage(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)
>@@ -200,7 +210,7 @@
>      uint32_t   cPages = atop(cb);
>      vm_paddr_t VmPhysAddrHigh;
>  
>-@@ -432,7 +452,10 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
>+@@ -432,10 +452,14 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
>      PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),
>                                                                         enmType, NULL, cb);
>      if (!pMemFreeBSD)
>@@ -209,8 +219,13 @@
>          return VERR_NO_MEMORY;
> +    }
>  
>-     pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, atop(cb));
>+-    pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, atop(cb));
>++    pMemFreeBSD->pObject = vm_pager_allocate(OBJT_PHYS, NULL, cb, VM_PROT_ALL,
>++       0, curthread->td_ucred);
>  
>+     if (PhysHighest != NIL_RTHCPHYS)
>+         VmPhysAddrHigh = PhysHighest;
>+ 
> @@ -470,6 +493,7 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
>          rtR0MemObjDelete(&pMemFreeBSD->Core);
>      }
>Index: emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_the-freebsd-kernel.h
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_the-freebsd-kernel.h	(revision 549723)
>+++ emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_the-freebsd-kernel.h	(working copy)
>@@ -1,4 +1,4 @@
>---- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig	2018-10-15 14:31:31 UTC
>+--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig	2020-07-09 16:57:38 UTC
> +++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h
> @@ -60,6 +60,7 @@
>  #include <sys/smp.h>
>@@ -8,7 +8,11 @@
>  #include <vm/vm.h>
>  #include <vm/pmap.h>            /* for vtophys */
>  #include <vm/vm_map.h>
>-@@ -70,7 +71,6 @@
>+@@ -67,10 +68,10 @@
>+ #include <vm/vm_kern.h>
>+ #include <vm/vm_param.h>        /* KERN_SUCCESS ++ */
>+ #include <vm/vm_page.h>
>++#include <vm/vm_pager.h>
>  #include <vm/vm_phys.h>         /* vm_phys_alloc_* */
>  #include <vm/vm_extern.h>       /* kmem_alloc_attr */
>  #include <vm/vm_pageout.h>      /* vm_contig_grow_cache */
>@@ -16,7 +20,7 @@
>  #include <sys/resourcevar.h>
>  #include <machine/cpu.h>
>  
>-@@ -114,6 +114,24 @@
>+@@ -114,6 +115,24 @@
>   */
>  #if 0 /** @todo Not available yet. */
>  # define USE_KMEM_ALLOC_PROT
>Index: emulators/virtualbox-ose-kmod/Makefile
>===================================================================
>--- emulators/virtualbox-ose-kmod/Makefile	(revision 549723)
>+++ emulators/virtualbox-ose-kmod/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	virtualbox-ose
> PORTVERSION=	5.2.44
>-PORTREVISION=	1
>+PORTREVISION=	3
> CATEGORIES=	emulators
> MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
> PKGNAMESUFFIX=	-kmod

Actions: View | Diff

Attachments on bug 249326: 217970 | 218206 | 218208 | 218209