Module Name: src
Committed By: mrg
Date: Tue Mar 29 06:51:40 UTC 2016
Modified Files:
src/lib/libkvm: kvm.c
Log Message:
distinguish between partial and failed read, so that "read 0xffffffff bytes
failed"
is not output..
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/lib/libkvm/kvm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libkvm/kvm.c
diff -u src/lib/libkvm/kvm.c:1.101 src/lib/libkvm/kvm.c:1.102
--- src/lib/libkvm/kvm.c:1.101 Wed Feb 19 20:21:22 2014
+++ src/lib/libkvm/kvm.c Tue Mar 29 06:51:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm.c,v 1.101 2014/02/19 20:21:22 dsl Exp $ */
+/* $NetBSD: kvm.c,v 1.102 2016/03/29 06:51:40 mrg Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94";
#else
-__RCSID("$NetBSD: kvm.c,v 1.101 2014/02/19 20:21:22 dsl Exp $");
+__RCSID("$NetBSD: kvm.c,v 1.102 2016/03/29 06:51:40 mrg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -515,9 +515,14 @@ kvm_dump_mkheader(kvm_t *kd, off_t dump_
*/
sz = Pread(kd, kd->pmfd, &cpu_hdr, sizeof(cpu_hdr), dump_off);
if (sz != sizeof(cpu_hdr)) {
- _kvm_err(kd, 0, "read %zx bytes at offset %"PRIx64
- " for cpu_hdr instead of requested %zu",
- sz, dump_off, sizeof(cpu_hdr));
+ if (sz == -1)
+ _kvm_err(kd, 0, "read %zx bytes at offset %"PRIx64
+ " for cpu_hdr failed: %s", sizeof(cpu_hdr),
+ dump_off, strerror(errno));
+ else
+ _kvm_err(kd, 0, "read %zx bytes at offset %"PRIx64
+ " for cpu_hdr instead of requested %zu",
+ sz, dump_off, sizeof(cpu_hdr));
return (-1);
}
if ((CORE_GETMAGIC(cpu_hdr) != KCORE_MAGIC)
