Merge branch 'kvm-vmx-secctl' into kvm-master

bonzini · bonzini · commit 375d1adebc11 · 2021-08-13T03:20:18.000-04:00
Merge common topic branch for 5.14-rc6 and 5.15 merge window.
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
@@ -522,7 +522,7 @@ static inline struct vmcs *alloc_vmcs(bool shadow)
 
 static inline bool vmx_has_waitpkg(struct vcpu_vmx *vmx)
 {
-	return vmx->secondary_exec_control &
+	return secondary_exec_controls_get(vmx) &
 		SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ static inline struct vmcs *alloc_vmcs(bool shadow)`
`522`	`522`
`523`	`523`	`static inline bool vmx_has_waitpkg(struct vcpu_vmx *vmx)`
`524`	`524`	`{`
`525`		`- return vmx->secondary_exec_control &`
	`525`	`+ return secondary_exec_controls_get(vmx) &`
`526`	`526`	`SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE;`
`527`	`527`	`}`
`528`	`528`