This serial is the extended version of https://lkml.kernel.org/r/20200528151927.14346-1-xiaoyao.li@xxxxxxxxx First two patches are bug fixing, and the other aim to refactor the flow of SET_CPUID* as: 1. cpuid check: check if userspace provides legal CPUID settings; 2. cpuid update: Update some special CPUID bits based on current vcpu state, e.g., OSXSAVE, OSPKE, ... 3. update KVM state: Update KVM states based on the final CPUID settings. Xiaoyao Li (6): KVM: X86: Reset vcpu->arch.cpuid_nent to 0 if SET_CPUID fails KVM: X86: Go on updating other CPUID leaves when leaf 1 is absent KVM: X86: Introduce kvm_check_cpuid() KVM: X86: Split kvm_update_cpuid() KVM: X86: Move kvm_x86_ops.cpuid_update() into kvm_update_state_based_on_cpuid() KVM: X86: Move kvm_apic_set_version() to kvm_update_state_based_on_cpuid() arch/x86/kvm/cpuid.c | 107 +++++++++++++++++++++++++++---------------- arch/x86/kvm/cpuid.h | 3 +- arch/x86/kvm/x86.c | 1 + 3 files changed, 70 insertions(+), 41 deletions(-) -- 2.18.2