X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fsvm.h;h=1a9ecfd77acbaae559f538fecd0693ceeb60fbbe;hp=fb96a85e8f3101bdaf7d497116e714d1a843914f;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=a109eb919a162bd7de58d62020801bc2e633be50

diff --git a/palacios/include/palacios/svm.h b/palacios/include/palacios/svm.h
index fb96a85..1a9ecfd 100644
--- a/palacios/include/palacios/svm.h
+++ b/palacios/include/palacios/svm.h
@@ -1,19 +1,42 @@
+/* 
+ * 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 __SVM_H
 #define __SVM_H
 
-#include <palacios/vmm_util.h>
+
+
+
+#ifdef __V3VEE__
+
 #include <palacios/vmm.h>
+
+
 #include <palacios/vmcb.h>
+#include <palacios/vmm_util.h>
 
-#define CPUID_FEATURE_IDS 0x80000001
-#define CPUID_FEATURE_IDS_ecx_svm_avail 0x00000004
+#define CPUID_EXT_FEATURE_IDS_ecx_svm_avail 0x00000004
 
 #define CPUID_SVM_REV_AND_FEATURE_IDS 0x8000000a
 #define CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml 0x00000004
 #define CPUID_SVM_REV_AND_FEATURE_IDS_edx_np  0x00000001
 
-
-#define EFER_MSR                 0xc0000080
 #define EFER_MSR_svm_enable      0x00001000
 
 /************/
@@ -54,21 +77,15 @@
 #define SVM_HANDLER_HALT      0x2
 
 
+void v3_init_svm_cpu(int cpu_id);
+int v3_is_svm_capable();
 
+int v3_init_svm_vmcb(struct guest_info * info, v3_vm_class_t vm_class);
 
-void Init_SVM(struct vmm_ctrl_ops * vmm_ops);
-int is_svm_capable();
-
-
-vmcb_t * Allocate_VMCB();
-void Init_VMCB(vmcb_t * vmcb, struct guest_info vm_info);
-void Init_VMCB_pe(vmcb_t * vmcb, struct guest_info vm_info);
+int v3_svm_enter(struct guest_info * info);
+int v3_start_svm_guest(struct guest_info *info);
 
-int init_svm_guest(struct guest_info *info);
-int start_svm_guest(struct guest_info * info);
-
-
-inline addr_t get_rip_linear(struct guest_info * info, addr_t rip, addr_t cs_base);
+#endif