7 files changed, 33 insertions, 25 deletions

diff --git a/sys/arm64/vmm/io/vgic_v3.c b/sys/arm64/vmm/io/vgic_v3.c
index 67afb3374815..023406c64182 100644
--- a/sys/arm64/vmm/io/vgic_v3.c
+++ b/sys/arm64/vmm/io/vgic_v3.c
@@ -47,7 +47,6 @@
 
 #include <dev/ofw/openfirm.h>
 
-#include <machine/armreg.h>
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/cpufunc.h>
diff --git a/sys/arm64/vmm/io/vtimer.c b/sys/arm64/vmm/io/vtimer.c
index da0f0d96c431..7c7fbb49e691 100644
--- a/sys/arm64/vmm/io/vtimer.c
+++ b/sys/arm64/vmm/io/vtimer.c
@@ -44,7 +44,6 @@
 #include <machine/bus.h>
 #include <machine/machdep.h>
 #include <machine/vmm.h>
-#include <machine/armreg.h>
 
 #include <arm64/vmm/arm64.h>
 
diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c
index aeda689f3b1a..e7b2b5d8c360 100644
--- a/sys/arm64/vmm/vmm.c
+++ b/sys/arm64/vmm/vmm.c
@@ -51,7 +51,6 @@
 #include <vm/vm_extern.h>
 #include <vm/vm_param.h>
 
-#include <machine/armreg.h>
 #include <machine/cpu.h>
 #include <machine/fpu.h>
 #include <machine/machdep.h>
@@ -469,9 +468,9 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid)
 }
 
 void
-vm_slock_vcpus(struct vm *vm)
+vm_lock_vcpus(struct vm *vm)
 {
-	sx_slock(&vm->vcpus_init_lock);
+	sx_xlock(&vm->vcpus_init_lock);
 }
 
 void
@@ -1279,8 +1278,7 @@ vcpu_get_state(struct vcpu *vcpu, int *hostcpu)
 int
 vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval)
 {
-
-	if (reg >= VM_REG_LAST)
+	if (reg < 0 || reg >= VM_REG_LAST)
 		return (EINVAL);
 
 	return (vmmops_getreg(vcpu->cookie, reg, retval));
@@ -1291,7 +1289,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val)
 {
 	int error;
 
-	if (reg >= VM_REG_LAST)
+	if (reg < 0 || reg >= VM_REG_LAST)
 		return (EINVAL);
 	error = vmmops_setreg(vcpu->cookie, reg, val);
 	if (error || reg != VM_REG_GUEST_PC)
diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c
index 618f4afaf8ee..006239431f29 100644
--- a/sys/arm64/vmm/vmm_arm64.c
+++ b/sys/arm64/vmm/vmm_arm64.c
@@ -47,7 +47,6 @@
 #include <vm/vm_page.h>
 #include <vm/vm_param.h>
 
-#include <machine/armreg.h>
 #include <machine/vm.h>
 #include <machine/cpufunc.h>
 #include <machine/cpu.h>
diff --git a/sys/arm64/vmm/vmm_dev_machdep.c b/sys/arm64/vmm/vmm_dev_machdep.c
index 926a74fa528b..29d14e1ba952 100644
--- a/sys/arm64/vmm/vmm_dev_machdep.c
+++ b/sys/arm64/vmm/vmm_dev_machdep.c
@@ -68,19 +68,13 @@ int
 vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data,
     int fflag, struct thread *td)
 {
-	struct vm_run *vmrun;
-	struct vm_vgic_version *vgv;
-	struct vm_vgic_descr *vgic;
-	struct vm_irq *vi;
-	struct vm_exception *vmexc;
-	struct vm_gla2gpa *gg;
-	struct vm_msi *vmsi;
 	int error;
 
 	error = 0;
 	switch (cmd) {
 	case VM_RUN: {
 		struct vm_exit *vme;
+		struct vm_run *vmrun;
 
 		vmrun = (struct vm_run *)data;
 		vme = vm_exitinfo(vcpu);
@@ -94,41 +88,62 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data,
 			break;
 		break;
 	}
-	case VM_INJECT_EXCEPTION:
+	case VM_INJECT_EXCEPTION: {
+		struct vm_exception *vmexc;
+
 		vmexc = (struct vm_exception *)data;
 		error = vm_inject_exception(vcpu, vmexc->esr, vmexc->far);
 		break;
-	case VM_GLA2GPA_NOFAULT:
+	}
+	case VM_GLA2GPA_NOFAULT: {
+		struct vm_gla2gpa *gg;
+
 		gg = (struct vm_gla2gpa *)data;
 		error = vm_gla2gpa_nofault(vcpu, &gg->paging, gg->gla,
 		    gg->prot, &gg->gpa, &gg->fault);
 		KASSERT(error == 0 || error == EFAULT,
 		    ("%s: vm_gla2gpa unknown error %d", __func__, error));
 		break;
-	case VM_GET_VGIC_VERSION:
+	}
+	case VM_GET_VGIC_VERSION: {
+		struct vm_vgic_version *vgv;
+
 		vgv = (struct vm_vgic_version *)data;
 		/* TODO: Query the vgic driver for this */
 		vgv->version = 3;
 		vgv->flags = 0;
 		error = 0;
 		break;
-	case VM_ATTACH_VGIC:
+	}
+	case VM_ATTACH_VGIC: {
+		struct vm_vgic_descr *vgic;
+
 		vgic = (struct vm_vgic_descr *)data;
 		error = vm_attach_vgic(vm, vgic);
 		break;
-	case VM_RAISE_MSI:
+	}
+	case VM_RAISE_MSI: {
+		struct vm_msi *vmsi;
+
 		vmsi = (struct vm_msi *)data;
 		error = vm_raise_msi(vm, vmsi->msg, vmsi->addr, vmsi->bus,
 		    vmsi->slot, vmsi->func);
 		break;
-	case VM_ASSERT_IRQ:
+	}
+	case VM_ASSERT_IRQ: {
+		struct vm_irq *vi;
+
 		vi = (struct vm_irq *)data;
 		error = vm_assert_irq(vm, vi->irq);
 		break;
-	case VM_DEASSERT_IRQ:
+	}
+	case VM_DEASSERT_IRQ: {
+		struct vm_irq *vi;
+
 		vi = (struct vm_irq *)data;
 		error = vm_deassert_irq(vm, vi->irq);
 		break;
+	}
 	default:
 		error = ENOTTY;
 		break;
diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c
index b8c6d2ab7a9a..0ad7930e9a87 100644
--- a/sys/arm64/vmm/vmm_hyp.c
+++ b/sys/arm64/vmm/vmm_hyp.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/proc.h>
 
-#include <machine/armreg.h>
 
 #include "arm64.h"
 #include "hyp.h"
diff --git a/sys/arm64/vmm/vmm_reset.c b/sys/arm64/vmm/vmm_reset.c
index 1240c3ed16ec..0e4910ea87b4 100644
--- a/sys/arm64/vmm/vmm_reset.c
+++ b/sys/arm64/vmm/vmm_reset.c
@@ -31,7 +31,6 @@
 #include <sys/kernel.h>
 #include <sys/lock.h>
 
-#include <machine/armreg.h>
 #include <machine/cpu.h>
 #include <machine/hypervisor.h>