Changeset 18960 in vbox for trunk/src/VBox/Runtime/r0drv/freebsd

Timestamp:

Apr 16, 2009 5:22:45 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

46043

Message:

Runtime/R0/FreeBSD: Fix the host crash during VM termination with debug builds

File:

• trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c

@@ -111 +111 @@
         case RTR0MEMOBJTYPE_LOCK:
         {
+            int fFlags = VM_MAP_WIRE_NOHOLES;
             vm_map_t pMap = kernel_map;
+
             if (pMemFreeBSD->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
+            {
                 pMap = &((struct proc *)pMemFreeBSD->Core.u.Lock.R0Process)->p_vmspace->vm_map;
+                fFlags |= VM_MAP_WIRE_USER;
+            }
+            else
+                fFlags |= VM_MAP_WIRE_SYSTEM;
+
             rc = vm_map_unwire(pMap,
                                (vm_offset_t)pMemFreeBSD->Core.pv,
                                (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb,
-                               VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
+                               fFlags);
             AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
             break;
@@ -611 +619 @@
                     AddrR3Dest += PAGE_SIZE;
                 }
+                pObjectToMap = pObjectNew;
             }
             else