summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Fiddaman <omnios@citrus-it.co.uk>2021-04-02 18:39:14 +0000
committerAndy Fiddaman <omnios@citrus-it.co.uk>2021-04-06 10:47:11 +0000
commitb4100263209f454c9f030b30aec0d337c7614e0e (patch)
tree2e8d81587ddf1e9e00343814c5b2d3d2e5285166
parentffb6483089015eb90be1f5e7fc2a96c9929546a6 (diff)
downloadillumos-joyent-b4100263209f454c9f030b30aec0d337c7614e0e.tar.gz
13692 bhyve panic if vmm_drv_purge() fails
Reviewed by: Mike Zeller <mike.zeller@joyent.com> Reviewed by: Patrick Mooney <pmooney@pfmooney.com> Approved by: Robert Mustacchi <rm@fingolfin.org>
-rw-r--r--usr/src/uts/i86pc/io/vmm/vmm_sol_dev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/i86pc/io/vmm/vmm_sol_dev.c b/usr/src/uts/i86pc/io/vmm/vmm_sol_dev.c
index 557d32b764..ebec9bef99 100644
--- a/usr/src/uts/i86pc/io/vmm/vmm_sol_dev.c
+++ b/usr/src/uts/i86pc/io/vmm/vmm_sol_dev.c
@@ -1869,14 +1869,14 @@ vmm_do_vm_destroy_locked(vmm_softc_t *sc, boolean_t clean_zsd,
*hma_release = B_FALSE;
- if (clean_zsd) {
- vmm_zsd_rem_vm(sc);
- }
-
if (vmm_drv_purge(sc) != 0) {
return (EINTR);
}
+ if (clean_zsd) {
+ vmm_zsd_rem_vm(sc);
+ }
+
/* Clean up devmem entries */
vmmdev_devmem_purge(sc);