From: Peter Dinda <pdinda@northwestern.edu>
Date: Thu, 18 Jun 2015 22:41:21 +0000 (-0500)
Subject: Multiboot and HVM reset integrated into VMX
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=85d6d460b40c389b0b1b619313d596ab57323829

Multiboot and HVM reset integrated into VMX
---

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index 23d631a..3a23032 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -1259,6 +1259,18 @@ int v3_start_vmx_guest(struct guest_info * info) {
 	}
 	
 	
+#ifdef V3_CONFIG_HVM
+        if (v3_handle_hvm_reset(info) > 0) {
+	    continue;
+        }
+#endif
+	
+#ifdef V3_CONFIG_MULTIBOOT
+        if (v3_handle_multiboot_reset(info) > 0) {
+	    continue;
+        }
+#endif
+
 #ifdef V3_CONFIG_PMU_TELEMETRY
 	v3_pmu_telemetry_start(info);
 #endif