@@ -201,10 +201,10 @@ struct vmx_inst_decoded {
unsigned long mem;
unsigned int len;
};
- enum vmx_regs_enc reg1;
+ unsigned int reg1;
};
- enum vmx_regs_enc reg2;
+ unsigned int reg2;
};
enum vmx_ops_result {
@@ -345,7 +345,7 @@ enum vmx_insn_errno set_vvmcs_real_safe(const struct vcpu *v, u32 encoding,
}
static unsigned long reg_read(struct cpu_user_regs *regs,
- enum vmx_regs_enc index)
+ unsigned int index)
{
unsigned long *pval = decode_register(index, regs, 0);
@@ -353,7 +353,7 @@ static unsigned long reg_read(struct cpu_user_regs *regs,
}
static void reg_write(struct cpu_user_regs *regs,
- enum vmx_regs_enc index,
+ unsigned int index,
unsigned long value)
{
unsigned long *pval = decode_register(index, regs, 0);
@@ -64,28 +64,6 @@ struct nestedvmx {
/* bit 0-8, and 12 must be 1 */
#define VMX_ENTRY_CTLS_DEFAULT1 0x11ff
-/*
- * Encode of VMX instructions base on Table 24-11 & 24-12 of SDM 3B
- */
-
-enum vmx_regs_enc {
- VMX_REG_RAX,
- VMX_REG_RCX,
- VMX_REG_RDX,
- VMX_REG_RBX,
- VMX_REG_RSP,
- VMX_REG_RBP,
- VMX_REG_RSI,
- VMX_REG_RDI,
- VMX_REG_R8,
- VMX_REG_R9,
- VMX_REG_R10,
- VMX_REG_R11,
- VMX_REG_R12,
- VMX_REG_R13,
- VMX_REG_R14,
- VMX_REG_R15,
-};
union vmx_inst_info {
struct {
This is the standard register encoding, is not VVMX-specific and is only used in a couple of places. Signed-off-by: Euan Harris <euan.harris@citrix.com> --- xen/arch/x86/hvm/vmx/vvmx.c | 8 ++++---- xen/include/asm-x86/hvm/vmx/vvmx.h | 22 ---------------------- 2 files changed, 4 insertions(+), 26 deletions(-)