I am upstream'ing these patches on behalf of Jim Mattson. [PATCH 1/2] kvm: vmx: Introduce lapic_mode enumeration [PATCH 2/2] kvm: vmx: Basic APIC virtualization controls have three arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/lapic.c | 12 +++++------ arch/x86/kvm/lapic.h | 14 ++++++++++++ arch/x86/kvm/svm.c | 4 ++-- arch/x86/kvm/vmx.c | 48 +++++++++++++++++++++++++---------------- arch/x86/kvm/x86.c | 31 +++++++++++++++----------- 6 files changed, 71 insertions(+), 40 deletions(-) Jim Mattson (2): kvm: vmx: Introduce lapic_mode enumeration kvm: vmx: Basic APIC virtualization controls have three settings