Module Name: src
Committed By: jym
Date: Sun Aug 21 10:00:13 UTC 2011
Modified Files:
src/sys/arch/xen/x86: x86_xpmap.c
Log Message:
Merge err printf with the panic(9) message.
Also fix the if () {...} statement with braces, to avoid calling panic()
every time. Hi cherry!
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/xen/x86/x86_xpmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.32 src/sys/arch/xen/x86/x86_xpmap.c:1.33
--- src/sys/arch/xen/x86/x86_xpmap.c:1.32 Sat Aug 13 20:24:19 2011
+++ src/sys/arch/xen/x86/x86_xpmap.c Sun Aug 21 10:00:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.32 2011/08/13 20:24:19 cherry Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.33 2011/08/21 10:00:13 jym Exp $ */
/*
* Copyright (c) 2006 Mathieu Ropert <m...@adviseo.fr>
@@ -69,7 +69,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.32 2011/08/13 20:24:19 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.33 2011/08/21 10:00:13 jym Exp $");
#include "opt_xen.h"
#include "opt_ddb.h"
@@ -343,9 +343,9 @@
XENPRINTK2(("xpq_queue_flush_cache\n"));
op.cmd = MMUEXT_FLUSH_CACHE;
- if ((err = HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF)) < 0)
- printf("errno == %d\n", err);
- panic("xpq_flush_cache");
+ if ((err = HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF)) < 0) {
+ panic("xpq_flush_cache, err %d", err);
+ }
xpq_queue_unlock();
splx(s); /* XXX: removeme */
}
