From owner-svn-src-projects@FreeBSD.ORG Wed Sep 18 23:02:39 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 01BBFF52; Wed, 18 Sep 2013 23:02:39 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C8EDB2BD6; Wed, 18 Sep 2013 23:02:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8IN2clf019531; Wed, 18 Sep 2013 23:02:38 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8IN2crp019530; Wed, 18 Sep 2013 23:02:38 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201309182302.r8IN2crp019530@svn.freebsd.org> From: Neel Natu Date: Wed, 18 Sep 2013 23:02:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255680 - projects/bhyve_npt_pmap/sys/amd64/amd64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Sep 2013 23:02:39 -0000 Author: neel Date: Wed Sep 18 23:02:38 2013 New Revision: 255680 URL: http://svnweb.freebsd.org/changeset/base/255680 Log: Replace explicit calls to panic() with KASSERT() instead. Requested by: kib@ Modified: projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c Modified: projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c Wed Sep 18 22:26:41 2013 (r255679) +++ projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c Wed Sep 18 23:02:38 2013 (r255680) @@ -1166,8 +1166,8 @@ pmap_update_pde_invalidate(pmap_t pmap, if (pmap->pm_type == PT_EPT) return; - if (pmap->pm_type != PT_X86) - panic("pmap_update_pde_invalidate: bad type %d", pmap->pm_type); + KASSERT(pmap->pm_type == PT_X86, + ("pmap_update_pde_invalidate: invalid type %d", pmap->pm_type)); PG_G = pmap_global_bit(pmap); @@ -1281,8 +1281,8 @@ pmap_invalidate_page(pmap_t pmap, vm_off return; } - if (pmap->pm_type != PT_X86) - panic("pmap_invalidate_page: invalid type %d", pmap->pm_type); + KASSERT(pmap->pm_type == PT_X86, + ("pmap_invalidate_page: invalid type %d", pmap->pm_type)); sched_pin(); if (pmap == kernel_pmap || !CPU_CMP(&pmap->pm_active, &all_cpus)) { @@ -1359,8 +1359,8 @@ pmap_invalidate_range(pmap_t pmap, vm_of return; } - if (pmap->pm_type != PT_X86) - panic("pmap_invalidate_range: invalid type %d", pmap->pm_type); + KASSERT(pmap->pm_type == PT_X86, + ("pmap_invalidate_range: invalid type %d", pmap->pm_type)); sched_pin(); if (pmap == kernel_pmap || !CPU_CMP(&pmap->pm_active, &all_cpus)) { @@ -1418,8 +1418,8 @@ pmap_invalidate_all(pmap_t pmap) return; } - if (pmap->pm_type != PT_X86) - panic("pmap_invalidate_all: invalid type %d", pmap->pm_type); + KASSERT(pmap->pm_type == PT_X86, + ("pmap_invalidate_all: invalid type %d", pmap->pm_type)); sched_pin(); cpuid = PCPU_GET(cpuid); @@ -5919,11 +5919,11 @@ pmap_clear_modify(vm_page_t m) pte = pmap_pde_to_pte(pde, va); oldpte = *pte; - if ((oldpte & (PG_RO | PG_RW | PG_M)) != - (PG_RW | PG_M)) - panic("inconsistent pte %#lx " - "after demotion from pde " - "%#lx", oldpte, oldpde); + KASSERT((oldpte & (PG_RO|PG_RW|PG_M)) == + (PG_RW | PG_M), + ("inconsistent pte %#lx after " + "demotion from pde %#lx", + oldpte, oldpde)); while (!atomic_cmpset_long(pte, oldpte, oldpte & ~(PG_M | PG_RW)))