From: John Wolfe Date: Mon, 7 Feb 2022 17:40:01 +0000 (-0800) Subject: Common header file change not applicable to open-vm-tools. X-Git-Tag: stable-12.1.0~138 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4311a4a5d2952703cb808feb1f6372e28c2afc68;p=thirdparty%2Fopen-vm-tools.git Common header file change not applicable to open-vm-tools. --- diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h index 9d11be1ca..e09b1db52 100644 --- a/open-vm-tools/lib/include/x86cpuid.h +++ b/open-vm-tools/lib/include/x86cpuid.h @@ -550,7 +550,7 @@ FLAG( 7, 0, ECX, 3, 1, PKU, YES, 13 ) \ FLAG( 7, 0, ECX, 4, 1, OSPKE, ANY, 13 ) \ FLAG( 7, 0, ECX, 5, 1, WAITPKG, YES, FUT ) \ FLAG( 7, 0, ECX, 6, 1, AVX512VBMI2, YES, 17 ) \ -FLAG( 7, 0, ECX, 7, 1, CET_SS, NO, 0 ) \ +FLAG( 7, 0, ECX, 7, 1, CET_SS, YES, 20 ) \ FLAG( 7, 0, ECX, 8, 1, GFNI, YES, 17 ) \ FLAG( 7, 0, ECX, 9, 1, VAES, YES, 17 ) \ FLAG( 7, 0, ECX, 10, 1, VPCLMULQDQ, YES, 17 ) \ @@ -581,7 +581,7 @@ FLAG( 7, 0, EDX, 15, 1, HYBRID, NO, 0 ) \ FLAG( 7, 0, EDX, 16, 1, TSXLDTRK, NO, 0 ) \ FLAG( 7, 0, EDX, 18, 1, PCONFIG, NO, 0 ) \ FLAG( 7, 0, EDX, 19, 1, ARCH_LBR, YES, 20 ) \ -FLAG( 7, 0, EDX, 20, 1, CET_IBT, NO, 0 ) \ +FLAG( 7, 0, EDX, 20, 1, CET_IBT, YES, 20 ) \ FLAG( 7, 0, EDX, 22, 1, AMX_BF16, YES, 20 ) \ FLAG( 7, 0, EDX, 23, 1, AVX512FP16, YES, 20 ) \ FLAG( 7, 0, EDX, 24, 1, AMX_TILE, YES, 20 ) \ @@ -660,8 +660,8 @@ FLAG( D, 1, EAX, 4, 1, XFD, YES, 20 ) \ FIELD( D, 1, EBX, 0, 32, XSAVES_ENABLED_SIZE, ANY, 13 ) \ FLAG( D, 1, ECX, 8, 1, XSS_MASTER_PT, NO, 0 ) \ FLAG( D, 1, ECX, 10, 1, XSS_MASTER_PASID, NO, 0 ) \ -FLAG( D, 1, ECX, 11, 1, XSS_MASTER_CET_U, NO, 0 ) \ -FLAG( D, 1, ECX, 12, 1, XSS_MASTER_CET_S, NO, 0 ) \ +FLAG( D, 1, ECX, 11, 1, XSS_MASTER_CET_U, YES, 20 ) \ +FLAG( D, 1, ECX, 12, 1, XSS_MASTER_CET_S, YES, 20 ) \ FLAG( D, 1, ECX, 13, 1, XSS_MASTER_HDC, NO, 0 ) \ FLAG( D, 1, ECX, 14, 1, XSS_MASTER_UINTR, NO, 0 ) \ FLAG( D, 1, ECX, 15, 1, XSS_MASTER_LBR, NO, 0 ) \ @@ -710,14 +710,14 @@ FIELD( D, 10, EAX, 0, 32, XSAVES_PASID_STATE_SIZE, NO, 0 ) \ FLAG( D, 10, ECX, 0, 1, XSAVES_PASID_STATE_SUP_BY_XSS, NO, 0 ) \ FLAG( D, 10, ECX, 1, 1, XSAVES_PASID_STATE_ALIGN, NO, 0 ) \ FLAG( D, 10, ECX, 2, 1, XSAVES_PASID_STATE_XFD, NO, 0 ) \ -FIELD( D, 11, EAX, 0, 32, XSAVES_CET_U_SIZE, NO, 0 ) \ -FLAG( D, 11, ECX, 0, 1, XSAVES_CET_U_SUP_BY_XSS, NO, 0 ) \ -FLAG( D, 11, ECX, 1, 1, XSAVES_CET_U_ALIGN, NO, 0 ) \ -FLAG( D, 11, ECX, 2, 1, XSAVES_CET_U_XFD, NO, 0 ) \ -FIELD( D, 12, EAX, 0, 32, XSAVES_CET_S_SIZE, NO, 0 ) \ -FLAG( D, 12, ECX, 0, 1, XSAVES_CET_S_SUP_BY_XSS, NO, 0 ) \ -FLAG( D, 12, ECX, 1, 1, XSAVES_CET_S_ALIGN, NO, 0 ) \ -FLAG( D, 12, ECX, 2, 1, XSAVES_CET_S_XFD, NO, 0 ) \ +FIELD( D, 11, EAX, 0, 32, XSAVES_CET_U_SIZE, YES, 20 ) \ +FLAG( D, 11, ECX, 0, 1, XSAVES_CET_U_SUP_BY_XSS, YES, 20 ) \ +FLAG( D, 11, ECX, 1, 1, XSAVES_CET_U_ALIGN, YES, 20 ) \ +FLAG( D, 11, ECX, 2, 1, XSAVES_CET_U_XFD, YES, 20 ) \ +FIELD( D, 12, EAX, 0, 32, XSAVES_CET_S_SIZE, YES, 20 ) \ +FLAG( D, 12, ECX, 0, 1, XSAVES_CET_S_SUP_BY_XSS, YES, 20 ) \ +FLAG( D, 12, ECX, 1, 1, XSAVES_CET_S_ALIGN, YES, 20 ) \ +FLAG( D, 12, ECX, 2, 1, XSAVES_CET_S_XFD, YES, 20 ) \ FIELD( D, 13, EAX, 0, 32, XSAVES_HDT_SIZE, NO, 0 ) \ FLAG( D, 13, ECX, 0, 1, XSAVES_HDT_SUP_BY_XSS, NO, 0 ) \ FLAG( D, 13, ECX, 1, 1, XSAVES_HDT_ALIGN, NO, 0 ) \ @@ -1260,7 +1260,7 @@ FLAG( 8A, 0, EDX, 15, 1, SVM_V_VMSAVE_VMLOAD, NO, 0 ) \ FLAG( 8A, 0, EDX, 16, 1, SVM_VGIF, NO, 0 ) \ FLAG( 8A, 0, EDX, 17, 1, SVM_GMET, YES, 17 ) \ FLAG( 8A, 0, EDX, 18, 1, SVMEDX_RSVD3, NO, 0 ) \ -FLAG( 8A, 0, EDX, 19, 1, SVM_SSS, NO, 0 ) \ +FLAG( 8A, 0, EDX, 19, 1, SVM_SSS, YES, 20 ) \ FLAG( 8A, 0, EDX, 20, 1, SVM_GUEST_SPEC_CTRL, NO, 0 ) \ FIELD( 8A, 0, EDX, 21, 3, SVMEDX_RSVD4, NO, 0 ) \ FLAG( 8A, 0, EDX, 24, 1, SVM_TLB_CTL, NO, 0 ) \