--- /dev/null
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National
+ * Science Foundation and the Department of Energy.
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico. You can find out more at
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Peter Dinda <pdinda@northwestern.edu>
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org>
+ * All rights reserved.
+ *
+ * Author: Peter Dinda <pdinda@northwestern.edu>
+ * Author: Andy Gocke <agocke@gmail.com>
+ *
+ * This is free software. You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
+#ifndef __VMM_OPTIONS_H
+#define __VMM_OPTIONS_H
+
+#ifdef __V3VEE__
+
+#include <palacios/vm_guest.h>
+#include <palacios/vmm.h>
+
+
+void v3_parse_options(char *optstring);
+char *v3_lookup_option(char *option);
+
+#endif // ! __V3VEE__
+
+#endif
#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>
}
}
-/* 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;
}
// 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();
--- /dev/null
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National
+ * Science Foundation and the Department of Energy.
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico. You can find out more at
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2013, Patrick G. Bridges <bridges@cs.unm.edu>
+ * Copyright (c) 2013, The V3VEE Project <http://www.v3vee.org>
+ * All rights reserved.
+ *
+ * Author: Patrick G. Bridges <bridges@cs.unm.edu>
+ *
+ * This is free software. You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
+
+#include <palacios/vmm.h>
+#include <palacios/vmm_config.h>
+#include <palacios/vm_guest.h>
+#include <palacios/vmm_sprintf.h>
+#include <palacios/vmm_options.h>
+
+/* 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 == '\t')) {
+ *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));
+}
