HVM-141 On subsequent attach after detach, vm initialization fails.

1 files changed, 34 insertions, 4 deletions

diff --git a/kvm_x86.c b/kvm_x86.c
index 27f7266..5c769eb 100644
--- a/kvm_x86.c
+++ b/kvm_x86.c
@@ -398,14 +398,44 @@ kvm_arch_hardware_enable(void *garbage)
 	return (vmx_hardware_enable(garbage));
 }
 
-void
-kvm_arch_hardware_disable(void *garbage)
+static void vmclear_local_vcpus(void)
 {
 #ifdef XXX
-	hardware_disable(garbage);
+	int cpu = raw_smp_processor_id();
+	struct vcpu_vmx *vmx, *n;
+
+	list_for_each_entry_safe(vmx, n, &per_cpu(vcpus_on_cpu, cpu),
+	    local_vcpus_link)
+		__vcpu_clear(vmx);
 #else
 	XXX_KVM_PROBE;
-#endif
+#endif /* XXX */
+}
+
+
+/*
+ * Just like cpu_vmxoff(), but with the __kvm_handle_fault_on_reboot()
+ * tricks.
+ */
+static void kvm_cpu_vmxoff(void)
+{
+	/* BEGIN CSTYLED */
+	__asm__ volatile ((ASM_VMX_VMXOFF) : : : "cc");
+	/* END CSTYLED */
+	setcr4(getcr4() & ~X86_CR4_VMXE);
+}
+
+static void vmx_hardware_disable(void *garbage)
+{
+	vmclear_local_vcpus();
+	kvm_cpu_vmxoff();
+}
+
+
+void
+kvm_arch_hardware_disable(void *garbage)
+{
+	vmx_hardware_disable(garbage);
 #if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER)
 	drop_user_return_notifiers(garbage);
 #endif