diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2015-12-02 09:39:42 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2015-12-02 09:39:42 +0000 |
| commit | c09e53aa358d111e83f83163e97cc6e772f552c1 (patch) | |
| tree | cd79c1271008bba543cfbbc43ab98da8cbcbddd1 /usr.sbin/vmd/vmm.c | |
| parent | c733ff88cfce3223384aaeab606325623cf80c21 (diff) | |
Add back the "peerid" to the proc_compose*() functions: in relayd, I
initially left it out because I didn't have a need for it. But it is
actually quite useful to carry a reference to the imsg data context
across processes.
Diffstat (limited to 'usr.sbin/vmd/vmm.c')
| -rw-r--r-- | usr.sbin/vmd/vmm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/vmd/vmm.c b/usr.sbin/vmd/vmm.c index 32c10397e86..e8d0e648428 100644 --- a/usr.sbin/vmd/vmm.c +++ b/usr.sbin/vmd/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.1 2015/12/02 09:14:25 reyk Exp $ */ +/* $OpenBSD: vmm.c,v 1.2 2015/12/02 09:39:41 reyk Exp $ */ /* * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org> @@ -159,8 +159,8 @@ vmm_dispatch_control(int fd, struct privsep_proc *p, struct imsg *imsg) } if (cmd && - imsg_compose_event(&ps->ps_ievs[PROC_CONTROL][0], - cmd, imsg->hdr.peerid, 0, -1, &res, sizeof(res)) == -1) + proc_compose_imsg(ps, PROC_CONTROL, cmd, imsg->hdr.peerid, + 0, -1, &res, sizeof(res)) == -1) return (-1); return (0); @@ -455,7 +455,7 @@ get_info_vm(struct privsep *ps, struct imsg *imsg) /* Return info to vmmctl(4) */ ct = vip.vip_size / sizeof(struct vm_info_result); for (i = 0; i < ct; i++) { - if (imsg_compose_event(&ps->ps_ievs[PROC_CONTROL][0], + if (proc_compose_imsg(ps, PROC_CONTROL, IMSG_VMDOP_GET_INFO_VM_DATA, imsg->hdr.peerid, 0, -1, &info[i], sizeof(struct vm_info_result)) == -1) return (EIO); |