diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2017-03-01 21:22:58 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2017-03-01 21:22:58 +0000 |
| commit | ddeebf30fa7a101571a66271801cd6a78a5cf259 (patch) | |
| tree | 81f637314fb9e73097c52c897f9e29df79c91134 /usr.sbin | |
| parent | 2521ff5046d527bc6f70476f8aea969de781cc29 (diff) | |
Rename start_vm_complete to vm_start_complete for consistency.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/vmctl/main.c | 4 | ||||
| -rw-r--r-- | usr.sbin/vmctl/vmctl.c | 8 | ||||
| -rw-r--r-- | usr.sbin/vmctl/vmctl.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/vmctl/main.c b/usr.sbin/vmctl/main.c index c58abcc3006..bf611d6c9c5 100644 --- a/usr.sbin/vmctl/main.c +++ b/usr.sbin/vmctl/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.22 2017/03/01 21:15:26 mlarkin Exp $ */ +/* $OpenBSD: main.c,v 1.23 2017/03/01 21:22:57 reyk Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -268,7 +268,7 @@ vmmaction(struct parse_result *res) ret = 0; switch (action) { case CMD_START: - done = start_vm_complete(&imsg, &ret, + done = vm_start_complete(&imsg, &ret, tty_autoconnect); break; case CMD_STOP: diff --git a/usr.sbin/vmctl/vmctl.c b/usr.sbin/vmctl/vmctl.c index 51564b91222..f14ddff9f13 100644 --- a/usr.sbin/vmctl/vmctl.c +++ b/usr.sbin/vmctl/vmctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmctl.c,v 1.24 2017/03/01 21:15:26 mlarkin Exp $ */ +/* $OpenBSD: vmctl.c,v 1.25 2017/03/01 21:22:57 reyk Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> @@ -135,7 +135,7 @@ vm_start(const char *name, int memsize, int nnics, char **nics, } /* - * start_vm_complete + * vm_start_complete * * Callback function invoked when we are expecting an * IMSG_VMDOP_START_VMM_RESPONSE message indicating the completion of @@ -153,10 +153,10 @@ vm_start(const char *name, int memsize, int nnics, char **nics, * The function also sets 'ret' to the error code as follows: * 0 : Message successfully processed * EINVAL: Invalid or unexpected response from vmd - * EIO : start_vm command failed + * EIO : vm_start command failed */ int -start_vm_complete(struct imsg *imsg, int *ret, int autoconnect) +vm_start_complete(struct imsg *imsg, int *ret, int autoconnect) { struct vmop_result *vmr; int res; diff --git a/usr.sbin/vmctl/vmctl.h b/usr.sbin/vmctl/vmctl.h index 766d773f975..e47944f3b12 100644 --- a/usr.sbin/vmctl/vmctl.h +++ b/usr.sbin/vmctl/vmctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmctl.h,v 1.12 2017/03/01 21:15:26 mlarkin Exp $ */ +/* $OpenBSD: vmctl.h,v 1.13 2017/03/01 21:22:57 reyk Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -78,7 +78,7 @@ __dead void /* vmctl.c */ int create_imagefile(const char *, long); int vm_start(const char *, int, int, char **, int, char **, char *); -int start_vm_complete(struct imsg *, int *, int); +int vm_start_complete(struct imsg *, int *, int); void terminate_vm(uint32_t, const char *); int terminate_vm_complete(struct imsg *, int *); int check_info_id(const char *, uint32_t); |