[src/trunk]: src/sys/rump/librump/rumpkern rump: KASSERT(x && y) -> KASSERT(x...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1e83f8ad80a0
branches:  trunk
changeset: 376600:1e83f8ad80a0
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Jun 23 21:09:44 2023 +0000

description:
rump: KASSERT(x && y) -> KASSERT(x); KASSERT(y)

Add some KASSERTMSG while here.

diffstat:

 sys/rump/librump/rumpkern/klock.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 935b1cfb1a69 -r 1e83f8ad80a0 sys/rump/librump/rumpkern/klock.c
--- a/sys/rump/librump/rumpkern/klock.c Fri Jun 23 20:59:04 2023 +0000
+++ b/sys/rump/librump/rumpkern/klock.c Fri Jun 23 21:09:44 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: klock.c,v 1.10 2016/07/07 06:55:44 msaitoh Exp $       */
+/*     $NetBSD: klock.c,v 1.11 2023/06/23 21:09:44 riastradh Exp $     */
 
 /*
  * Copyright (c) 2007-2010 Antti Kantee.  All Rights Reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: klock.c,v 1.10 2016/07/07 06:55:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: klock.c,v 1.11 2023/06/23 21:09:44 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,7 +67,9 @@ void
 rump_kernel_bigwrap(int *nlocks)
 {
 
-       KASSERT(giantcnt > 0 && curlwp == giantowner);
+       KASSERTMSG(giantcnt > 0, "giantcnt=%d", giantcnt);
+       KASSERTMSG(curlwp == giantowner, "curlwp=%p giantowner=%p",
+           curlwp, giantowner);
        giantowner = NULL;
        *nlocks = giantcnt;
        giantcnt = 0;