X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=6e32e88a8d982583cfdc1e69665a28288297d8ec;hb=a19f42cc45ff4c4a07bf917a78a2a422319a78bb;hp=491b7dee4da2ba6579bafc99a43b10a404f1a42b;hpb=e1ea936272cd584e26b3a2be63d549fafd44e6dd;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 491b7de..6e32e88 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -26,7 +26,7 @@
 #include <palacios/vmm_sprintf.h>
 #include <palacios/vmm_extensions.h>
 #include <palacios/vmm_timeout.h>
-
+#include <palacios/vmm_options.h>
 
 #ifdef V3_CONFIG_SVM
 #include <palacios/svm.h>
@@ -99,87 +99,6 @@ static void deinit_cpu(void * arg) {
     }
 }
 
-/* Options are space-separated values of the form "X=Y", for example
- * scheduler=EDF CPUs=1,2,3,4
- * THe following code pushes them into a hashtable for each of access
- * by other code. Storage is allocated for keys and values as part
- * of this process. XXX Need a way to deallocate this storage if the 
- * module is removed XXX
- */
-static char *option_storage;
-static struct hashtable *option_table;
-static char *truevalue = "true";
-
-static uint_t option_hash_fn(addr_t key) {
-    char * name = (char *)key;
-    return v3_hash_buffer((uint8_t *)name, strlen(name));
-}
-static int option_eq_fn(addr_t key1, addr_t key2) {
-    char * name1 = (char *)key1;
-    char * name2 = (char *)key2;
-
-    return (strcmp(name1, name2) == 0);
-}
-
-void V3_parse_options(char *options)
-{
-    char *currKey = NULL, *currVal = NULL;
-    int parseKey = 1;
-    int len;
-    char *c;
-    if (!options) {
-	return; 
-    }
-
-    len = strlen(options);
-    option_storage = V3_Malloc(len + 1);
-    strcpy(option_storage, options);
-    c = option_storage;
-
-    option_table = v3_create_htable(0, option_hash_fn, option_eq_fn);
-    while (c && *c) {
-	/* Skip whitespace */
-        if (*c == ' ') {
-	    *c = 0;
-	    if (currKey) {
-		if (!currVal) {
-		    currVal = truevalue;
-		}
-		v3_htable_insert(option_table, (addr_t)currKey, (addr_t)currVal);
-		parseKey = 1;
-		currKey = NULL;
-		currVal = NULL;
-	    } 
-	    c++;
-	} else if (parseKey) {
-	    if (!currKey) {
-		currKey = c;
-	    } 
-	    if (*c == '=') {
-	        parseKey = 0;
-		*c = 0;
-	    }
-	    c++;
-	} else /* !parseKey */ {
-	    if (!currVal) {
-		currVal = c;
-	    }
-	    c++;
-	}
-    }
-    if (currKey) {
-	if (!currVal) {
-	    currVal = truevalue;
-	} 
-	v3_htable_insert(option_table, (addr_t)currKey, (addr_t)currVal);
-    }
-    return;
-}
-
-char *v3_lookup_option(char *key) {
-    return (char *)v3_htable_search(option_table, (addr_t)(key));
-}
-
 void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus, char *options) {
     int i = 0;
     int minor = 0;
@@ -198,7 +117,7 @@ void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus, char *op
     }
 
     // Parse host-os defined options into an easily-accessed format.
-    V3_parse_options(options);
+    v3_parse_options(options);
 
     // Register all the possible device types
     V3_init_devices();