sync with OpenBSD -current
This commit is contained in:
parent
8a7e26f80e
commit
7281bb8ec6
GPG Key ID:
F42C07F07E2E35B7
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: mousecfg.c,v 1.10 2023/07/02 21:44:04 bru Exp $ */
|
||||
/* $OpenBSD: mousecfg.c,v 1.11 2024/09/25 19:56:33 bru Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2017 Ulf Brosziewski
|
||||
@ -222,8 +222,10 @@ mousecfg_put_field(int fd, struct wsmouse_parameters *field)
|
||||
|| (err = ioctl(fd, WSMOUSEIO_GETPARAMS, field)))
|
||||
return err;
|
||||
|
||||
for (i = 0; i < field->nparams; i++)
|
||||
for (i = 0; i < field->nparams; i++) {
|
||||
n = index_of(field->params[i].key);
|
||||
cfg_buffer[n].value = field->params[i].value;
|
||||
}
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: readconf.h,v 1.156 2024/03/04 02:16:11 djm Exp $ */
|
||||
/* $OpenBSD: readconf.h,v 1.157 2024/09/25 23:01:39 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
@ -19,7 +19,6 @@
|
||||
/* Data structure for representing option data. */
|
||||
|
||||
#define SSH_MAX_HOSTS_FILES 32
|
||||
#define MAX_CANON_DOMAINS 32
|
||||
#define PATH_MAX_SUN (sizeof((struct sockaddr_un *)0)->sun_path)
|
||||
|
||||
struct allowed_cname {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ssh.h,v 1.90 2020/07/14 23:57:01 djm Exp $ */
|
||||
/* $OpenBSD: ssh.h,v 1.91 2024/09/25 23:01:39 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
@ -12,9 +12,6 @@
|
||||
* called by a name other than "ssh" or "Secure Shell".
|
||||
*/
|
||||
|
||||
/* Cipher used for encrypting authentication files. */
|
||||
#define SSH_AUTHFILE_CIPHER SSH_CIPHER_3DES
|
||||
|
||||
/* Default port number. */
|
||||
#define SSH_DEFAULT_PORT 22
|
||||
|
||||
@ -36,11 +33,9 @@
|
||||
*
|
||||
* Minor protocol version. Different version indicates minor incompatibility
|
||||
* that does not prevent interoperation.
|
||||
*
|
||||
* We support only SSH2
|
||||
*/
|
||||
#define PROTOCOL_MAJOR_1 1
|
||||
#define PROTOCOL_MINOR_1 5
|
||||
|
||||
/* We support only SSH2 */
|
||||
#define PROTOCOL_MAJOR_2 2
|
||||
#define PROTOCOL_MINOR_2 0
|
||||
|
||||
@ -72,12 +67,6 @@
|
||||
*/
|
||||
#define SSH_ASKPASS_REQUIRE_ENV "SSH_ASKPASS_REQUIRE"
|
||||
|
||||
/*
|
||||
* Force host key length and server key length to differ by at least this
|
||||
* many bits. This is to make double encryption with rsaref work.
|
||||
*/
|
||||
#define SSH_KEY_BITS_RESERVED 128
|
||||
|
||||
/*
|
||||
* Length of the session key in bytes. (Specified as 256 bits in the
|
||||
* protocol.)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: config.c,v 1.75 2024/02/05 21:58:09 dv Exp $ */
|
||||
/* $OpenBSD: config.c,v 1.76 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
|
||||
@ -19,20 +19,15 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/uio.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <termios.h>
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <util.h>
|
||||
#include <errno.h>
|
||||
#include <imsg.h>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: control.c,v 1.42 2024/01/18 14:49:59 claudio Exp $ */
|
||||
/* $OpenBSD: control.c,v 1.43 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
|
||||
@ -22,14 +22,9 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#include <sys/tree.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <event.h>
|
||||
#include <fcntl.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: dhcp.c,v 1.13 2023/07/13 18:31:59 dv Exp $ */
|
||||
/* $OpenBSD: dhcp.c,v 1.14 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2017 Reyk Floeter <reyk@openbsd.org>
|
||||
@ -17,7 +17,6 @@
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <netinet/in.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: fw_cfg.c,v 1.9 2024/07/09 09:31:37 dv Exp $ */
|
||||
/* $OpenBSD: fw_cfg.c,v 1.10 2024/09/26 01:45:13 jsg Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2018 Claudio Jeker <claudio@openbsd.org>
|
||||
*
|
||||
@ -15,7 +15,6 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
#include <sys/types.h>
|
||||
#include <sys/uio.h>
|
||||
#include <machine/biosvar.h> /* bios_memmap_t */
|
||||
#include <dev/pv/virtioreg.h>
|
||||
#include <dev/vmm/vmm.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: i8253.c,v 1.41 2024/07/10 09:27:33 dv Exp $ */
|
||||
/* $OpenBSD: i8253.c,v 1.42 2024/09/26 01:45:13 jsg Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org>
|
||||
*
|
||||
@ -23,7 +23,6 @@
|
||||
|
||||
#include <event.h>
|
||||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
|
||||
/* $OpenBSD: loadfile_elf.c,v 1.49 2024/09/11 15:42:52 bluhm Exp $ */
|
||||
/* $OpenBSD: loadfile_elf.c,v 1.50 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997 The NetBSD Foundation, Inc.
|
||||
@ -82,19 +82,15 @@
|
||||
*/
|
||||
|
||||
#include <sys/param.h> /* PAGE_SIZE PAGE_MASK roundup */
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/reboot.h>
|
||||
#include <sys/exec.h>
|
||||
|
||||
#include <elf.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <err.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include <dev/vmm/vmm.h>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: parse.y,v 1.70 2024/09/11 15:42:52 bluhm Exp $ */
|
||||
/* $OpenBSD: parse.y,v 1.71 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007-2016 Reyk Floeter <reyk@openbsd.org>
|
||||
@ -26,7 +26,6 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/uio.h>
|
||||
|
||||
#include <dev/vmm/vmm.h>
|
||||
|
||||
@ -37,10 +36,8 @@
|
||||
|
||||
#include <agentx.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <limits.h>
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <ctype.h>
|
||||
#include <netdb.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: pci.c,v 1.33 2024/07/10 09:27:33 dv Exp $ */
|
||||
/* $OpenBSD: pci.c,v 1.34 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
|
||||
@ -20,7 +20,6 @@
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcidevs.h>
|
||||
#include <dev/pv/virtioreg.h>
|
||||
#include <dev/vmm/vmm.h>
|
||||
|
||||
#include <string.h>
|
||||
@ -28,7 +27,6 @@
|
||||
|
||||
#include "vmd.h"
|
||||
#include "pci.h"
|
||||
#include "i8259.h"
|
||||
#include "atomicio.h"
|
||||
|
||||
struct pci pci;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: priv.c,v 1.24 2024/01/18 14:49:59 claudio Exp $ */
|
||||
/* $OpenBSD: priv.c,v 1.25 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2016 Reyk Floeter <reyk@openbsd.org>
|
||||
@ -17,12 +17,8 @@
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/tree.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <netinet/in.h>
|
||||
@ -34,13 +30,10 @@
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <event.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "proc.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: proc.c,v 1.25 2024/04/09 15:48:01 tobhe Exp $ */
|
||||
/* $OpenBSD: proc.c,v 1.26 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
|
||||
@ -29,7 +29,6 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <paths.h>
|
||||
#include <pwd.h>
|
||||
#include <event.h>
|
||||
#include <imsg.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: proc.h,v 1.24 2024/02/20 21:40:37 dv Exp $ */
|
||||
/* $OpenBSD: proc.h,v 1.25 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
|
||||
@ -18,7 +18,6 @@
|
||||
|
||||
#include <sys/queue.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/uio.h>
|
||||
|
||||
#include <event.h>
|
||||
#include <imsg.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: psp.c,v 1.1 2024/09/11 15:42:52 bluhm Exp $ */
|
||||
/* $OpenBSD: psp.c,v 1.2 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2023, 2024 Hans-Joerg Hoexer <hshoexer@genua.de>
|
||||
@ -17,11 +17,8 @@
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/rwlock.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <dev/ic/pspvar.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: sev.c,v 1.3 2024/09/25 04:19:36 deraadt Exp $ */
|
||||
/* $OpenBSD: sev.c,v 1.4 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2023, 2024 Hans-Joerg Hoexer <hshoexer@genua.de>
|
||||
@ -18,10 +18,7 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h> /* roundup */
|
||||
#include <sys/device.h>
|
||||
#include <sys/rwlock.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <crypto/xform.h>
|
||||
#include <dev/ic/pspvar.h>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: vioblk.c,v 1.14 2024/07/10 09:27:33 dv Exp $ */
|
||||
/* $OpenBSD: vioblk.c,v 1.15 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2023 Dave Voutila <dv@openbsd.org>
|
||||
@ -16,8 +16,7 @@
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
#include <sys/mman.h>
|
||||
#include <sys/param.h> /* PAGE_SIZE */
|
||||
#include <stdint.h>
|
||||
|
||||
#include <dev/pci/virtio_pcireg.h>
|
||||
#include <dev/pv/vioblkreg.h>
|
||||
@ -25,7 +24,6 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <event.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: vionet.c,v 1.16 2024/07/12 14:34:08 jan Exp $ */
|
||||
/* $OpenBSD: vionet.c,v 1.17 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2023 Dave Voutila <dv@openbsd.org>
|
||||
@ -16,7 +16,6 @@
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
#include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <dev/pci/virtio_pcireg.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: vioqcow2.c,v 1.24 2023/09/14 15:25:43 dv Exp $ */
|
||||
/* $OpenBSD: vioqcow2.c,v 1.25 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2018 Ori Bernstein <ori@eigenstate.org>
|
||||
@ -19,9 +19,6 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: vioscsi.c,v 1.24 2023/09/06 19:26:39 dv Exp $ */
|
||||
/* $OpenBSD: vioscsi.c,v 1.25 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2017 Carlos Cardenas <ccardenas@openbsd.org>
|
||||
@ -25,10 +25,8 @@
|
||||
#include <scsi/scsiconf.h>
|
||||
#include <scsi/cd.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "vmd.h"
|
||||
#include "vioscsi.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: virtio.c,v 1.115 2024/07/10 09:27:33 dv Exp $ */
|
||||
/* $OpenBSD: virtio.c,v 1.116 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
|
||||
@ -25,19 +25,14 @@
|
||||
#include <dev/pv/virtioreg.h>
|
||||
#include <dev/pci/virtio_pcireg.h>
|
||||
#include <dev/pv/vioblkreg.h>
|
||||
#include <dev/pv/vioscsireg.h>
|
||||
#include <dev/vmm/vmm.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/if_ether.h>
|
||||
#include <netinet/ip.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <event.h>
|
||||
#include <fcntl.h>
|
||||
#include <poll.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: vm.c,v 1.105 2024/09/11 15:42:52 bluhm Exp $ */
|
||||
/* $OpenBSD: vm.c,v 1.106 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
|
||||
@ -19,28 +19,18 @@
|
||||
#include <sys/param.h> /* PAGE_SIZE, MAXCOMLEN */
|
||||
#include <sys/types.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/uio.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/resource.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/vmm/vmm.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <event.h>
|
||||
#include <fcntl.h>
|
||||
#include <imsg.h>
|
||||
#include <limits.h>
|
||||
#include <poll.h>
|
||||
#include <pthread.h>
|
||||
#include <pthread_np.h>
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@ -48,8 +38,6 @@
|
||||
#include <util.h>
|
||||
|
||||
#include "atomicio.h"
|
||||
#include "loadfile.h"
|
||||
#include "mmio.h"
|
||||
#include "pci.h"
|
||||
#include "virtio.h"
|
||||
#include "vmd.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: vm_agentx.c,v 1.2 2024/02/02 14:58:02 dv Exp $ */
|
||||
/* $OpenBSD: vm_agentx.c,v 1.3 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2022 Martijn van Duren <martijn@openbsd.org>
|
||||
@ -21,11 +21,9 @@
|
||||
#include <sys/un.h>
|
||||
|
||||
#include <agentx.h>
|
||||
#include <errno.h>
|
||||
#include <grp.h>
|
||||
#include <pwd.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: vmd.c,v 1.160 2024/09/11 15:42:52 bluhm Exp $ */
|
||||
/* $OpenBSD: vmd.c,v 1.161 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
|
||||
@ -18,7 +18,6 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/tty.h>
|
||||
@ -28,7 +27,6 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <termios.h>
|
||||
#include <errno.h>
|
||||
#include <event.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: vmm.c,v 1.122 2024/09/11 15:42:52 bluhm Exp $ */
|
||||
/* $OpenBSD: vmm.c,v 1.123 2024/09/26 01:45:13 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
|
||||
@ -20,14 +20,8 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/uio.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include <dev/ic/i8253reg.h>
|
||||
#include <dev/isa/isareg.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/vmm/vmm.h>
|
||||
|
||||
#include <net/if.h>
|
||||
@ -37,14 +31,10 @@
|
||||
#include <fcntl.h>
|
||||
#include <imsg.h>
|
||||
#include <limits.h>
|
||||
#include <poll.h>
|
||||
#include <pthread.h>
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <util.h>
|
||||
|
||||
#include "vmd.h"
|
||||
#include "atomicio.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: x86_vm.c,v 1.3 2024/09/11 15:42:52 bluhm Exp $ */
|
||||
/* $OpenBSD: x86_vm.c,v 1.4 2024/09/26 01:45:13 jsg Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
|
||||
*
|
||||
@ -21,7 +21,6 @@
|
||||
#include <dev/ic/i8253reg.h>
|
||||
#include <dev/isa/isareg.h>
|
||||
|
||||
#include <machine/psl.h>
|
||||
#include <machine/pte.h>
|
||||
#include <machine/specialreg.h>
|
||||
#include <machine/vmmvar.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user