X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_config.h;h=716e5b63bc5dbb071465ba460dc518c38787645a;hb=c016bb46bd68474161e275a5ace086c3fb810d9f;hp=5072ef9089bf4d090f727cb8446be8c250f7af4c;hpb=f4b074d9bf5c28dfd6e5fd616805ade2e9473b01;p=palacios.git

diff --git a/palacios/include/palacios/vmm_config.h b/palacios/include/palacios/vmm_config.h
index 5072ef9..716e5b6 100644
--- a/palacios/include/palacios/vmm_config.h
+++ b/palacios/include/palacios/vmm_config.h
@@ -1,5 +1,21 @@
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+/*
+ * 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, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #ifndef __VMM_CONFIG_H__
 #define __VMM_CONFIG_H__
@@ -9,28 +25,11 @@
 #ifdef __V3VEE__
 
 #include <palacios/vm_guest.h>
+#include <palacios/vmm.h>
 
 
-
-
-#define MAGIC_CODE 0xf1e2d3c4
-
-struct layout_region {
-  ulong_t length;
-  ulong_t final_addr;
-};
-
-struct guest_mem_layout {
-  ulong_t magic;
-  ulong_t num_regions;
-  struct layout_region regions[0];
-};
-
-
-
-int config_guest(struct guest_info * info, void * config_ptr);
-
-
+int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr);
+int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr);