Commit 20a78b02d315 ("target/i386: add VMX features") unconditionally
add vmx msr entry although older host kernels don't include them.But old host kernel + newest qemu will cause a qemu crash as follows: qemu-system-x86_64: error: failed to set MSR 0x480 to 0x0 target/i386/kvm.c:2932: kvm_put_msrs: Assertion `ret == cpu->kvm_msr_buf->nmsrs' failed. This fixes it by relaxing the condition. Cc: Paolo Bonzini <[email protected]> Signed-off-by: Catherine Ho <[email protected]> --- target/i386/kvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index bf16556..a8c44bf 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -2936,7 +2936,7 @@ static int kvm_put_msrs(X86CPU *cpu, int level) (uint32_t)e->index, (uint64_t)e->data); } - assert(ret == cpu->kvm_msr_buf->nmsrs); + assert(ret <= cpu->kvm_msr_buf->nmsrs); return 0; } -- 1.7.1
