summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/vmd/config.c45
-rw-r--r--usr.sbin/vmd/vmd.c38
2 files changed, 31 insertions, 52 deletions
diff --git a/usr.sbin/vmd/config.c b/usr.sbin/vmd/config.c
index 8c1b5cb3d0b..76f2c8851b7 100644
--- a/usr.sbin/vmd/config.c
+++ b/usr.sbin/vmd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.19 2016/11/04 15:16:44 reyk Exp $ */
+/* $OpenBSD: config.c,v 1.20 2016/11/22 21:55:54 reyk Exp $ */
/*
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -136,13 +136,15 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid)
errno = 0;
- if (vm->vm_running)
+ if (vm->vm_running) {
+ log_warnx("%s: vm is already running", __func__);
+ errno = EALREADY;
goto fail;
+ }
diskfds = reallocarray(NULL, vcp->vcp_ndisks, sizeof(*diskfds));
if (diskfds == NULL) {
- saved_errno = errno;
- log_warn("%s: cannot allocate disk fds", __func__);
+ log_warn("%s: can't allocate disk fds", __func__);
goto fail;
}
for (i = 0; i < vcp->vcp_ndisks; i++)
@@ -150,8 +152,7 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid)
tapfds = reallocarray(NULL, vcp->vcp_nnics, sizeof(*tapfds));
if (tapfds == NULL) {
- saved_errno = errno;
- log_warn("%s: cannot allocate tap fds", __func__);
+ log_warn("%s: can't allocate tap fds", __func__);
goto fail;
}
for (i = 0; i < vcp->vcp_nnics; i++)
@@ -161,7 +162,6 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid)
/* Open kernel for child */
if ((kernfd = open(vcp->vcp_kernel, O_RDONLY)) == -1) {
- saved_errno = errno;
log_warn("%s: can't open kernel %s", __func__,
vcp->vcp_kernel);
goto fail;
@@ -171,8 +171,7 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid)
for (i = 0 ; i < vcp->vcp_ndisks; i++) {
if ((diskfds[i] =
open(vcp->vcp_disks[i], O_RDWR)) == -1) {
- saved_errno = errno;
- log_warn("%s: can't open %s", __func__,
+ log_warn("%s: can't open disk %s", __func__,
vcp->vcp_disks[i]);
goto fail;
}
@@ -187,9 +186,9 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid)
if (*s != '\0' && strcmp("tap", s) != 0) {
if (priv_getiftype(s, ifname, &unit) == -1 ||
strcmp(ifname, "tap") != 0) {
- saved_errno = errno;
- log_warn("%s: invalid tap name",
- __func__);
+ log_warnx("%s: invalid tap name %s",
+ __func__, s);
+ errno = EINVAL;
goto fail;
}
} else
@@ -207,13 +206,11 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid)
s = ifname;
}
if (tapfds[i] == -1) {
- saved_errno = errno;
- log_warn("%s: can't open %s", __func__, s);
+ log_warn("%s: can't open tap %s", __func__, s);
goto fail;
}
if ((vif->vif_name = strdup(s)) == NULL) {
- saved_errno = errno;
- log_warn("%s: can't save ifname", __func__);
+ log_warn("%s: can't save tap %s", __func__, s);
goto fail;
}
@@ -221,9 +218,8 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid)
s = vmc->vmc_ifswitch[i];
if (*s != '\0') {
if ((vif->vif_switch = strdup(s)) == NULL) {
- saved_errno = errno;
- log_warn("%s: can't save switch",
- __func__);
+ log_warn("%s: can't save switch %s",
+ __func__, s);
goto fail;
}
}
@@ -232,9 +228,8 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid)
s = vmc->vmc_ifgroup[i];
if (*s != '\0') {
if ((vif->vif_group = strdup(s)) == NULL) {
- saved_errno = errno;
- log_warn("%s: can't save group",
- __func__);
+ log_warn("%s: can't save group %s",
+ __func__, s);
goto fail;
}
}
@@ -246,8 +241,7 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid)
/* Open TTY */
if (openpty(&fd, &ttys_fd, ptyname, NULL, NULL) == -1 ||
(vm->vm_ttyname = strdup(ptyname)) == NULL) {
- saved_errno = errno;
- log_warn("%s: can't open tty", __func__);
+ log_warn("%s: can't open tty %s", __func__, ptyname);
goto fail;
}
close(ttys_fd);
@@ -277,6 +271,9 @@ config_setvm(struct privsep *ps, struct vmd_vm *vm, uint32_t peerid)
return (0);
fail:
+ saved_errno = errno;
+ log_warnx("%s: failed to start vm %s", __func__, vcp->vcp_name);
+
if (kernfd != -1)
close(kernfd);
if (diskfds != NULL) {
diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c
index 228882e6406..c29d4aac3ae 100644
--- a/usr.sbin/vmd/vmd.c
+++ b/usr.sbin/vmd/vmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmd.c,v 1.41 2016/11/22 12:55:33 reyk Exp $ */
+/* $OpenBSD: vmd.c,v 1.42 2016/11/22 21:55:54 reyk Exp $ */
/*
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -79,17 +79,10 @@ vmd_dispatch_control(int fd, struct privsep_proc *p, struct imsg *imsg)
case IMSG_VMDOP_START_VM_REQUEST:
IMSG_SIZE_CHECK(imsg, &vmc);
memcpy(&vmc, imsg->data, sizeof(vmc));
- res = vm_register(ps, &vmc, &vm, 0);
- if (res == -1) {
+ if (vm_register(ps, &vmc, &vm, 0) == -1 ||
+ config_setvm(ps, vm, imsg->hdr.peerid) == -1) {
res = errno;
cmd = IMSG_VMDOP_START_VM_RESPONSE;
- } else {
- res = config_setvm(ps, vm, imsg->hdr.peerid);
- if (res == -1) {
- res = errno;
- cmd = IMSG_VMDOP_START_VM_RESPONSE;
- vm_remove(vm);
- }
}
break;
case IMSG_VMDOP_TERMINATE_VM_REQUEST:
@@ -455,7 +448,6 @@ vmd_configure(void)
{
struct vmd_vm *vm;
struct vmd_switch *vsw;
- int ret = 0;
/*
* pledge in the parent process:
@@ -487,6 +479,7 @@ vmd_configure(void)
log_warn("%s: failed to create switch %s",
__func__, vsw->sw_name);
switch_remove(vsw);
+ return (-1);
}
}
@@ -497,17 +490,11 @@ vmd_configure(void)
vm->vm_params.vmc_params.vcp_name);
continue;
}
- if ((ret = config_setvm(&env->vmd_ps, vm, -1)) == -1) {
- log_warn("%s: failed to create vm %s",
- __func__,
- vm->vm_params.vmc_params.vcp_name);
- vm_remove(vm);
- goto fail;
- }
+ if (config_setvm(&env->vmd_ps, vm, -1) == -1)
+ return (-1);
}
- fail:
- return (ret);
+ return (0);
}
void
@@ -515,7 +502,6 @@ vmd_reload(unsigned int reset, const char *filename)
{
struct vmd_vm *vm;
struct vmd_switch *vsw;
- int res;
/* Switch back to the default config file */
if (filename == NULL || *filename == '\0')
@@ -541,6 +527,7 @@ vmd_reload(unsigned int reset, const char *filename)
log_warn("%s: failed to create switch %s",
__func__, vsw->sw_name);
switch_remove(vsw);
+ return;
}
}
@@ -552,13 +539,8 @@ vmd_reload(unsigned int reset, const char *filename)
vm->vm_params.vmc_params.vcp_name);
continue;
}
- res = config_setvm(&env->vmd_ps, vm, -1);
- if (res == -1) {
- log_warn("%s: failed to create vm %s",
- __func__,
- vm->vm_params.vmc_params.vcp_name);
- vm_remove(vm);
- }
+ if (config_setvm(&env->vmd_ps, vm, -1) == -1)
+ return;
} else {
log_debug("%s: not creating vm \"%s\": "
"(running)", __func__,
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 22:31:46 +0000