summaryrefslogtreecommitdiffstats
path: root/usr.sbin/vmd/control.c
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2018-07-11 13:19:47 +0000
committerreyk <reyk@openbsd.org>2018-07-11 13:19:47 +0000
commit3be9785fb227628e9ede51b2e9992f45a813702e (patch)
treea2841b850fc865b1ab1aeabb8f68caa33de9457b /usr.sbin/vmd/control.c
parentvmm(4): return proper cache topology for cpuid(0x4) (diff)
downloadwireguard-openbsd-3be9785fb227628e9ede51b2e9992f45a813702e.tar.xz
wireguard-openbsd-3be9785fb227628e9ede51b2e9992f45a813702e.zip
Add -w option to vmctl stop to wait for completion of VM termination.
Use it in /etc/rc.d/vmd accordingly. OK sthen@
Diffstat (limited to 'usr.sbin/vmd/control.c')
-rw-r--r--usr.sbin/vmd/control.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.sbin/vmd/control.c b/usr.sbin/vmd/control.c
index 37cc538ccb3..1162c0c207d 100644
--- a/usr.sbin/vmd/control.c
+++ b/usr.sbin/vmd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.26 2018/07/11 09:35:44 reyk Exp $ */
+/* $OpenBSD: control.c,v 1.27 2018/07/11 13:19:47 reyk Exp $ */
/*
* Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
@@ -352,7 +352,6 @@ control_dispatch_imsg(int fd, short event, void *arg)
switch (imsg.hdr.type) {
case IMSG_VMDOP_GET_INFO_VM_REQUEST:
case IMSG_VMDOP_TERMINATE_VM_REQUEST:
- case IMSG_VMDOP_KILL_VM_REQUEST:
case IMSG_VMDOP_START_VM_REQUEST:
case IMSG_VMDOP_PAUSE_VM:
case IMSG_VMDOP_UNPAUSE_VM:
@@ -411,7 +410,6 @@ control_dispatch_imsg(int fd, short event, void *arg)
}
break;
case IMSG_VMDOP_TERMINATE_VM_REQUEST:
- case IMSG_VMDOP_KILL_VM_REQUEST:
if (IMSG_DATA_SIZE(&imsg) < sizeof(vid))
goto fail;
memcpy(&vid, imsg.data, sizeof(vid));