v3_remove_hypercall(vm, GUEST_INFO_HCALL);
+#ifdef V3_CONFIG_HVM
+ v3_deinit_hvm_vm(vm);
+#endif
+
+#ifdef V3_CONFIG_MULTIBOOT
+ v3_deinit_multiboot_vm(vm);
+#endif
+
#ifdef V3_CONFIG_SYMBIOTIC
v3_deinit_symbiotic_vm(vm);
v3_deinit_telemetry(vm);
#endif
-#ifdef V3_CONFIG_HVM
- v3_deinit_hvm_vm(vm);
-#endif
v3_deinit_events(vm);
v3_deinit_symbiotic_core(core);
#endif
+#ifdef V3_CONFIG_HVM
+ v3_deinit_hvm_core(core);
+#endif
+
+#ifdef V3_CONFIG_MULTIBOOT
+ v3_deinit_multiboot_core(core);
+#endif
+
v3_deinit_decoder(core);
v3_deinit_intr_controllers(core);
v3_deinit_core_telemetry(core);
#endif
-#ifdef V3_CONFIG_HVM
- v3_deinit_hvm_core(core);
-#endif
switch (v3_mach_type) {
#ifdef V3_CONFIG_SVM