diff -r 5b8e012641e2 xen/include/asm-x86/hvm/svm/vmcb.h --- a/xen/include/asm-x86/hvm/svm/vmcb.h Thu Mar 11 08:09:58 2010 +0000 +++ b/xen/include/asm-x86/hvm/svm/vmcb.h Thu Mar 11 10:47:39 2010 +0100 @@ -158,148 +158,148 @@ enum DRInterceptBits enum VMEXIT_EXITCODE { /* control register read exitcodes */ - VMEXIT_CR0_READ = 0, - VMEXIT_CR1_READ = 1, - VMEXIT_CR2_READ = 2, - VMEXIT_CR3_READ = 3, - VMEXIT_CR4_READ = 4, - VMEXIT_CR5_READ = 5, - VMEXIT_CR6_READ = 6, - VMEXIT_CR7_READ = 7, - VMEXIT_CR8_READ = 8, - VMEXIT_CR9_READ = 9, - VMEXIT_CR10_READ = 10, - VMEXIT_CR11_READ = 11, - VMEXIT_CR12_READ = 12, - VMEXIT_CR13_READ = 13, - VMEXIT_CR14_READ = 14, - VMEXIT_CR15_READ = 15, + VMEXIT_CR0_READ = 0, /* 0x0 */ + VMEXIT_CR1_READ = 1, /* 0x1 */ + VMEXIT_CR2_READ = 2, /* 0x2 */ + VMEXIT_CR3_READ = 3, /* 0x3 */ + VMEXIT_CR4_READ = 4, /* 0x4 */ + VMEXIT_CR5_READ = 5, /* 0x5 */ + VMEXIT_CR6_READ = 6, /* 0x6 */ + VMEXIT_CR7_READ = 7, /* 0x7 */ + VMEXIT_CR8_READ = 8, /* 0x8 */ + VMEXIT_CR9_READ = 9, /* 0x9 */ + VMEXIT_CR10_READ = 10, /* 0xa */ + VMEXIT_CR11_READ = 11, /* 0xb */ + VMEXIT_CR12_READ = 12, /* 0xc */ + VMEXIT_CR13_READ = 13, /* 0xd */ + VMEXIT_CR14_READ = 14, /* 0xe */ + VMEXIT_CR15_READ = 15, /* 0xf */ /* control register write exitcodes */ - VMEXIT_CR0_WRITE = 16, - VMEXIT_CR1_WRITE = 17, - VMEXIT_CR2_WRITE = 18, - VMEXIT_CR3_WRITE = 19, - VMEXIT_CR4_WRITE = 20, - VMEXIT_CR5_WRITE = 21, - VMEXIT_CR6_WRITE = 22, - VMEXIT_CR7_WRITE = 23, - VMEXIT_CR8_WRITE = 24, - VMEXIT_CR9_WRITE = 25, - VMEXIT_CR10_WRITE = 26, - VMEXIT_CR11_WRITE = 27, - VMEXIT_CR12_WRITE = 28, - VMEXIT_CR13_WRITE = 29, - VMEXIT_CR14_WRITE = 30, - VMEXIT_CR15_WRITE = 31, + VMEXIT_CR0_WRITE = 16, /* 0x10 */ + VMEXIT_CR1_WRITE = 17, /* 0x11 */ + VMEXIT_CR2_WRITE = 18, /* 0x12 */ + VMEXIT_CR3_WRITE = 19, /* 0x13 */ + VMEXIT_CR4_WRITE = 20, /* 0x14 */ + VMEXIT_CR5_WRITE = 21, /* 0x15 */ + VMEXIT_CR6_WRITE = 22, /* 0x16 */ + VMEXIT_CR7_WRITE = 23, /* 0x17 */ + VMEXIT_CR8_WRITE = 24, /* 0x18 */ + VMEXIT_CR9_WRITE = 25, /* 0x19 */ + VMEXIT_CR10_WRITE = 26, /* 0x1a */ + VMEXIT_CR11_WRITE = 27, /* 0x1b */ + VMEXIT_CR12_WRITE = 28, /* 0x1c */ + VMEXIT_CR13_WRITE = 29, /* 0x1d */ + VMEXIT_CR14_WRITE = 30, /* 0x1e */ + VMEXIT_CR15_WRITE = 31, /* 0x1f */ /* debug register read exitcodes */ - VMEXIT_DR0_READ = 32, - VMEXIT_DR1_READ = 33, - VMEXIT_DR2_READ = 34, - VMEXIT_DR3_READ = 35, - VMEXIT_DR4_READ = 36, - VMEXIT_DR5_READ = 37, - VMEXIT_DR6_READ = 38, - VMEXIT_DR7_READ = 39, - VMEXIT_DR8_READ = 40, - VMEXIT_DR9_READ = 41, - VMEXIT_DR10_READ = 42, - VMEXIT_DR11_READ = 43, - VMEXIT_DR12_READ = 44, - VMEXIT_DR13_READ = 45, - VMEXIT_DR14_READ = 46, - VMEXIT_DR15_READ = 47, + VMEXIT_DR0_READ = 32, /* 0x20 */ + VMEXIT_DR1_READ = 33, /* 0x21 */ + VMEXIT_DR2_READ = 34, /* 0x22 */ + VMEXIT_DR3_READ = 35, /* 0x23 */ + VMEXIT_DR4_READ = 36, /* 0x24 */ + VMEXIT_DR5_READ = 37, /* 0x25 */ + VMEXIT_DR6_READ = 38, /* 0x26 */ + VMEXIT_DR7_READ = 39, /* 0x27 */ + VMEXIT_DR8_READ = 40, /* 0x28 */ + VMEXIT_DR9_READ = 41, /* 0x29 */ + VMEXIT_DR10_READ = 42, /* 0x2a */ + VMEXIT_DR11_READ = 43, /* 0x2b */ + VMEXIT_DR12_READ = 44, /* 0x2c */ + VMEXIT_DR13_READ = 45, /* 0x2d */ + VMEXIT_DR14_READ = 46, /* 0x2e */ + VMEXIT_DR15_READ = 47, /* 0x2f */ /* debug register write exitcodes */ - VMEXIT_DR0_WRITE = 48, - VMEXIT_DR1_WRITE = 49, - VMEXIT_DR2_WRITE = 50, - VMEXIT_DR3_WRITE = 51, - VMEXIT_DR4_WRITE = 52, - VMEXIT_DR5_WRITE = 53, - VMEXIT_DR6_WRITE = 54, - VMEXIT_DR7_WRITE = 55, - VMEXIT_DR8_WRITE = 56, - VMEXIT_DR9_WRITE = 57, - VMEXIT_DR10_WRITE = 58, - VMEXIT_DR11_WRITE = 59, - VMEXIT_DR12_WRITE = 60, - VMEXIT_DR13_WRITE = 61, - VMEXIT_DR14_WRITE = 62, - VMEXIT_DR15_WRITE = 63, + VMEXIT_DR0_WRITE = 48, /* 0x30 */ + VMEXIT_DR1_WRITE = 49, /* 0x31 */ + VMEXIT_DR2_WRITE = 50, /* 0x32 */ + VMEXIT_DR3_WRITE = 51, /* 0x33 */ + VMEXIT_DR4_WRITE = 52, /* 0x34 */ + VMEXIT_DR5_WRITE = 53, /* 0x35 */ + VMEXIT_DR6_WRITE = 54, /* 0x36 */ + VMEXIT_DR7_WRITE = 55, /* 0x37 */ + VMEXIT_DR8_WRITE = 56, /* 0x38 */ + VMEXIT_DR9_WRITE = 57, /* 0x39 */ + VMEXIT_DR10_WRITE = 58, /* 0x3a */ + VMEXIT_DR11_WRITE = 59, /* 0x3b */ + VMEXIT_DR12_WRITE = 60, /* 0x3c */ + VMEXIT_DR13_WRITE = 61, /* 0x3d */ + VMEXIT_DR14_WRITE = 62, /* 0x3e */ + VMEXIT_DR15_WRITE = 63, /* 0x3f */ /* processor exception exitcodes (VMEXIT_EXCP[0-31]) */ - VMEXIT_EXCEPTION_DE = 64, /* divide-by-zero-error */ - VMEXIT_EXCEPTION_DB = 65, /* debug */ - VMEXIT_EXCEPTION_NMI = 66, /* non-maskable-interrupt */ - VMEXIT_EXCEPTION_BP = 67, /* breakpoint */ - VMEXIT_EXCEPTION_OF = 68, /* overflow */ - VMEXIT_EXCEPTION_BR = 69, /* bound-range */ - VMEXIT_EXCEPTION_UD = 70, /* invalid-opcode*/ - VMEXIT_EXCEPTION_NM = 71, /* device-not-available */ - VMEXIT_EXCEPTION_DF = 72, /* double-fault */ - VMEXIT_EXCEPTION_09 = 73, /* unsupported (reserved) */ - VMEXIT_EXCEPTION_TS = 74, /* invalid-tss */ - VMEXIT_EXCEPTION_NP = 75, /* segment-not-present */ - VMEXIT_EXCEPTION_SS = 76, /* stack */ - VMEXIT_EXCEPTION_GP = 77, /* general-protection */ - VMEXIT_EXCEPTION_PF = 78, /* page-fault */ - VMEXIT_EXCEPTION_15 = 79, /* reserved */ - VMEXIT_EXCEPTION_MF = 80, /* x87 floating-point exception-pending */ - VMEXIT_EXCEPTION_AC = 81, /* alignment-check */ - VMEXIT_EXCEPTION_MC = 82, /* machine-check */ - VMEXIT_EXCEPTION_XF = 83, /* simd floating-point */ + VMEXIT_EXCEPTION_DE = 64, /* 0x40, divide-by-zero-error */ + VMEXIT_EXCEPTION_DB = 65, /* 0x41, debug */ + VMEXIT_EXCEPTION_NMI = 66, /* 0x42, non-maskable-interrupt */ + VMEXIT_EXCEPTION_BP = 67, /* 0x43, breakpoint */ + VMEXIT_EXCEPTION_OF = 68, /* 0x44, overflow */ + VMEXIT_EXCEPTION_BR = 69, /* 0x45, bound-range */ + VMEXIT_EXCEPTION_UD = 70, /* 0x46, invalid-opcode*/ + VMEXIT_EXCEPTION_NM = 71, /* 0x47, device-not-available */ + VMEXIT_EXCEPTION_DF = 72, /* 0x48, double-fault */ + VMEXIT_EXCEPTION_09 = 73, /* 0x49, unsupported (reserved) */ + VMEXIT_EXCEPTION_TS = 74, /* 0x4a, invalid-tss */ + VMEXIT_EXCEPTION_NP = 75, /* 0x4b, segment-not-present */ + VMEXIT_EXCEPTION_SS = 76, /* 0x4c, stack */ + VMEXIT_EXCEPTION_GP = 77, /* 0x4d, general-protection */ + VMEXIT_EXCEPTION_PF = 78, /* 0x4f, page-fault */ + VMEXIT_EXCEPTION_15 = 79, /* 0x50, reserved */ + VMEXIT_EXCEPTION_MF = 80, /* 0x51, x87 floating-point exception-pending */ + VMEXIT_EXCEPTION_AC = 81, /* 0x52, alignment-check */ + VMEXIT_EXCEPTION_MC = 82, /* 0x53, machine-check */ + VMEXIT_EXCEPTION_XF = 83, /* 0x54, simd floating-point */ /* exceptions 20-31 (exitcodes 84-95) are reserved */ /* ...and the rest of the #VMEXITs */ - VMEXIT_INTR = 96, - VMEXIT_NMI = 97, - VMEXIT_SMI = 98, - VMEXIT_INIT = 99, - VMEXIT_VINTR = 100, - VMEXIT_CR0_SEL_WRITE = 101, - VMEXIT_IDTR_READ = 102, - VMEXIT_GDTR_READ = 103, - VMEXIT_LDTR_READ = 104, - VMEXIT_TR_READ = 105, - VMEXIT_IDTR_WRITE = 106, - VMEXIT_GDTR_WRITE = 107, - VMEXIT_LDTR_WRITE = 108, - VMEXIT_TR_WRITE = 109, - VMEXIT_RDTSC = 110, - VMEXIT_RDPMC = 111, - VMEXIT_PUSHF = 112, - VMEXIT_POPF = 113, - VMEXIT_CPUID = 114, - VMEXIT_RSM = 115, - VMEXIT_IRET = 116, - VMEXIT_SWINT = 117, - VMEXIT_INVD = 118, - VMEXIT_PAUSE = 119, - VMEXIT_HLT = 120, - VMEXIT_INVLPG = 121, - VMEXIT_INVLPGA = 122, - VMEXIT_IOIO = 123, - VMEXIT_MSR = 124, - VMEXIT_TASK_SWITCH = 125, - VMEXIT_FERR_FREEZE = 126, - VMEXIT_SHUTDOWN = 127, - VMEXIT_VMRUN = 128, - VMEXIT_VMMCALL = 129, - VMEXIT_VMLOAD = 130, - VMEXIT_VMSAVE = 131, - VMEXIT_STGI = 132, - VMEXIT_CLGI = 133, - VMEXIT_SKINIT = 134, - VMEXIT_RDTSCP = 135, - VMEXIT_ICEBP = 136, - VMEXIT_WBINVD = 137, - VMEXIT_MONITOR = 138, - VMEXIT_MWAIT = 139, - VMEXIT_MWAIT_CONDITIONAL= 140, - VMEXIT_NPF = 1024, /* nested paging fault */ + VMEXIT_INTR = 96, /* 0x60 */ + VMEXIT_NMI = 97, /* 0x61 */ + VMEXIT_SMI = 98, /* 0x62 */ + VMEXIT_INIT = 99, /* 0x63 */ + VMEXIT_VINTR = 100, /* 0x64 */ + VMEXIT_CR0_SEL_WRITE = 101, /* 0x65 */ + VMEXIT_IDTR_READ = 102, /* 0x66 */ + VMEXIT_GDTR_READ = 103, /* 0x67 */ + VMEXIT_LDTR_READ = 104, /* 0x68 */ + VMEXIT_TR_READ = 105, /* 0x69 */ + VMEXIT_IDTR_WRITE = 106, /* 0x6a */ + VMEXIT_GDTR_WRITE = 107, /* 0x6b */ + VMEXIT_LDTR_WRITE = 108, /* 0x6c */ + VMEXIT_TR_WRITE = 109, /* 0x6d */ + VMEXIT_RDTSC = 110, /* 0x6e */ + VMEXIT_RDPMC = 111, /* 0x6f */ + VMEXIT_PUSHF = 112, /* 0x70 */ + VMEXIT_POPF = 113, /* 0x71 */ + VMEXIT_CPUID = 114, /* 0x72 */ + VMEXIT_RSM = 115, /* 0x73 */ + VMEXIT_IRET = 116, /* 0x74 */ + VMEXIT_SWINT = 117, /* 0x75 */ + VMEXIT_INVD = 118, /* 0x76 */ + VMEXIT_PAUSE = 119, /* 0x77 */ + VMEXIT_HLT = 120, /* 0x78 */ + VMEXIT_INVLPG = 121, /* 0x79 */ + VMEXIT_INVLPGA = 122, /* 0x7a */ + VMEXIT_IOIO = 123, /* 0x7b */ + VMEXIT_MSR = 124, /* 0x7c */ + VMEXIT_TASK_SWITCH = 125, /* 0x7d */ + VMEXIT_FERR_FREEZE = 126, /* 0x7e */ + VMEXIT_SHUTDOWN = 127, /* 0x7f */ + VMEXIT_VMRUN = 128, /* 0x80 */ + VMEXIT_VMMCALL = 129, /* 0x81 */ + VMEXIT_VMLOAD = 130, /* 0x82 */ + VMEXIT_VMSAVE = 131, /* 0x83 */ + VMEXIT_STGI = 132, /* 0x84 */ + VMEXIT_CLGI = 133, /* 0x85 */ + VMEXIT_SKINIT = 134, /* 0x86 */ + VMEXIT_RDTSCP = 135, /* 0x87 */ + VMEXIT_ICEBP = 136, /* 0x88 */ + VMEXIT_WBINVD = 137, /* 0x89 */ + VMEXIT_MONITOR = 138, /* 0x8a */ + VMEXIT_MWAIT = 139, /* 0x8b */ + VMEXIT_MWAIT_CONDITIONAL= 140, /* 0x8c */ + VMEXIT_NPF = 1024, /* 0x400, nested paging fault */ VMEXIT_INVALID = -1 };