X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fsvm.h;h=9c3d2c9e81af7aa397e8034fef3aa302c715b21f;hb=50dd6f837443d6f5a8cfb2410f1f8d95e8367b6a;hp=3ede354e53a2420994fd23fecc085377aed1b4b2;hpb=90b8236597004a37a9d5acb33a1b1f987fe9070c;p=palacios.git

diff --git a/palacios/include/palacios/svm.h b/palacios/include/palacios/svm.h
index 3ede354..9c3d2c9 100644
--- a/palacios/include/palacios/svm.h
+++ b/palacios/include/palacios/svm.h
@@ -1,21 +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>
-#include <palacios/vmm.h>
-#include <palacios/vmcb.h>
+
+
 
 #ifdef __V3VEE__
 
-#define CPUID_FEATURE_IDS 0x80000001
-#define CPUID_FEATURE_IDS_ecx_svm_avail 0x00000004
+#include <palacios/vmm.h>
+
+
+#include <palacios/vmcb.h>
+#include <palacios/vmm_util.h>
+
+#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
 
 /************/
@@ -55,12 +76,12 @@
 #define SVM_HANDLER_ERROR     0x1
 #define SVM_HANDLER_HALT      0x2
 
-#endif
 
 
-void Init_SVM(struct vmm_ctrl_ops * vmm_ops);
-int is_svm_capable();
+void v3_init_SVM(struct v3_ctrl_ops * vmm_ops);
+int v3_is_svm_capable();
 
+#endif