From patchwork Wed Jun 21 12:40:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9801731 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 2EDF360234 for ; Wed, 21 Jun 2017 12:44:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46AF1285A3 for ; Wed, 21 Jun 2017 12:43:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A945285C0; Wed, 21 Jun 2017 12:43:44 +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 ACA26285A3 for ; Wed, 21 Jun 2017 12:43:43 +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 1dNewF-0003qR-R0; Wed, 21 Jun 2017 12:40:51 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNewE-0003qL-Io for xen-devel@lists.xen.org; Wed, 21 Jun 2017 12:40:50 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 5C/CE-03058-1596A495; Wed, 21 Jun 2017 12:40:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXitHSDvW5gple kweYdkhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8b7J0uYCvYKVqx8N429gfEWbxcjJ4eEgL/E rIsTWEBsNgF9id0vPjGB2CIC6hKnOy6ydjFycTALXGKUOHZlEyNIQljAUeLG2x1ANgcHi4Cqx IOF2SBhXgF3iSlvHrBCzJSTOH/8JzOILSSgJnGt/xI7RI2gxMmZT8B2MQtISBx88YJ5AiP3LC SpWUhSCxiZVjFqFKcWlaUW6Rqa6iUVZaZnlOQmZuboGhqY6eWmFhcnpqfmJCYV6yXn525iBAY DAxDsYPy2LOAQoyQHk5Iob7m3V6QQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV6pDKCcYFFqempF WmYOMCxh0hIcPEoivG4BQGne4oLE3OLMdIjUKUZFKXHec+lACQGQREZpHlwbLBYuMcpKCfMyA h0ixFOQWpSbWYIq/4pRnINRSZh3DcgUnsy8Erjpr4AWMwEtfnHEA2RxSSJCSqqBccJUxZMzfN +fK7lzz4Ep1Pp457md/3wydT2a+abcVpvsu89tWeCutmZW+dZtHWxzjX64Pnuh/JL7YmEp13X pKzM2tt54vfxBwdKHp4990d1mOqcwYpFNa3XeLIO64zqvXjP9/nlseW2c7+0fOWe0evReXdbe bXM/K796tteMmr2n57wpfSWquVmJpTgj0VCLuag4EQABpvdcgAIAAA== X-Env-Sender: prvs=338940b9e=Andrew.Cooper3@citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1498048847!74837014!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3408 invoked from network); 21 Jun 2017 12:40:49 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 21 Jun 2017 12:40:49 -0000 X-IronPort-AV: E=Sophos;i="5.39,369,1493683200"; d="scan'208";a="437298534" From: Andrew Cooper To: Xen-devel Date: Wed, 21 Jun 2017 13:40:45 +0100 Message-ID: <1498048845-315-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Andrew Cooper , Julien Grall , Stefano Stabellini , Jan Beulich Subject: [Xen-devel] [PATCH] xen: Replace ASSERT(0) with ASSERT_UNREACHABLE() 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP No functional change, but the result is more informative both in the code and error messages if the assertions do get hit. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Julien Grall Acked-by: Konrad Rzeszutek Wilk --- CC: Jan Beulich CC: Konrad Rzeszutek Wilk CC: Stefano Stabellini CC: Julien Grall --- xen/arch/arm/mm.c | 4 ++-- xen/common/tmem_xen.c | 4 ++-- xen/drivers/passthrough/amd/iommu_acpi.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 341bacf..5475557 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1154,7 +1154,7 @@ void arch_dump_shared_mem_info(void) int donate_page(struct domain *d, struct page_info *page, unsigned int memflags) { - ASSERT(0); + ASSERT_UNREACHABLE(); return -ENOSYS; } @@ -1166,7 +1166,7 @@ int steal_page( int page_is_ram_type(unsigned long mfn, unsigned long mem_type) { - ASSERT(0); + ASSERT_UNREACHABLE(); return 0; } diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 06ce3ef..725ae93 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -34,14 +34,14 @@ static DEFINE_PER_CPU_READ_MOSTLY(void *, scratch_page); static inline void *cli_get_page(xen_pfn_t cmfn, unsigned long *pcli_mfn, struct page_info **pcli_pfp, bool_t cli_write) { - ASSERT(0); + ASSERT_UNREACHABLE(); return NULL; } static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, unsigned long cli_mfn, bool_t mark_dirty) { - ASSERT(0); + ASSERT_UNREACHABLE(); } #else #include diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index d8a9205..f4c7206 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -818,7 +818,7 @@ static u16 __init parse_ivhd_device_special( hpet_sbdf.init = HPET_IVHD; break; default: - ASSERT(0); + ASSERT_UNREACHABLE(); break; } break;