2 files changed, 7 insertions, 1 deletions
diff --git a/kvm.c b/kvm.c
index aebb795..683b207 100644
--- a/kvm.c
+++ b/kvm.c
@@ -15381,6 +15381,7 @@ kvm_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *cred_p, int *rval_
 	default:
 #ifndef XXX
 		XXX_KVM_PROBE;
+		DTRACE_PROBE1(kvm__xxx__ioctl, int, cmd);
 #endif
 		rval = EINVAL;  /* x64, others may do other things... */
 	}
diff --git a/kvm_x86.c b/kvm_x86.c
index f975e45..aae4904 100644
--- a/kvm_x86.c
+++ b/kvm_x86.c
@@ -1922,7 +1922,12 @@ vmx_destroy_vcpu(struct kvm_vcpu *vcpu)
 	vcpu_vmx_t *vmx = (vcpu_vmx_t *)vcpu;
 
 	if (vmx->vmcs != NULL) {
-		vcpu_clear(vmx);
+		/*
+		 * XXX This should probably be just vcpu_clear. However, we need
+		 * to get the per cpu lists working properly before we can do
+		 * that.
+		 */
+		__vcpu_clear(vmx);
 		kmem_free(vmx->vmcs, PAGESIZE);
 		vmx->vmcs = NULL;
 	}