Generalization of constraints on page allocation and implementation/use

[palacios.git] / palacios / src / palacios / vmm.c

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 6690e97..b7f45cd 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -385,6 +385,12 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
         return -1;
     }
 
+#if V3_CONFIG_HVM
+    if (v3_setup_hvm_vm_for_boot(vm)) { 
+       PrintError(vm, VCORE_NONE, "HVM setup for boot failed\n");
+       return -1;
+    }
+#endif
 
     /// CHECK IF WE ARE MULTICORE ENABLED....
 
@@ -610,7 +616,7 @@ int v3_move_vm_mem(struct v3_vm_info * vm, void *gpa, int target_cpu) {
     new_hpa = V3_AllocPagesExtended(num_pages,
                                    PAGE_SIZE_4KB,
                                    new_node,
-                                   0);  // no constraints given new shadow pager impl
+                                   0, 0);  // no constraints given new shadow pager impl
 
     if (!new_hpa) { 
        PrintError(vm, VCORE_NONE, "Cannot allocate memory for new base region...\n");
@@ -877,7 +883,6 @@ int v3_get_state_vm(struct v3_vm_info        *vm,
        case VM_INVALID: base->state = V3_VM_INVALID; break;
        case VM_RUNNING: base->state = V3_VM_RUNNING; break;
        case VM_STOPPED: base->state = V3_VM_STOPPED; break;
-       case VM_RESETTING:  base->state = V3_VM_RESETTING; break;
        case VM_PAUSED: base->state = V3_VM_PAUSED; break;
        case VM_ERROR: base->state = V3_VM_ERROR; break;
        case VM_SIMULATING: base->state = V3_VM_SIMULATING; break;