From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFc63-0006Mz-Vq for qemu-devel@nongnu.org; Wed, 22 Jun 2016 02:57:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFc5z-000736-R3 for qemu-devel@nongnu.org; Wed, 22 Jun 2016 02:57:10 -0400 Received: from mga04.intel.com ([192.55.52.120]:10930) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFc5z-00072z-LO for qemu-devel@nongnu.org; Wed, 22 Jun 2016 02:57:07 -0400 From: Haozhong Zhang Date: Wed, 22 Jun 2016 14:56:24 +0800 Message-Id: <20160622065624.25291-5-haozhong.zhang@intel.com> In-Reply-To: <20160622065624.25291-1-haozhong.zhang@intel.com> References: <20160622065624.25291-1-haozhong.zhang@intel.com> Subject: [Qemu-devel] [PATCH v5 4/4] target-i386: abort migration if LMCE config mismatch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S . Tsirkin" , Marcelo Tosatti , kvm@vger.kernel.org, Boris Petkov , Tony Luck , Andi Kleen , rkrcmar@redhat.com, Ashok Raj , Haozhong Zhang ... to avoid guest errors due to LMCE configurations changes when migrating from LMCE-enabled QEMU to LMCE-disabled QEMU. Signed-off-by: Haozhong Zhang --- 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