diff options
| -rw-r--r-- | usr.sbin/vmctl/vmctl.c | 10 | ||||
| -rw-r--r-- | usr.sbin/vmd/i8253.c | 4 | ||||
| -rw-r--r-- | usr.sbin/vmd/ns8250.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/vmctl/vmctl.c b/usr.sbin/vmctl/vmctl.c index 466e456ed76..c1a19ba75b1 100644 --- a/usr.sbin/vmctl/vmctl.c +++ b/usr.sbin/vmctl/vmctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmctl.c,v 1.35 2017/08/14 19:38:04 jasper Exp $ */ +/* $OpenBSD: vmctl.c,v 1.36 2017/08/14 19:46:44 jasper Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> @@ -133,7 +133,7 @@ vm_start(uint32_t start_id, const char *name, int memsize, int nnics, strlcpy(vmc->vmc_ifswitch[i], "", IF_NAMESIZE); vmc->vmc_ifflags[i] |= VMIFF_LOCAL; } else { - /* Add a interface to a switch */ + /* Add an interface to a switch */ strlcpy(vmc->vmc_ifswitch[i], nics[i], IF_NAMESIZE); } } @@ -177,7 +177,7 @@ vm_start(uint32_t start_id, const char *name, int memsize, int nnics, * * Return: * Always 1 to indicate we have processed the return message (even if it - * was an incorrect/failure message) + * was an incorrect/failure message) * * The function also sets 'ret' to the error code as follows: * 0 : Message successfully processed @@ -394,7 +394,7 @@ terminate_vm(uint32_t terminate_id, const char *name) * * Return: * Always 1 to indicate we have processed the return message (even if it - * was an incorrect/failure message) + * was an incorrect/failure message) * * The function also sets 'ret' to the error code as follows: * 0 : Message successfully processed @@ -433,7 +433,7 @@ terminate_vm_complete(struct imsg *imsg, int *ret) * * Parameters: * id: optional ID of a VM to list - * name: optional name of a VM to list + * name: optional name of a VM to list * console: if true, open the console of the selected VM (by name or ID) * * Request a list of running VMs from vmd diff --git a/usr.sbin/vmd/i8253.c b/usr.sbin/vmd/i8253.c index ff33c0ecae2..8105b547b16 100644 --- a/usr.sbin/vmd/i8253.c +++ b/usr.sbin/vmd/i8253.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i8253.c,v 1.16 2017/07/09 00:51:40 pd Exp $ */ +/* $OpenBSD: i8253.c,v 1.17 2017/08/14 19:46:44 jasper Exp $ */ /* * Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org> * @@ -267,7 +267,7 @@ vcpu_exit_i8253(struct vm_run_params *vrp) if (i8253_channel[sel].start == 0) i8253_channel[sel].start = 0xffff; - + log_debug("%s: channel %d reset, mode=%d, start=%d", __func__, sel, mode, i8253_channel[sel].start); i8253_channel[sel].mode = mode; diff --git a/usr.sbin/vmd/ns8250.c b/usr.sbin/vmd/ns8250.c index d9f9274de65..a170c384f79 100644 --- a/usr.sbin/vmd/ns8250.c +++ b/usr.sbin/vmd/ns8250.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ns8250.c,v 1.10 2017/07/15 05:05:36 pd Exp $ */ +/* $OpenBSD: ns8250.c,v 1.11 2017/08/14 19:46:44 jasper Exp $ */ /* * Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org> * @@ -86,7 +86,7 @@ ns8250_init(int fd, uint32_t vmid) * group of characters have been transmitted. Since it takes nearly * zero time to send the actual characters, the total amount of time * spent is roughly equal to what it would be on real hardware. - * + * * To make things simple, we don't adjust for different sized bytes * (and parity, stop bits, etc) and simply assume each character * output is 8 bits. |