 @@ -1,14 +1,14 @@
-.\"	$NetBSD: libnvmm.3,v 1.11 2019/02/05 15:03:35 wiz Exp $
+.\"	$NetBSD: libnvmm.3,v 1.12 2019/03/21 20:21:40 maxv Exp $
 .\"
 .\" Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Maxime Villard.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -17,27 +17,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 5, 2019
+.Dd March 19, 2019
 .Dt LIBNVMM 3
 .Os
 .Sh NAME
 .Nm libnvmm
 .Nd NetBSD Virtualization API
 .Sh LIBRARY
 .Lb libnvmm
 .Sh SYNOPSIS
 .In nvmm.h
 .Ft int
 .Fn nvmm_capability "struct nvmm_capability *cap"
 .Ft int
 .Fn nvmm_machine_create "struct nvmm_machine *mach"
 @@ -58,27 +58,27 @@
     "void *state" "uint64_t flags"
 .Ft int
 .Fn nvmm_vcpu_inject "struct nvmm_machine *mach" "nvmm_cpuid_t cpuid" \
     "struct nvmm_event *event"
 .Ft int
 .Fn nvmm_vcpu_run "struct nvmm_machine *mach" "nvmm_cpuid_t cpuid" \
     "struct nvmm_exit *exit"
 .Ft int
 .Fn nvmm_hva_map "struct nvmm_machine *mach" "uintptr_t hva" "size_t size"
 .Ft int
 .Fn nvmm_hva_unmap "struct nvmm_machine *mach" "uintptr_t hva" "size_t size"
 .Ft int
 .Fn nvmm_gpa_map "struct nvmm_machine *mach" "uintptr_t hva" "gpaddr_t gpa" \
-    "size_t size" "int flags"
+    "size_t size" "int prot"
 .Ft int
 .Fn nvmm_gpa_unmap "struct nvmm_machine *mach" "uintptr_t hva" "gpaddr_t gpa" \
     "size_t size"
 .Ft int
 .Fn nvmm_gva_to_gpa "struct nvmm_machine *mach" "nvmm_cpuid_t cpuid" \
     "gvaddr_t gva" "gpaddr_t *gpa" "nvmm_prot_t *prot"
 .Ft int
 .Fn nvmm_gpa_to_hva "struct nvmm_machine *mach" "gpaddr_t gpa" \
     "uintptr_t *hva"
 .Ft void
 .Fn nvmm_callbacks_register "const struct nvmm_callbacks *cbs"
 .Ft int
 .Fn nvmm_assist_io "struct nvmm_machine *mach" "nvmm_cpuid_t cpuid" \

 @@ -1,14 +1,14 @@
-/*	$NetBSD: libnvmm.c,v 1.6 2018/12/27 07:22:31 maxv Exp $	*/
+/*	$NetBSD: libnvmm.c,v 1.7 2019/03/21 20:21:40 maxv Exp $	*/
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -364,44 +364,44 @@ nvmm_vcpu_run(struct nvmm_machine *mach,
 	memset(&args.exit, 0, sizeof(args.exit));
 	ret = ioctl(nvmm_fd, NVMM_IOC_VCPU_RUN, &args);
 	if (ret == -1)
 		return -1;
 	memcpy(exit, &args.exit, sizeof(args.exit));
 	return 0;
+}
 int
 nvmm_gpa_map(struct nvmm_machine *mach, uintptr_t hva, gpaddr_t gpa,
-    size_t size, int flags)
+    size_t size, int prot)
+{
 	struct nvmm_ioc_gpa_map args;
 	int ret;
 	if (nvmm_init() == -1) {
 		return -1;
+	}
 	ret = __area_add(mach, hva, gpa, size);
 	if (ret == -1)
 		return -1;
 	args.machid = mach->machid;
 	args.hva = hva;
 	args.gpa = gpa;
 	args.size = size;
-	args.flags = flags;
+	args.prot = prot;
 	ret = ioctl(nvmm_fd, NVMM_IOC_GPA_MAP, &args);
 	if (ret == -1) {
 		/* Can't recover. */
 		abort();
+	}
 	return 0;
+}
 int
 nvmm_gpa_unmap(struct nvmm_machine *mach, uintptr_t hva, gpaddr_t gpa,
     size_t size)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nvmm.c,v 1.10 2019/03/14 19:10:27 maxv Exp $	*/
+/*	$NetBSD: nvmm.c,v 1.11 2019/03/21 20:21:40 maxv Exp $	*/
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,37 +20,38 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.10 2019/03/14 19:10:27 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.11 2019/03/21 20:21:40 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 #include <sys/conf.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/proc.h>
 #include <sys/mman.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_page.h>
 #include "ioconf.h"
 #include <dev/nvmm/nvmm.h>
 #include <dev/nvmm/nvmm_internal.h>
 #include <dev/nvmm/nvmm_ioctl.h>
 static struct nvmm_machine machines[NVMM_MAX_MACHINES];
 static const struct nvmm_impl *nvmm_impl_list[] = {
 @@ -483,27 +484,27 @@ nvmm_do_vcpu_run(struct nvmm_machine *ma
     struct nvmm_exit *exit)
+{
 	struct vmspace *vm = mach->vm;
 	while (1) {
 		(*nvmm_impl->vcpu_run)(mach, vcpu, exit);
 		if (__predict_true(exit->reason != NVMM_EXIT_MEMORY)) {
 			break;
+		}
 		if (exit->u.mem.gpa >= mach->gpa_end) {
 			break;
+		}
-		if (uvm_fault(&vm->vm_map, exit->u.mem.gpa, VM_PROT_ALL)) {
+		if (uvm_fault(&vm->vm_map, exit->u.mem.gpa, exit->u.mem.prot)) {
 			break;
+		}
+	}
+}
 static int
 nvmm_vcpu_run(struct nvmm_ioc_vcpu_run *args)
+{
 	struct nvmm_machine *mach;
 	struct nvmm_cpu *vcpu;
 	int error;
 	error = nvmm_machine_get(args->machid, &mach, false);
 @@ -696,26 +697,31 @@ nvmm_hva_unmap(struct nvmm_ioc_hva_unmap
 static int
 nvmm_gpa_map(struct nvmm_ioc_gpa_map *args)
+{
 	struct nvmm_machine *mach;
 	struct uvm_object *uobj;
 	gpaddr_t gpa;
 	size_t off;
 	int error;
 	error = nvmm_machine_get(args->machid, &mach, false);
 	if (error)
 		return error;
 	if ((args->prot & ~(PROT_READ|PROT_WRITE|PROT_EXEC)) != 0) {
 		error = EINVAL;
 		goto out;
+	}
 	if ((args->gpa % PAGE_SIZE) != 0 || (args->size % PAGE_SIZE) != 0 ||
 	    (args->hva % PAGE_SIZE) != 0) {
 		error = EINVAL;
 		goto out;
+	}
 	if (args->hva == 0) {
 		error = EINVAL;
 		goto out;
+	}
 	if (args->gpa < mach->gpa_begin || args->gpa >= mach->gpa_end) {
 		error = EINVAL;
 		goto out;
+	}
 @@ -730,27 +736,27 @@ nvmm_gpa_map(struct nvmm_ioc_gpa_map *ar
 	gpa = args->gpa;
 	uobj = nvmm_hmapping_getuobj(mach, args->hva, args->size, &off);
 	if (uobj == NULL) {
 		error = EINVAL;
 		goto out;
+	}
 	/* Take a reference for the machine. */
 	uao_reference(uobj);
 	/* Map the uobj into the machine address space, as pageable. */
 	error = uvm_map(&mach->vm->vm_map, &gpa, args->size, uobj, off, 0,
-	    UVM_MAPFLAG(UVM_PROT_RWX, UVM_PROT_RWX, UVM_INH_NONE,
+	    UVM_MAPFLAG(args->prot, UVM_PROT_RWX, UVM_INH_NONE,
 	    UVM_ADV_RANDOM, UVM_FLAG_FIXED|UVM_FLAG_UNMAP));
 	if (error) {
 		uao_detach(uobj);
 		goto out;
+	}
 	if (gpa != args->gpa) {
 		uao_detach(uobj);
 		printf("[!] uvm_map problem\n");
 		error = EINVAL;
 		goto out;
+	}
 out:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nvmm.h,v 1.4 2019/01/26 15:12:20 maxv Exp $	*/
+/*	$NetBSD: nvmm.h,v 1.5 2019/03/21 20:21:40 maxv Exp $	*/
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -54,34 +54,28 @@ enum nvmm_exit_reason {
 	NVMM_EXIT_INT_READY	= 0x0000000000000004,
 	NVMM_EXIT_NMI_READY	= 0x0000000000000005,
 	NVMM_EXIT_HALTED	= 0x0000000000000006,
 	NVMM_EXIT_SHUTDOWN	= 0x0000000000000007,
 	/* Instructions (x86). */
 	NVMM_EXIT_MONITOR	= 0x0000000000001000,
 	NVMM_EXIT_MWAIT		= 0x0000000000001001,
 	NVMM_EXIT_MWAIT_COND	= 0x0000000000001002,
 	NVMM_EXIT_INVALID	= 0xFFFFFFFFFFFFFFFF
 };
 enum nvmm_exit_memory_perm {
 	NVMM_EXIT_MEMORY_READ,
 	NVMM_EXIT_MEMORY_WRITE,
 	NVMM_EXIT_MEMORY_EXEC
 };
 struct nvmm_exit_memory {
-	enum nvmm_exit_memory_perm perm;
+	int prot;
 	gpaddr_t gpa;
 	uint8_t inst_len;
 	uint8_t inst_bytes[15];
 };
 enum nvmm_exit_io_type {
 	NVMM_EXIT_IO_IN,
 	NVMM_EXIT_IO_OUT
 };
 struct nvmm_exit_io {
 	enum nvmm_exit_io_type type;
 	uint16_t port;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nvmm_ioctl.h,v 1.3 2019/01/08 07:29:46 maxv Exp $	*/
+/*	$NetBSD: nvmm_ioctl.h,v 1.4 2019/03/21 20:21:40 maxv Exp $	*/
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -99,27 +99,27 @@ struct nvmm_ioc_hva_map {
 struct nvmm_ioc_hva_unmap {
 	nvmm_machid_t machid;
 	uintptr_t hva;
 	size_t size;
 	int flags;
 };
 struct nvmm_ioc_gpa_map {
 	nvmm_machid_t machid;
 	uintptr_t hva;
 	gpaddr_t gpa;
 	size_t size;
-	int flags;
+	int prot;
 };
 struct nvmm_ioc_gpa_unmap {
 	nvmm_machid_t machid;
 	gpaddr_t gpa;
 	size_t size;
 };
 #define NVMM_IOC_CAPABILITY		_IOR ('N',  0, struct nvmm_ioc_capability)
 #define NVMM_IOC_MACHINE_CREATE		_IOWR('N',  1, struct nvmm_ioc_machine_create)
 #define NVMM_IOC_MACHINE_DESTROY	_IOW ('N',  2, struct nvmm_ioc_machine_destroy)
 #define NVMM_IOC_MACHINE_CONFIGURE	_IOW ('N',  3, struct nvmm_ioc_machine_configure)
 #define NVMM_IOC_VCPU_CREATE		_IOW ('N',  4, struct nvmm_ioc_vcpu_create)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nvmm_x86_svm.c,v 1.34 2019/03/14 19:15:26 maxv Exp $	*/
+/*	$NetBSD: nvmm_x86_svm.c,v 1.35 2019/03/21 20:21:41 maxv Exp $	*/
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,34 +20,35 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.34 2019/03/14 19:15:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.35 2019/03/21 20:21:41 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/cpu.h>
 #include <sys/xcall.h>
 #include <sys/mman.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_page.h>
 #include <x86/cputypes.h>
 #include <x86/specialreg.h>
 #include <x86/pmap.h>
 #include <x86/dbregs.h>
 #include <x86/cpu_counter.h>
 #include <machine/cpuvar.h>
 #include <dev/nvmm/nvmm.h>
 #include <dev/nvmm/nvmm_internal.h>
 @@ -1056,31 +1057,31 @@ svm_exit_msr(struct nvmm_machine *mach,
 	exit->reason = NVMM_EXIT_MSR;
 	exit->u.msr.npc = cpudata->vmcb->ctrl.nrip;
+}
 static void
 svm_exit_npf(struct nvmm_machine *mach, struct nvmm_cpu *vcpu,
     struct nvmm_exit *exit)
+{
 	struct svm_cpudata *cpudata = vcpu->cpudata;
 	gpaddr_t gpa = cpudata->vmcb->ctrl.exitinfo2;
 	exit->reason = NVMM_EXIT_MEMORY;
 	if (cpudata->vmcb->ctrl.exitinfo1 & PGEX_W)
-		exit->u.mem.perm = NVMM_EXIT_MEMORY_WRITE;
+		exit->u.mem.prot = PROT_WRITE;
 	else if (cpudata->vmcb->ctrl.exitinfo1 & PGEX_X)
-		exit->u.mem.perm = NVMM_EXIT_MEMORY_EXEC;
+		exit->u.mem.prot = PROT_EXEC;
 	else
-		exit->u.mem.perm = NVMM_EXIT_MEMORY_READ;
+		exit->u.mem.prot = PROT_READ;
 	exit->u.mem.gpa = gpa;
 	exit->u.mem.inst_len = cpudata->vmcb->ctrl.inst_len;
 	memcpy(exit->u.mem.inst_bytes, cpudata->vmcb->ctrl.inst_bytes,
 	    sizeof(exit->u.mem.inst_bytes));
+}
 static void
 svm_exit_insn(struct vmcb *vmcb, struct nvmm_exit *exit, uint64_t reason)
+{
 	exit->u.insn.npc = vmcb->ctrl.nrip;
 	exit->reason = reason;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nvmm_x86_vmx.c,v 1.19 2019/03/14 20:29:53 maxv Exp $	*/
+/*	$NetBSD: nvmm_x86_vmx.c,v 1.20 2019/03/21 20:21:41 maxv Exp $	*/
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,34 +20,35 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.19 2019/03/14 20:29:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.20 2019/03/21 20:21:41 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/cpu.h>
 #include <sys/xcall.h>
 #include <sys/mman.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_page.h>
 #include <x86/cputypes.h>
 #include <x86/specialreg.h>
 #include <x86/pmap.h>
 #include <x86/dbregs.h>
 #include <x86/cpu_counter.h>
 #include <machine/cpuvar.h>
 #include <dev/nvmm/nvmm.h>
 #include <dev/nvmm/nvmm_internal.h>
 @@ -1590,31 +1591,31 @@ error:
 static void
 vmx_exit_epf(struct nvmm_machine *mach, struct nvmm_cpu *vcpu,
     struct nvmm_exit *exit)
+{
 	uint64_t perm;
 	gpaddr_t gpa;
 	vmx_vmread(VMCS_GUEST_PHYSICAL_ADDRESS, &gpa);
 	exit->reason = NVMM_EXIT_MEMORY;
 	vmx_vmread(VMCS_EXIT_QUALIFICATION, &perm);
 	if (perm & VMX_EPT_VIOLATION_WRITE)
-		exit->u.mem.perm = NVMM_EXIT_MEMORY_WRITE;
+		exit->u.mem.prot = PROT_WRITE;
 	else if (perm & VMX_EPT_VIOLATION_EXECUTE)
-		exit->u.mem.perm = NVMM_EXIT_MEMORY_EXEC;
+		exit->u.mem.prot = PROT_EXEC;
 	else
-		exit->u.mem.perm = NVMM_EXIT_MEMORY_READ;
+		exit->u.mem.prot = PROT_READ;
 	exit->u.mem.gpa = gpa;
 	exit->u.mem.inst_len = 0;
+}
 /* -------------------------------------------------------------------------- */
 static void
 vmx_vcpu_guest_fpu_enter(struct nvmm_cpu *vcpu)
+{
 	struct vmx_cpudata *cpudata = vcpu->cpudata;
 	cpudata->ts_set = (rcr0() & CR0_TS) != 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: h_io_assist.c,v 1.4 2019/03/19 19:23:39 maxv Exp $	*/
+/*	$NetBSD: h_io_assist.c,v 1.5 2019/03/21 20:21:41 maxv Exp $	*/
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -116,43 +116,48 @@ reset_machine(struct nvmm_machine *mach)
 	/* Page tables. */
 	state.crs[NVMM_X64_CR_CR3] = 0x3000;
 	state.gprs[NVMM_X64_GPR_RIP] = 0x2000;
 	if (nvmm_vcpu_setstate(mach, 0, &state, NVMM_X64_STATE_ALL) == -1)
 		err(errno, "nvmm_vcpu_setstate");
+}
 static void
 map_pages(struct nvmm_machine *mach)
+{
 	pt_entry_t *L4, *L3, *L2, *L1;
 	int ret;
 	instbuf = mmap(NULL, PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE,
 	    -1, 0);
 	if (instbuf == MAP_FAILED)
 		err(errno, "mmap");
 	databuf = mmap(NULL, PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE,
 	    -1, 0);
 	if (databuf == MAP_FAILED)
 		err(errno, "mmap");
 	if (nvmm_hva_map(mach, (uintptr_t)instbuf, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
 	if (nvmm_hva_map(mach, (uintptr_t)databuf, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)instbuf, 0x2000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)instbuf, 0x2000, PAGE_SIZE,
 	    PROT_READ|PROT_EXEC);
 	if (ret == -1)
 		err(errno, "nvmm_gpa_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)databuf, 0x1000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)databuf, 0x1000, PAGE_SIZE,
 	    PROT_READ|PROT_WRITE);
 	if (ret == -1)
 		err(errno, "nvmm_gpa_map");
 	L4 = mmap(NULL, PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE,
 	    -1, 0);
 	if (L4 == MAP_FAILED)
 		err(errno, "mmap");
 	L3 = mmap(NULL, PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE,
 	    -1, 0);
 	if (L3 == MAP_FAILED)
 		err(errno, "mmap");
 	L2 = mmap(NULL, PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE,
 	    -1, 0);
 	if (L2 == MAP_FAILED)
 @@ -161,33 +166,41 @@ map_pages(struct nvmm_machine *mach)
 	    -1, 0);
 	if (L1 == MAP_FAILED)
 		err(errno, "mmap");
 	if (nvmm_hva_map(mach, (uintptr_t)L4, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
 	if (nvmm_hva_map(mach, (uintptr_t)L3, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
 	if (nvmm_hva_map(mach, (uintptr_t)L2, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
 	if (nvmm_hva_map(mach, (uintptr_t)L1, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)L4, 0x3000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)L4, 0x3000, PAGE_SIZE,
 	    PROT_READ|PROT_WRITE);
 	if (ret == -1)
 		err(errno, "nvmm_gpa_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)L3, 0x4000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)L3, 0x4000, PAGE_SIZE,
 	    PROT_READ|PROT_WRITE);
 	if (ret == -1)
 		err(errno, "nvmm_gpa_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)L2, 0x5000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)L2, 0x5000, PAGE_SIZE,
 	    PROT_READ|PROT_WRITE);
 	if (ret == -1)
 		err(errno, "nvmm_gpa_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)L1, 0x6000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)L1, 0x6000, PAGE_SIZE,
 	if (ret == -1)
 	    PROT_READ|PROT_WRITE);
 		err(errno, "nvmm_gpa_map");
 	memset(L4, 0, PAGE_SIZE);
 	memset(L3, 0, PAGE_SIZE);
 	memset(L2, 0, PAGE_SIZE);
 	memset(L1, 0, PAGE_SIZE);
 	L4[0] = PTE_P | PTE_W | 0x4000;
 	L3[0] = PTE_P | PTE_W | 0x5000;
 	L2[0] = PTE_P | PTE_W | 0x6000;
 	L1[0x2000 / PAGE_SIZE] = PTE_P | PTE_W | 0x2000;
 	L1[0x1000 / PAGE_SIZE] = PTE_P | PTE_W | 0x1000;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: h_mem_assist.c,v 1.7 2019/03/19 19:23:39 maxv Exp $	*/
+/*	$NetBSD: h_mem_assist.c,v 1.8 2019/03/21 20:21:41 maxv Exp $	*/
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -121,27 +121,29 @@ reset_machine(struct nvmm_machine *mach)
 static void
 map_pages(struct nvmm_machine *mach)
+{
 	pt_entry_t *L4, *L3, *L2, *L1;
 	instbuf = mmap(NULL, PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE,
 	    -1, 0);
 	if (instbuf == MAP_FAILED)
 		err(errno, "mmap");
 	if (nvmm_hva_map(mach, (uintptr_t)instbuf, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)instbuf, 0x2000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)instbuf, 0x2000, PAGE_SIZE,
 	    PROT_READ|PROT_EXEC);
 	if (ret == -1)
 		err(errno, "nvmm_gpa_map");
 	L4 = mmap(NULL, PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE,
 	    -1, 0);
 	if (L4 == MAP_FAILED)
 		err(errno, "mmap");
 	L3 = mmap(NULL, PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE,
 	    -1, 0);
 	if (L3 == MAP_FAILED)
 		err(errno, "mmap");
 	L2 = mmap(NULL, PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE,
 	    -1, 0);
 	if (L2 == MAP_FAILED)
 @@ -150,33 +152,41 @@ map_pages(struct nvmm_machine *mach)
 	    -1, 0);
 	if (L1 == MAP_FAILED)
 		err(errno, "mmap");
 	if (nvmm_hva_map(mach, (uintptr_t)L4, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
 	if (nvmm_hva_map(mach, (uintptr_t)L3, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
 	if (nvmm_hva_map(mach, (uintptr_t)L2, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
 	if (nvmm_hva_map(mach, (uintptr_t)L1, PAGE_SIZE) == -1)
 		err(errno, "nvmm_hva_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)L4, 0x3000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)L4, 0x3000, PAGE_SIZE,
 	    PROT_READ|PROT_WRITE);
 	if (ret == -1)
 		err(errno, "nvmm_gpa_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)L3, 0x4000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)L3, 0x4000, PAGE_SIZE,
 	    PROT_READ|PROT_WRITE);
 	if (ret == -1)
 		err(errno, "nvmm_gpa_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)L2, 0x5000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)L2, 0x5000, PAGE_SIZE,
 	    PROT_READ|PROT_WRITE);
 	if (ret == -1)
 		err(errno, "nvmm_gpa_map");
-	if (nvmm_gpa_map(mach, (uintptr_t)L1, 0x6000, PAGE_SIZE, 0) == -1)
+	ret = nvmm_gpa_map(mach, (uintptr_t)L1, 0x6000, PAGE_SIZE,
 	    PROT_READ|PROT_WRITE);
 	if (ret == -1)
 		err(errno, "nvmm_gpa_map");
 	memset(L4, 0, PAGE_SIZE);
 	memset(L3, 0, PAGE_SIZE);
 	memset(L2, 0, PAGE_SIZE);
 	memset(L1, 0, PAGE_SIZE);
 	L4[0] = PTE_P | PTE_W | 0x4000;
 	L3[0] = PTE_P | PTE_W | 0x5000;
 	L2[0] = PTE_P | PTE_W | 0x6000;
 	L1[0x2000 / PAGE_SIZE] = PTE_P | PTE_W | 0x2000;
 	L1[0x1000 / PAGE_SIZE] = PTE_P | PTE_W | 0x1000;
+}