diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-02-09 14:14:28 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-24 14:01:08 +0100 |
| commit | 0f70ed4759a29ca932af1e9525729f4f455642f8 (patch) | |
| tree | c5a8fb95b4971c83ba998045d43b73e926b084ef /target-i386/cpu.h | |
| parent | cf7cc9291bf7f2f6470815db876ed28eb474ea52 (diff) | |
| download | qemu-0f70ed4759a29ca932af1e9525729f4f455642f8.zip qemu-0f70ed4759a29ca932af1e9525729f4f455642f8.tar.gz qemu-0f70ed4759a29ca932af1e9525729f4f455642f8.tar.bz2 | |
target-i386: implement PKE for TCG
Tested with kvm-unit-tests.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-i386/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 5148c82..732eb6d 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -232,6 +232,7 @@ #define CR4_OSXSAVE_MASK (1U << 18) #define CR4_SMEP_MASK (1U << 20) #define CR4_SMAP_MASK (1U << 21) +#define CR4_PKE_MASK (1U << 22) #define DR6_BD (1 << 13) #define DR6_BS (1 << 14) @@ -260,6 +261,7 @@ #define PG_PSE_BIT 7 #define PG_GLOBAL_BIT 8 #define PG_PSE_PAT_BIT 12 +#define PG_PKRU_BIT 59 #define PG_NX_BIT 63 #define PG_PRESENT_MASK (1 << PG_PRESENT_BIT) @@ -275,7 +277,8 @@ #define PG_ADDRESS_MASK 0x000ffffffffff000LL #define PG_HI_RSVD_MASK (PG_ADDRESS_MASK & ~PHYS_ADDR_MASK) #define PG_HI_USER_MASK 0x7ff0000000000000LL -#define PG_NX_MASK (1LL << PG_NX_BIT) +#define PG_PKRU_MASK (15ULL << PG_PKRU_BIT) +#define PG_NX_MASK (1ULL << PG_NX_BIT) #define PG_ERROR_W_BIT 1 @@ -284,6 +287,7 @@ #define PG_ERROR_U_MASK 0x04 #define PG_ERROR_RSVD_MASK 0x08 #define PG_ERROR_I_D_MASK 0x10 +#define PG_ERROR_PK_MASK 0x20 #define MCG_CTL_P (1ULL<<8) /* MCG_CAP register available */ #define MCG_SER_P (1ULL<<24) /* MCA recovery/new status bits */ |