From: VMware, Inc <>
Date: Tue, 19 Oct 2010 19:21:58 +0000 (-0700)
Subject: Unix Balloon: do not use ASSERT()s in kernel driver
X-Git-Tag: 2010.10.18-313025~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb94b9c8cf4fd79edd3614bdedb6e5dfe6520bc5;p=thirdparty%2Fopen-vm-tools.git

Unix Balloon: do not use ASSERT()s in kernel driver

Our VMware-defined ASSERT() uses Panic() which is not available
in kernel drivers. Instead of implementing stubs we better
remove recently-introduced ASSERTS().

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/modules/shared/vmmemctl/vmballoon.c b/open-vm-tools/modules/shared/vmmemctl/vmballoon.c
index d8dcc4058..08d313766 100644
--- a/open-vm-tools/modules/shared/vmmemctl/vmballoon.c
+++ b/open-vm-tools/modules/shared/vmmemctl/vmballoon.c
@@ -564,7 +564,6 @@ BalloonGetChunk(Balloon *b)         // IN
 static void
 BalloonPageStore(BalloonChunk *chunk, PageHandle page)
 {
-   ASSERT(chunk->pageCount < BALLOON_CHUNK_PAGES);
    chunk->page[chunk->pageCount++] = page;
 }
 
@@ -995,8 +994,6 @@ BalloonMonitorGuestType(Balloon *b) // IN
    uint32 status, target;
    Backdoor_proto bp;
 
-   ASSERT(b->guestType == (uint32) b->guestType);
-
    /* prepare backdoor args */
    bp.in.cx.halfs.low = BALLOON_BDOOR_CMD_GUEST_ID;
    bp.in.size = b->guestType;