diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2021-04-11 16:09:08 +0000 |
|---|---|---|
| committer | Andy Fiddaman <omnios@citrus-it.co.uk> | 2021-04-19 09:09:36 +0000 |
| commit | 2282d3b00bd23a5df4dfea0edd5ae737693bd4b7 (patch) | |
| tree | 6eefc96f56cfeb6c3b12f88653d11dbde1af76b3 /usr/src | |
| parent | 9558d0b12b2242f8f19a3526ff0656c48b28f657 (diff) | |
| download | illumos-joyent-2282d3b00bd23a5df4dfea0edd5ae737693bd4b7.tar.gz | |
13713 vm_unmap_mmio() should return non zero on error
Reviewed by: Patrick Mooney <pmooney@pfmooney.com>
Reviewed by: Jorge Schrauwen <sjorge@blackdot.be>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/i86pc/io/vmm/vmm.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/vmm/vmm_mem.c | 7 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/vmm/vmm_mem.h | 1 |
3 files changed, 2 insertions, 11 deletions
diff --git a/usr/src/uts/i86pc/io/vmm/vmm.c b/usr/src/uts/i86pc/io/vmm/vmm.c index 047c6e0887..dc7c50c574 100644 --- a/usr/src/uts/i86pc/io/vmm/vmm.c +++ b/usr/src/uts/i86pc/io/vmm/vmm.c @@ -40,6 +40,7 @@ * Copyright 2015 Pluribus Networks Inc. * Copyright 2018 Joyent, Inc. * Copyright 2021 Oxide Computer Company + * Copyright 2021 OmniOS Community Edition (OmniOSce) Association. */ #include <sys/cdefs.h> @@ -703,9 +704,7 @@ vm_map_mmio(struct vm *vm, vm_paddr_t gpa, size_t len, vm_paddr_t hpa) int vm_unmap_mmio(struct vm *vm, vm_paddr_t gpa, size_t len) { - - vmm_mmio_free(vm->vmspace, gpa, len); - return (0); + return (vm_map_remove(&vm->vmspace->vm_map, gpa, gpa + len)); } /* diff --git a/usr/src/uts/i86pc/io/vmm/vmm_mem.c b/usr/src/uts/i86pc/io/vmm/vmm_mem.c index 443a6ffc6f..26862397a1 100644 --- a/usr/src/uts/i86pc/io/vmm/vmm_mem.c +++ b/usr/src/uts/i86pc/io/vmm/vmm_mem.c @@ -109,13 +109,6 @@ vmm_mmio_alloc(struct vmspace *vmspace, vm_paddr_t gpa, size_t len, return (obj); } -void -vmm_mmio_free(struct vmspace *vmspace, vm_paddr_t gpa, size_t len) -{ - - vm_map_remove(&vmspace->vm_map, gpa, gpa + len); -} - vm_paddr_t vmm_mem_maxaddr(void) { diff --git a/usr/src/uts/i86pc/io/vmm/vmm_mem.h b/usr/src/uts/i86pc/io/vmm/vmm_mem.h index eaa499c51a..b27501eef2 100644 --- a/usr/src/uts/i86pc/io/vmm/vmm_mem.h +++ b/usr/src/uts/i86pc/io/vmm/vmm_mem.h @@ -49,7 +49,6 @@ struct vm_object; int vmm_mem_init(void); struct vm_object *vmm_mmio_alloc(struct vmspace *, vm_paddr_t gpa, size_t len, vm_paddr_t hpa); -void vmm_mmio_free(struct vmspace *, vm_paddr_t gpa, size_t size); vm_paddr_t vmm_mem_maxaddr(void); #endif |