X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_ctrl_regs.h;h=c6eb1fe232d2568c391214af167eb38e3e4a3759;hb=101b1bdfedbf377765d7c74641e9bcf356ebed18;hp=1849092b96e5fa8093f20a95ba2d13461a298c2a;hpb=eb87f60800c8634e37d1f8e71cd8f88605f2a46e;p=palacios.git

diff --git a/palacios/include/palacios/vmm_ctrl_regs.h b/palacios/include/palacios/vmm_ctrl_regs.h
index 1849092..c6eb1fe 100644
--- a/palacios/include/palacios/vmm_ctrl_regs.h
+++ b/palacios/include/palacios/vmm_ctrl_regs.h
@@ -1,6 +1,27 @@
+/*
+ * 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_CTRL_REGS_H
 #define __VMM_CTRL_REGS_H
 
+#ifdef __V3VEE__
+
 
 #include <palacios/vm_guest.h>
 
@@ -119,6 +140,21 @@ struct cr4_64 {
 
 
 
+struct efer_64 {
+  uint_t sce              : 1;
+  uint_t rsvd1            : 7; // RAZ
+  uint_t lme              : 1;
+  uint_t rsvd2            : 1; // MBZ
+  uint_t lma              : 1;
+  uint_t nxe              : 1;
+  uint_t svme             : 1;
+  uint_t rsvd3            : 1; // MBZ
+  uint_t ffxsr            : 1;
+  uint_t rsvd4            : 12; // MBZ
+  uint_t rsvd5            : 32; // MBZ
+};
+
+
 struct rflags {
   uint_t cf                : 1;  // carry flag
   uint_t rsvd1             : 1;  // Must be 1
@@ -149,6 +185,7 @@ struct rflags {
 
 
 
+/*
 // First opcode byte
 static const uchar_t cr_access_byte = 0x0f;
 
@@ -160,7 +197,7 @@ static const uchar_t smsw_reg_byte = 0x4;
 static const uchar_t clts_byte = 0x06;
 static const uchar_t mov_to_cr_byte = 0x22;
 static const uchar_t mov_from_cr_byte = 0x20;
-
+*/
 
 
 int handle_cr0_write(struct guest_info * info);
@@ -170,4 +207,7 @@ int handle_cr3_write(struct guest_info * info);
 int handle_cr3_read(struct guest_info * info);
 
 
+#endif // ! __V3VEE__
+
+
 #endif