summaryrefslogtreecommitdiffstats
path: root/usr.sbin/vmd/loadfile_elf.c
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2015-11-23 13:04:49 +0000
committerreyk <reyk@openbsd.org>2015-11-23 13:04:49 +0000
commit7da934ed9bc4de8847ea26f3862c5ce87ec5df99 (patch)
tree115137f6d6f736a0742d52ac293971b08dc99fc4 /usr.sbin/vmd/loadfile_elf.c
parentUpdate less(1) and lesskey(1) manuals for LESSCHARSET removal (diff)
downloadwireguard-openbsd-7da934ed9bc4de8847ea26f3862c5ce87ec5df99.tar.xz
wireguard-openbsd-7da934ed9bc4de8847ea26f3862c5ce87ec5df99.zip
Add support for logging to stderr or syslog, and to run vmd in
foreground with -d. OK mlarkin@ jung@
Diffstat (limited to 'usr.sbin/vmd/loadfile_elf.c')
-rw-r--r--usr.sbin/vmd/loadfile_elf.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/usr.sbin/vmd/loadfile_elf.c b/usr.sbin/vmd/loadfile_elf.c
index df566c4f2db..29e88de556c 100644
--- a/usr.sbin/vmd/loadfile_elf.c
+++ b/usr.sbin/vmd/loadfile_elf.c
@@ -1,5 +1,5 @@
/* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile_elf.c,v 1.1 2015/11/22 20:20:32 mlarkin Exp $ */
+/* $OpenBSD: loadfile_elf.c,v 1.2 2015/11/23 13:04:49 reyk Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -382,8 +382,7 @@ mread(int fd, uint32_t addr, size_t sz)
ct = sz;
if (read(fd, buf, ct) != ct) {
- fprintf(stderr, "%s: error %d in mread (%s)\n\r",
- __progname, errno, strerror(errno));
+ log_warn("%s: error %d in mread", __progname, errno);
return (0);
}
rd += ct;
@@ -407,8 +406,7 @@ mread(int fd, uint32_t addr, size_t sz)
ct = PAGE_SIZE;
if (read(fd, buf, ct) != ct) {
- fprintf(stderr, "%s: error %d in mread (%s)\n\r",
- __progname, errno, strerror(errno));
+ log_warn("%s: error %d in mread", __progname, errno);
return (0);
}
rd += ct;
@@ -534,8 +532,7 @@ mbzero(uint32_t addr, int sz)
static void
mbcopy(char *src, char *dst, int sz)
{
- fprintf(stderr, "warning: bcopy during ELF kernel load not "
- "supported\n\r");
+ log_warnx("warning: bcopy during ELF kernel load not supported");
}
/*