linux-next: manual merge of the kvm tree with the kvm-fixes tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  arch/x86/kvm/vmx.c

between commit:

  9d1887ef3252 ("KVM: nVMX: sync vmcs02 segment regs prior to vmx_set_cr0")

from the kvm-fixes tree and commit:

  2bb8cafea80b ("KVM: vVMX: signal failure for nested VMEntry if emulation_required")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kvm/vmx.c
index 92496b9b5f2b,b4d8da6c62c8..000000000000
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@@ -10952,6 -11010,19 +11021,14 @@@ static int prepare_vmcs02(struct kvm_vc
  	/* Note: modifies VM_ENTRY/EXIT_CONTROLS and GUEST/HOST_IA32_EFER */
  	vmx_set_efer(vcpu, vcpu->arch.efer);
  
 -	if (vmx->nested.dirty_vmcs12) {
 -		prepare_vmcs02_full(vcpu, vmcs12, from_vmentry);
 -		vmx->nested.dirty_vmcs12 = false;
 -	}
 -
+ 	/*
+ 	 * Guest state is invalid and unrestricted guest is disabled,
+ 	 * which means L1 attempted VMEntry to L2 with invalid state.
+ 	 * Fail the VMEntry.
+ 	 */
+ 	if (vmx->emulation_required)
+ 		return 1;
+ 
  	/* Shadow page tables on either EPT or shadow page tables. */
  	if (nested_vmx_load_cr3(vcpu, vmcs12->guest_cr3, nested_cpu_has_ept(vmcs12),
  				entry_failure_code))

Attachment: pgpUjCYqqXXdg.pgp
Description: OpenPGP digital signature