From patchwork Wed Jun 22 06:56:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 9192017 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BCEBA6075C for ; Wed, 22 Jun 2016 07:17:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6E3C283F0 for ; Wed, 22 Jun 2016 07:17:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B29D283F2; Wed, 22 Jun 2016 07:17:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 30B91283F0 for ; Wed, 22 Jun 2016 07:17:47 +0000 (UTC) Received: from localhost ([::1]:56180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFcPx-0005I3-PN for patchwork-qemu-devel@patchwork.kernel.org; Wed, 22 Jun 2016 03:17:45 -0400 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 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP; 21 Jun 2016 23:57:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.26,508,1459839600"; d="scan'208"; a="1002823897" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.140]) by orsmga002.jf.intel.com with ESMTP; 21 Jun 2016 23:57:04 -0700 From: Haozhong Zhang To: qemu-devel@nongnu.org Date: Wed, 22 Jun 2016 14:56:24 +0800 Message-Id: <20160622065624.25291-5-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160622065624.25291-1-haozhong.zhang@intel.com> References: <20160622065624.25291-1-haozhong.zhang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.120 Subject: [Qemu-devel] [PATCH v5 4/4] target-i386: abort migration if LMCE config mismatch X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Haozhong Zhang , Tony Luck , rkrcmar@redhat.com, Eduardo Habkost , kvm@vger.kernel.org, "Michael S . Tsirkin" , Marcelo Tosatti , Andi Kleen , Paolo Bonzini , Ashok Raj , Boris Petkov , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP ... 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.