Merge branch 'devel'

[palacios.git] / palacios / include / palacios / vmm_config.h

diff --git a/palacios/include/palacios/vmm_config.h b/palacios/include/palacios/vmm_config.h
index ec3c5f7..328a221 100644 (file)
--- a/palacios/include/palacios/vmm_config.h
+++ b/palacios/include/palacios/vmm_config.h
@@ -25,29 +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_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr);
 
 
 #endif // ! __V3VEE__