Add HVM configuration capability, init/deinit, etc

[palacios.git] / palacios / src / extensions / ext_mtrr.c

diff --git a/palacios/src/extensions/ext_mtrr.c b/palacios/src/extensions/ext_mtrr.c
index 7ff0dc0..94cb6b9 100644 (file)
--- a/palacios/src/extensions/ext_mtrr.c
+++ b/palacios/src/extensions/ext_mtrr.c
@@ -544,6 +544,13 @@ static int init_mtrrs(struct v3_vm_info * vm, v3_cfg_tree_t * cfg, void ** priv_
     int ret = 0;
 
     state = V3_Malloc(sizeof(struct mtrr_state));
+
+    if (!state) {
+        PrintError(vm, VCORE_NONE, "Cannot allocate in initializing MTRRs\n");
+       return -1;
+    }
+
+
     memset(state, 0, sizeof(struct mtrr_state));
 
     *priv_data = state;
@@ -600,7 +607,7 @@ static int init_mtrrs(struct v3_vm_info * vm, v3_cfg_tree_t * cfg, void ** priv_
     ret |= v3_hook_msr(vm, SMRR_PHYS_MASK, intel_smrr_mask_read, intel_smrr_mask_write, state);
 
     if (ret != 0) {
-       PrintError("Failed to hook all MTRR MSRs. Aborting...\n");
+       PrintError(vm, VCORE_NONE,"Failed to hook all MTRR MSRs. Aborting...\n");
        deinit_mtrrs(vm, state);
        return -1;
     }
@@ -614,8 +621,9 @@ static int init_mtrrs(struct v3_vm_info * vm, v3_cfg_tree_t * cfg, void ** priv_
 
 static struct v3_extension_impl mtrr_impl = {
     .name = "MTRRS",
-    .init = init_mtrrs,
-    .deinit = deinit_mtrrs,
+    .init = NULL,
+    .vm_init = init_mtrrs,
+    .vm_deinit = deinit_mtrrs,
     .core_init = NULL,
     .core_deinit = NULL,
     .on_entry = NULL,