From patchwork Mon Feb 27 05:09:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 9592691 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 ED403604AB for ; Mon, 27 Feb 2017 05:12:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E043727FB1 for ; Mon, 27 Feb 2017 05:12:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D508A28395; Mon, 27 Feb 2017 05:12:36 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8ED3D27FB1 for ; Mon, 27 Feb 2017 05:12:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciDZU-0006K4-Ui; Mon, 27 Feb 2017 05:10:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciDZU-0006Ej-1w for xen-devel@lists.xen.org; Mon, 27 Feb 2017 05:10:04 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id FB/D5-08534-BA4B3B85; Mon, 27 Feb 2017 05:10:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1taRortqy+Y Igxn3LC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ozJ3xqYC05xVrx/1MvewHibvYuRk0NIoFJi woq5TCC2hACvxJFlM1gh7ACJwwsusnQxcgHV9DJKHFl9nBkkwSagL7Hi8UGwIhEBaYlrny8zg hQxCyxklNj5qx0sISwQLnFn7iKwqSwCqhJ3590Gsjk4eAVsJXat9IVYIC9x4eopFhCbU8BO4t aZVmaQEiGgktXfRSYw8i5gZFjFqFGcWlSWWqRrZKKXVJSZnlGSm5iZo2toYKyXm1pcnJiempO YVKyXnJ+7iREYDPUMDIw7GF8d9zvEKMnBpCTKu8h4Y4QQX1J+SmVGYnFGfFFpTmrxIUYZDg4l Cd7+zZsjhASLUtNTK9Iyc4BhCZOW4OBREuHdvwkozVtckJhbnJkOkTrFqCglzlsN0icAksgoz YNrg8XCJUZZKWFeRgYGBiGegtSi3MwSVPlXjOIcjErCvBUgU3gy80rgpr8CWswEtHg2yM28xS WJCCmpBkaHH3b37mdc+B1zMcxi35Wud0+EtouuOH6r7SbLlBnrXfyrHFXW1Nm4d3gLN946xXT 809qWsneHrkT3Zmy/u6eo5qKWfZbJ4sd9Z97UW/DbCfrrHP2/NUts4/Oza19n9i62juHZ51C0 Sv2VcHNG7UWbuqg+tpA8iYPlUnYhn3buCa4UDTgk3aDEUpyRaKjFXFScCAAuFZnjgAIAAA== X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1488172192!29448017!6 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25113 invoked from network); 27 Feb 2017 05:10:02 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-4.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 27 Feb 2017 05:10:02 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP; 26 Feb 2017 21:10:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.35,212,1484035200"; d="scan'208"; a="1115945522" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.133]) by fmsmga001.fm.intel.com with ESMTP; 26 Feb 2017 21:10:00 -0800 From: Haozhong Zhang To: xen-devel@lists.xen.org Date: Mon, 27 Feb 2017 13:09:11 +0800 Message-Id: <20170227050912.28824-7-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170227050912.28824-1-haozhong.zhang@intel.com> References: <20170227050912.28824-1-haozhong.zhang@intel.com> Cc: Haozhong Zhang , Christoph Egger , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v2 6/7] xen/mce: remove ASSERT's about mce_dhandler_num in mce_action() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The current production build works fine even though those ASSERT's are violated. Remove them to make the debug build work as well. Signed-off-by: Haozhong Zhang --- Cc: Christoph Egger Cc: Jan Beulich Cc: Andrew Cooper Changes since v1: * Remove those ASSERT's rather than making them Intel-only. --- xen/arch/x86/cpu/mcheck/mce.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 5a7e2ba..a42cabd 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1621,9 +1621,6 @@ static enum mce_result mce_action(const struct cpu_user_regs *regs, handlers = mce_uhandlers; } - /* At least a default handler should be registerd */ - ASSERT(handler_num); - local_mi = (struct mc_info*)mctelem_dataptr(mctc); x86_mcinfo_lookup(mic, local_mi, MC_TYPE_GLOBAL); if (mic == NULL) { @@ -1656,7 +1653,6 @@ static enum mce_result mce_action(const struct cpu_user_regs *regs, break; } } - ASSERT(i != handler_num); } return worst_result;