summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobhe <tobhe@openbsd.org>2019-09-07 09:11:14 +0000
committertobhe <tobhe@openbsd.org>2019-09-07 09:11:14 +0000
commit083b9ea25ce6f9ed59e2895fb045aed191733d64 (patch)
treea6150430774acb1fa14886878fe1283eb4396d85
parentTweak some comments and code layout to make MTSETBSIZE and MTSETDENSITY (diff)
downloadwireguard-openbsd-083b9ea25ce6f9ed59e2895fb045aed191733d64.tar.xz
wireguard-openbsd-083b9ea25ce6f9ed59e2895fb045aed191733d64.zip
Remove unused VMD_DISK_INVALID message type and mark it obsolete.
ok mlarkin@
-rw-r--r--usr.sbin/vmctl/vmctl.c7
-rw-r--r--usr.sbin/vmd/vmd.h4
2 files changed, 3 insertions, 8 deletions
diff --git a/usr.sbin/vmctl/vmctl.c b/usr.sbin/vmctl/vmctl.c
index b5a2fc420a0..195ffc8ab47 100644
--- a/usr.sbin/vmctl/vmctl.c
+++ b/usr.sbin/vmctl/vmctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmctl.c,v 1.70 2019/08/14 07:34:49 anton Exp $ */
+/* $OpenBSD: vmctl.c,v 1.71 2019/09/07 09:11:14 tobhe Exp $ */
/*
* Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
@@ -235,11 +235,6 @@ vm_start_complete(struct imsg *imsg, int *ret, int autoconnect)
warnx("could not open disk image(s)");
*ret = ENOENT;
break;
- case VMD_DISK_INVALID:
- warnx("specified disk image(s) are "
- "not regular files");
- *ret = ENOENT;
- break;
case VMD_CDROM_MISSING:
warnx("could not find specified iso image");
*ret = ENOENT;
diff --git a/usr.sbin/vmd/vmd.h b/usr.sbin/vmd/vmd.h
index 30922d1d36e..f6368dc621d 100644
--- a/usr.sbin/vmd/vmd.h
+++ b/usr.sbin/vmd/vmd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmd.h,v 1.96 2019/08/14 07:34:49 anton Exp $ */
+/* $OpenBSD: vmd.h,v 1.97 2019/09/07 09:11:14 tobhe Exp $ */
/*
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -68,7 +68,7 @@
/* vmd -> vmctl error codes */
#define VMD_BIOS_MISSING 1001
#define VMD_DISK_MISSING 1002
-#define VMD_DISK_INVALID 1003
+ /* 1003 is obsolete VMD_DISK_INVALID */
#define VMD_VM_STOP_INVALID 1004
#define VMD_CDROM_MISSING 1005
#define VMD_CDROM_INVALID 1006