Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


updated comments for compiler compatibility
[palacios.git] / palacios / include / palacios / vmm.h
index 81bad2c..4640c01 100644 (file)
 #define __VMM_H__
 
 
-#include <palacios/vm_guest.h>
+/*#include <palacios/vm_guest.h>*/
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_types.h>
 
+struct guest_info;
 
 
 #ifdef __V3VEE__
 
-//#include <palacios/vmm_types.h>
+/*#include <palacios/vmm_types.h>*/
 #include <palacios/vmm_string.h>
 
 
-//#include <palacios/vmm_paging.h>
+/*#include <palacios/vmm_paging.h>*/
 
 /* utility definitions */
 
            if ((os_hooks) && (os_hooks)->malloc) {     \
                var = (os_hooks)->malloc(size);         \
            }                                           \
+           if (!var) PrintError("MALLOC FAILURE. Memory LEAK!!\n");    \
            var;                                        \
        })
 
-// We need to check the hook structure at runtime to ensure its SAFE
+/* We need to check the hook structure at runtime to ensure its SAFE */
 #define V3_Free(addr)                          \
     do {                                       \
        extern struct v3_os_hooks * os_hooks;   \
        }                                       \
     } while (0)
 
-// uint_t V3_CPU_KHZ();
+/* uint_t V3_CPU_KHZ(); */
 #define V3_CPU_KHZ() ({                                                        \
            unsigned int khz = 0;                                       \
            extern struct v3_os_hooks * os_hooks;                       \
 
 
 
-#define VMM_INVALID_CPU 0
-#define VMM_VMX_CPU 1
-#define VMM_SVM_CPU 2
+
+typedef enum v3_vm_class {V3_INVALID_VM, V3_PC_VM, V3_CRAY_VM} v3_vm_class_t;
 
 
-// Maybe make this a define....
+/* Maybe make this a define.... */
 typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CPU, V3_VMX_EPT_CPU} v3_cpu_arch_t;
 
 
@@ -196,12 +197,20 @@ v3_cpu_mode_t v3_get_host_cpu_mode();
 
 void v3_yield(struct guest_info * info);
 void v3_yield_cond(struct guest_info * info);
+void v3_print_cond(const char * fmt, ...);
 
 
 void v3_interrupt_cpu(struct guest_info * vm, int logical_cpu);
 
+unsigned int v3_get_cpu_id();
+
+v3_cpu_arch_t v3_get_cpu_type(int cpu_id);
+
 
-#endif //!__V3VEE__
+int v3_vm_enter(struct guest_info * info);
+
+
+#endif /* !__V3VEE__ */
 
 
 
@@ -236,6 +245,7 @@ struct v3_os_hooks {
     void (*mutex_lock)(void * mutex, int must_spin);
     void (*mutex_unlock)(void * mutex);
 
+    unsigned int (*get_cpu)(void);
     void (*interrupt_cpu)(struct guest_info * vm, int logical_cpu);
     void (*call_on_cpu)(int logical_cpu, void (*fn)(void * arg), void * arg);
     void (*start_thread_on_cpu)(int logical_cpu, int (*fn)(void * arg), void * arg, char * thread_name);
@@ -243,82 +253,31 @@ struct v3_os_hooks {
 
 
 
-typedef enum {NONE, HARDDRIVE, CDROM, VIRTIO} v3_disk_type_t;
-typedef enum {RAM, NETWORK} v3_disk_connection_t;
-
-union v3_disk_info {
-    struct {
-       void * data_ptr;
-       int size;
-    } ram;
-
-    struct {
-       char * ip_str;
-       int port;
-       char * disk_name;
-    } net;
-};
-
-struct v3_vm_config {
-
-    unsigned long mem_size; // in bytes, var should be natural size of cpu
-    // so we can specify maximum physical address size
-    // (We're screwed if we want to do 32 bit host/64 bit guest)
-
-    int enable_telemetry;
-    int enable_nested_paging;
-
-    int enable_pci;
-
-    int enable_swap;
-
-    int guest_cpu;
-
-    unsigned long schedule_freq; // in HZ
-
-    v3_disk_type_t pri_disk_type;
-    v3_disk_connection_t pri_disk_con;
-    union v3_disk_info pri_disk_info;
-   
-    v3_disk_type_t sec_disk_type;
-    v3_disk_connection_t sec_disk_con;
-    union v3_disk_info sec_disk_info;
-};
-
-
-
-/* This will contain Function pointers that control the VMs */
-struct v3_ctrl_ops {
-    struct guest_info *(*allocate_guest)(void);
 
-    int (*init_guest)(struct guest_info * info, struct v3_vm_config * config_ptr);
-    int (*start_guest)(struct guest_info * info);
-    //  int (*stop_vm)(uint_t vm_id);
 
-    int (*has_nested_paging)(void);
-
-    //  v3_cpu_arch_t (*get_cpu_arch)();
-};
 
 
-
-
-//
-//
-// This is the interrupt state that the VMM's interrupt handlers need to see
-//
+/*
+ *
+ * This is the interrupt state that the VMM's interrupt handlers need to see
+ */
 struct v3_interrupt {
     unsigned int irq;
     unsigned int error;
 
-    unsigned int should_ack;  // Should the vmm ack this interrupt, or will
-    // the host OS do it?
+    unsigned int should_ack;  /* Should the vmm ack this interrupt, or will
+                               * the host OS do it?
+                               */
 };
 
 
 
 
-void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_cpus);
+void Init_V3(struct v3_os_hooks * hooks,  int num_cpus);
+
+
+int v3_start_vm(struct guest_info * info, unsigned int cpu_mask);
+struct guest_info * v3_create_vm(void * cfg);
 
 int v3_deliver_irq(struct guest_info * vm, struct v3_interrupt * intr);