On Tue, Oct 10, 2017 at 03:46:57PM -0700, Carlos Cardenas wrote:
> The VMD parent process didn't handle the case of a VM exiting
> with a non 0 return properly (i.e. EIO).
>
> diff --git usr.sbin/vmd/vmd.c usr.sbin/vmd/vmd.c
> index f1abc54d9a3..dcff6de0c0e 100644
> --- usr.sbin/vmd/vmd.c
> +++ usr.sbin/vmd/vmd.c
> @@ -394,11 +394,14 @@ vmd_dispatch_vmm(int fd, struct privsep_proc *p, struct
> imsg *imsg)
> case IMSG_VMDOP_TERMINATE_VM_EVENT:
> IMSG_SIZE_CHECK(imsg, &vmr);
> memcpy(&vmr, imsg->data, sizeof(vmr));
> - log_debug("%s: handling TERMINATE_EVENT for vm id %d",
> - __func__, vmr.vmr_id);
> - if ((vm = vm_getbyvmid(vmr.vmr_id)) == NULL)
> + log_debug("%s: handling TERMINATE_EVENT for vm id %d ret %d",
> + __func__, vmr.vmr_id, vmr.vmr_result);
> + if ((vm = vm_getbyvmid(vmr.vmr_id)) == NULL) {
> + log_debug("%s: vm %d is no longer available",
> + __func__, vmr.vmr_id);
> break;
> - if (vmr.vmr_result == 0) {
> + }
> + if (vmr.vmr_result != EAGAIN) {
> if (vm->vm_from_config) {
> log_debug("%s: about to stop vm id %d",
> __func__, vm->vm_vmid);
> @@ -408,7 +411,7 @@ vmd_dispatch_vmm(int fd, struct privsep_proc *p, struct
> imsg *imsg)
> __func__, vm->vm_vmid);
> vm_remove(vm);
> }
> - } else if (vmr.vmr_result == EAGAIN) {
> + } else {
> /* Stop VM instance but keep the tty open */
> log_debug("%s: about to stop vm id %d with tty open",
> __func__, vm->vm_vmid);
> --
> 2.14.2
>
It occurred to me that I may have not committed a couple of these. This one's
in. Sorry for the delay, this got buried under a pile of other email.
-ml
