X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_ctrl_regs.h;h=c6eb1fe232d2568c391214af167eb38e3e4a3759;hb=6593ee3c311ec87304c7bed52a9e6034338679fb;hp=f53034c07ac0d977f20afb47bb7d72cc1d8e2c18;hpb=aad69eda8e2354cf146054e57ad25fe201a1cb52;p=palacios.git diff --git a/palacios/include/palacios/vmm_ctrl_regs.h b/palacios/include/palacios/vmm_ctrl_regs.h index f53034c..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 + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * 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 @@ -164,7 +185,7 @@ struct rflags { - +/* // First opcode byte static const uchar_t cr_access_byte = 0x0f; @@ -176,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); @@ -186,9 +207,7 @@ int handle_cr3_write(struct guest_info * info); int handle_cr3_read(struct guest_info * info); -#define CR3_32_SAME_BASE(source1,source2) ((source1)->pdt_base_addr == (source2)->pdt_base_addr) -#define CR3_32_COPY_FLAGS(source,dest) do { (dest)->rsvd1=(source)->rsvd1; (dest)->pwt=(source)->pwt; (dest)->pcd=(source)->pcd; } while (0) -#define CR3_32_COPY_BASE(source,dest) do { (dest)->pdt_base_addr = (source)->pdt_base_addr; } while (0) +#endif // ! __V3VEE__ #endif