diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2017-03-01 21:15:27 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2017-03-01 21:15:27 +0000 |
| commit | 2521ff5046d527bc6f70476f8aea969de781cc29 (patch) | |
| tree | 74e7fecbcb67bf329c230c8b83a7e2baf7493e17 /usr.sbin/vmctl | |
| parent | c29833689cb5eaf17fcc28d22e62798dfbc5da61 (diff) | |
unbreak vmctl build by renaming a function that now conflicts with
something from vmd.h . Temporary fix until the original committer can
fix it the way he desires.
Diffstat (limited to 'usr.sbin/vmctl')
| -rw-r--r-- | usr.sbin/vmctl/main.c | 4 | ||||
| -rw-r--r-- | usr.sbin/vmctl/vmctl.c | 6 | ||||
| -rw-r--r-- | usr.sbin/vmctl/vmctl.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/vmctl/main.c b/usr.sbin/vmctl/main.c index 527a89fc3a5..c58abcc3006 100644 --- a/usr.sbin/vmctl/main.c +++ b/usr.sbin/vmctl/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.21 2017/03/01 07:43:33 reyk Exp $ */ +/* $OpenBSD: main.c,v 1.22 2017/03/01 21:15:26 mlarkin Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -194,7 +194,7 @@ vmmaction(struct parse_result *res) switch (res->action) { case CMD_START: - ret = start_vm(res->name, res->size, res->nifs, res->nets, + ret = vm_start(res->name, res->size, res->nifs, res->nets, res->ndisks, res->disks, res->path); if (ret) { errno = ret; diff --git a/usr.sbin/vmctl/vmctl.c b/usr.sbin/vmctl/vmctl.c index edd89418aeb..51564b91222 100644 --- a/usr.sbin/vmctl/vmctl.c +++ b/usr.sbin/vmctl/vmctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmctl.c,v 1.23 2017/03/01 07:43:33 reyk Exp $ */ +/* $OpenBSD: vmctl.c,v 1.24 2017/03/01 21:15:26 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> @@ -47,7 +47,7 @@ char info_name[VMM_MAX_NAME_LEN]; int info_console; /* - * start_vm + * vm_start * * Request vmd to start the VM defined by the supplied parameters * @@ -65,7 +65,7 @@ int info_console; * ENOMEM if a memory allocation failure occurred. */ int -start_vm(const char *name, int memsize, int nnics, char **nics, +vm_start(const char *name, int memsize, int nnics, char **nics, int ndisks, char **disks, char *kernel) { struct vmop_create_params *vmc; diff --git a/usr.sbin/vmctl/vmctl.h b/usr.sbin/vmctl/vmctl.h index bd18698d3fd..766d773f975 100644 --- a/usr.sbin/vmctl/vmctl.h +++ b/usr.sbin/vmctl/vmctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmctl.h,v 1.11 2017/01/11 22:38:10 reyk Exp $ */ +/* $OpenBSD: vmctl.h,v 1.12 2017/03/01 21:15:26 mlarkin Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -77,7 +77,7 @@ __dead void /* vmctl.c */ int create_imagefile(const char *, long); -int start_vm(const char *, int, int, char **, int, char **, char *); +int vm_start(const char *, int, int, char **, int, char **, char *); int start_vm_complete(struct imsg *, int *, int); void terminate_vm(uint32_t, const char *); int terminate_vm_complete(struct imsg *, int *); |