From: Peter Dinda <pdinda@northwestern.edu>
Date: Mon, 7 Sep 2015 16:29:20 +0000 (-0500)
Subject: Minor tweak to fix handling of extensions without initializers
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=e2a6eba59e9be18cbf5095df4da4d716cf1cf141

Minor tweak to fix handling of extensions without initializers
---

diff --git a/palacios/src/palacios/vmm_extensions.c b/palacios/src/palacios/vmm_extensions.c
index 44004cc..fb5d6e0 100644
--- a/palacios/src/palacios/vmm_extensions.c
+++ b/palacios/src/palacios/vmm_extensions.c
@@ -59,8 +59,13 @@ int V3_init_extensions() {
 
     while (tmp_ext != __stop__v3_extensions) {
 
-        if (!(*tmp_ext) || !(*tmp_ext)->init || ((*tmp_ext)->init() != 0)) {
-	    PrintError(VM_NONE, VCORE_NONE, "Could not initialize extension (%s)\n", (*tmp_ext) ? (*tmp_ext)->name : "UNKNOWN");
+        if (!(*tmp_ext)) {
+	    PrintError(VM_NONE, VCORE_NONE, "Impossible extension\n");
+	    return -1;
+	}
+	
+	if ((*tmp_ext)->init && ((*tmp_ext)->init() != 0)) {
+	    PrintError(VM_NONE, VCORE_NONE, "Could not initialize extension (%s)\n", (*tmp_ext)->name);
 	    return -1;
 	}