[Qemu-commits] [qemu/qemu] 260518: target/i386: disable VMX features if nested=0

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2605188240f939fa9ae9353f53a0985620b34769
      
https://github.com/qemu/qemu/commit/2605188240f939fa9ae9353f53a0985620b34769
  Author: Yang Zhong <address@hidden>
  Date:   2019-12-06 (Fri, 06 Dec 2019)

  Changed paths:
    M target/i386/kvm.c

  Log Message:
  -----------
  target/i386: disable VMX features if nested=0

If kvm does not support VMX feature by nested=0, the kvm_vmx_basic
can't get the right value from MSR_IA32_VMX_BASIC register, which
make qemu coredump when qemu do KVM_SET_MSRS.

The coredump info:
error: failed to set MSR 0x480 to 0x0
kvm_put_msrs: Assertion `ret == cpu->kvm_msr_buf->nmsrs' failed.

Signed-off-by: Yang Zhong <address@hidden>
Message-Id: <address@hidden>
Reported-by: Catherine Ho <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 02f9c885edefae66d787847758d13ed60c0f539e
      
https://github.com/qemu/qemu/commit/02f9c885edefae66d787847758d13ed60c0f539e
  Author: Peter Maydell <address@hidden>
  Date:   2019-12-06 (Fri, 06 Dec 2019)

  Changed paths:
    M target/i386/kvm.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* fix for x86 KVM on older kernels (Yang Zhong)

# gpg: Signature made Fri 06 Dec 2019 11:36:08 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Paolo Bonzini <address@hidden>" [full]
# gpg:                 aka "Paolo Bonzini <address@hidden>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  target/i386: disable VMX features if nested=0

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/1bdc319ab5d2...02f9c885edef