From: Haozhong Zhang <haozhong.zhang@intel.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>,
Eduardo Habkost <ehabkost@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
kvm@vger.kernel.org, Boris Petkov <bp@suse.de>,
Tony Luck <tony.luck@intel.com>,
Andi Kleen <andi.kleen@intel.com>,
rkrcmar@redhat.com, Ashok Raj <ashok.raj@intel.com>,
Haozhong Zhang <haozhong.zhang@intel.com>
Subject: [Qemu-devel] [PATCH v5 4/4] target-i386: abort migration if LMCE config mismatch
Date: Wed, 22 Jun 2016 14:56:24 +0800 [thread overview]
Message-ID: <20160622065624.25291-5-haozhong.zhang@intel.com> (raw)
In-Reply-To: <20160622065624.25291-1-haozhong.zhang@intel.com>
... to avoid guest errors due to LMCE configurations changes when
migrating from LMCE-enabled QEMU to LMCE-disabled QEMU.
Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
---
target-i386/machine.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 71c0e4d..00375a3 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -347,6 +347,12 @@ static int cpu_post_load(void *opaque, int version_id)
return -EINVAL;
}
+ if (!cpu->enable_lmce && (env->mcg_cap & MCG_LMCE_P)) {
+ error_report("Config mismatch: VCPU has LMCE enabled, "
+ "but \"lmce\" option is disabled");
+ return -EINVAL;
+ }
+
/*
* Real mode guest segments register DPL should be zero.
* Older KVM version were setting it wrongly.
--
2.9.0
next prev parent reply other threads:[~2016-06-22 6:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 6:56 [Qemu-devel] [PATCH v5 0/4] Add QEMU support for Intel local MCE Haozhong Zhang
2016-06-22 6:56 ` [Qemu-devel] [PATCH v5 1/4] target-i386: KVM: add basic Intel LMCE support Haozhong Zhang
2016-07-07 17:04 ` Eduardo Habkost
2016-06-22 6:56 ` [Qemu-devel] [PATCH v5 2/4] i386: publish advised value of MSR_IA32_FEATURE_CONTROL via fw_cfg Haozhong Zhang
2016-06-22 17:08 ` Paolo Bonzini
2016-06-23 6:08 ` Haozhong Zhang
2016-06-23 6:15 ` [Qemu-devel] [RESEND PATCH " Haozhong Zhang
2016-07-07 17:06 ` Eduardo Habkost
2016-06-22 6:56 ` [Qemu-devel] [PATCH v5 3/4] target-i386: enable LMCE for '-cpu host' if supported by host Haozhong Zhang
2016-07-07 17:05 ` Eduardo Habkost
2016-06-22 6:56 ` Haozhong Zhang [this message]
2016-07-07 17:10 ` [Qemu-devel] [PATCH v5 4/4] target-i386: abort migration if LMCE config mismatch Eduardo Habkost
2016-07-08 2:41 ` Haozhong Zhang
2016-07-06 8:26 ` [Qemu-devel] [PATCH v5 0/4] Add QEMU support for Intel local MCE Laszlo Ersek
2016-07-06 8:35 ` Haozhong Zhang
2016-07-06 8:37 ` Laszlo Ersek
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=20160622065624.25291-5-haozhong.zhang@intel.com \
--to=haozhong.zhang@intel.com \
--cc=andi.kleen@intel.com \
--cc=ashok.raj@intel.com \
--cc=bp@suse.de \
--cc=ehabkost@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rkrcmar@redhat.com \
--cc=rth@twiddle.net \
--cc=tony.luck@intel.com \
/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).