From owner-svn-src-projects@FreeBSD.ORG Mon Jan 21 06:55:52 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 251F0A16; Mon, 21 Jan 2013 06:55:52 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 18C78E0F; Mon, 21 Jan 2013 06:55:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L6tpsB097651; Mon, 21 Jan 2013 06:55:51 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L6tpAq097650; Mon, 21 Jan 2013 06:55:51 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201301210655.r0L6tpAq097650@svn.freebsd.org> From: Bryan Venteicher Date: Mon, 21 Jan 2013 06:55:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245719 - projects/virtio/sys/dev/virtio/balloon 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: Mon, 21 Jan 2013 06:55:52 -0000 Author: bryanv Date: Mon Jan 21 06:55:51 2013 New Revision: 245719 URL: http://svnweb.freebsd.org/changeset/base/245719 Log: virtio_balloon: More verbose ASSERT messages Approved by: grehan (implicit) Modified: projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c Modified: projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c ============================================================================== --- projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c Mon Jan 21 06:54:33 2013 (r245718) +++ projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c Mon Jan 21 06:55:51 2013 (r245719) @@ -331,7 +331,8 @@ vtballoon_inflate(struct vtballoon_softc sc->vtballoon_page_frames[i] = VM_PAGE_TO_PHYS(m) >> VIRTIO_BALLOON_PFN_SHIFT; - KASSERT(m->queue == PQ_NONE, ("allocated page on queue")); + KASSERT(m->queue == PQ_NONE, + ("%s: allocated page %p on queue", __func__, m)); TAILQ_INSERT_TAIL(&sc->vtballoon_pages, m, pageq); } @@ -358,7 +359,7 @@ vtballoon_deflate(struct vtballoon_softc for (i = 0; i < npages; i++) { m = TAILQ_FIRST(&sc->vtballoon_pages); - KASSERT(m != NULL, ("no more pages to deflate")); + KASSERT(m != NULL, ("%s: no more pages to deflate", __func__)); sc->vtballoon_page_frames[i] = VM_PAGE_TO_PHYS(m) >> VIRTIO_BALLOON_PFN_SHIFT; @@ -380,7 +381,9 @@ vtballoon_deflate(struct vtballoon_softc KASSERT((TAILQ_EMPTY(&sc->vtballoon_pages) && sc->vtballoon_current_npages == 0) || (!TAILQ_EMPTY(&sc->vtballoon_pages) && - sc->vtballoon_current_npages != 0), ("balloon empty?")); + sc->vtballoon_current_npages != 0), + ("%s: bogus page count %d", __func__, + sc->vtballoon_current_npages)); } static void