Deallocation bug fix in device manager to allow backing out from VM creation failure

[palacios.git] / linux_module / iface-host-hypercall.c

diff --git a/linux_module/iface-host-hypercall.c b/linux_module/iface-host-hypercall.c
index 76f2f2d..4ed2f63 100644 (file)
--- a/linux_module/iface-host-hypercall.c
+++ b/linux_module/iface-host-hypercall.c
@@ -7,7 +7,6 @@
 
 #include <linux/elf.h>
 #include <linux/uaccess.h>
-#include <linux/vmalloc.h>
 
 #include <linux/module.h>
 
@@ -45,12 +44,12 @@ static int host_hypercall_nop(palacios_core_t core,
         (void*)(acc->get_r13(core)),
         (void*)(acc->get_r14(core)),
         (void*)(acc->get_r15(core)));
-  DEBUG(" cr0=%p\n cr2=%p\n cr3=%p\n cr4=%p\n cr8=%p\n efer=%p\n",
+  DEBUG(" cr0=%p\n cr2=%p\n cr3=%p\n cr4=%p\n apic_tpr=%p\n efer=%p\n",
         (void*)(acc->get_cr0(core)),
         (void*)(acc->get_cr2(core)),
         (void*)(acc->get_cr3(core)),
         (void*)(acc->get_cr4(core)),
-        (void*)(acc->get_cr8(core)),
+        (void*)(acc->get_apic_tpr(core)),
         (void*)(acc->get_efer(core)));
   return 0;
 }
@@ -135,6 +134,8 @@ static int guest_init_host_hypercall (struct v3_guest * guest, void ** vm_data)
 
 
 static int guest_deinit_host_hypercall (struct v3_guest * guest, void * vm_data) {
+    remove_guest_ctrl(guest, V3_VM_HYPERCALL_ADD);
+    remove_guest_ctrl(guest, V3_VM_HYPERCALL_REMOVE);
     return 0;
 }