diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2024-11-06 14:26:21 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2024-11-06 14:26:21 +0000 |
| commit | 98e8bc8aba248755245c6d81042ae5eeec1f45b9 (patch) | |
| tree | 6cca3e41623109073c1e2abbeca9e80722d737bf /usr.sbin | |
| parent | eb81b9793c0d2f378b988b2aa7e1f439234efb62 (diff) | |
Fix broken vmd(8) build on arm64 due to missing psp_setup().
The psp.c source is restricted in makefile with .if ${MACHINE} ==
"amd64" so use #ifdef __amd64__ around the call to psp_setup(). On
arm64 set vmd_psp_fd to an invalid value.
OK hshoexer@ mlarkin@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/vmd/vmd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c index 5ea0ad48dc1..43c367a4245 100644 --- a/usr.sbin/vmd/vmd.c +++ b/usr.sbin/vmd/vmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmd.c,v 1.162 2024/11/05 23:16:46 bluhm Exp $ */ +/* $OpenBSD: vmd.c,v 1.163 2024/11/06 14:26:20 bluhm Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -842,8 +842,11 @@ main(int argc, char **argv) if (!env->vmd_noaction) proc_connect(ps); + env->vmd_psp_fd = -1; +#ifdef __amd64__ if (env->vmd_noaction == 0 && proc_id == PROC_PARENT) psp_setup(); +#endif if (vmd_configure() == -1) fatalx("configuration failed"); |