From: Catherine Ho <catherine.hecx@gmail.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Catherine Ho <catherine.hecx@gmail.com>,
Eduardo Habkost <ehabkost@redhat.com>,
kvm@vger.kernel.org, Richard Henderson <rth@twiddle.net>
Subject: [PATCH] target/i386: relax assert when old host kernels don't include msrs
Date: Wed, 4 Dec 2019 03:50:30 -0500 [thread overview]
Message-ID: <1575449430-23366-1-git-send-email-catherine.hecx@gmail.com> (raw)
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 <pbonzini@redhat.com>
Signed-off-by: Catherine Ho <catherine.hecx@gmail.com>
---
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
next reply other threads:[~2019-12-04 8:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 8:50 Catherine Ho [this message]
2019-12-04 11:22 ` [PATCH] target/i386: relax assert when old host kernels don't include msrs Paolo Bonzini
2019-12-04 13:33 ` Catherine Ho
2019-12-04 13:53 ` Paolo Bonzini
2019-12-04 15:07 ` Catherine Ho
2019-12-04 15:34 ` Paolo Bonzini
2019-12-04 15:47 ` Eduardo Habkost
2019-12-04 16:23 ` Paolo Bonzini
2019-12-06 10:23 ` [PATCH] target/i386: skip kvm_msr_entry_add when kvm_vmx_basic is 0 Catherine Ho
2019-12-06 10:28 ` Catherine Ho
2019-12-06 11:30 ` Paolo Bonzini
2019-12-06 23:48 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1575449430-23366-1-git-send-email-catherine.hecx@gmail.com \
--to=catherine.hecx@gmail.com \
--cc=ehabkost@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).