diff options
| -rw-r--r-- | usr.sbin/vmd/control.c | 4 | ||||
| -rw-r--r-- | usr.sbin/vmd/loadfile_elf.c | 14 | ||||
| -rw-r--r-- | usr.sbin/vmd/pci.c | 6 | ||||
| -rw-r--r-- | usr.sbin/vmd/virtio.c | 18 | ||||
| -rw-r--r-- | usr.sbin/vmd/vmd.c | 4 | ||||
| -rw-r--r-- | usr.sbin/vmd/vmm.c | 5 |
6 files changed, 27 insertions, 24 deletions
diff --git a/usr.sbin/vmd/control.c b/usr.sbin/vmd/control.c index 75460437852..f3688063385 100644 --- a/usr.sbin/vmd/control.c +++ b/usr.sbin/vmd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.6 2016/01/10 10:01:07 jsg Exp $ */ +/* $OpenBSD: control.c,v 1.7 2016/08/17 05:07:13 deraadt Exp $ */ /* * Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org> @@ -17,7 +17,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> +#include <sys/param.h> /* nitems */ #include <sys/queue.h> #include <sys/stat.h> #include <sys/socket.h> diff --git a/usr.sbin/vmd/loadfile_elf.c b/usr.sbin/vmd/loadfile_elf.c index bcf2321b945..a95a0bdb03d 100644 --- a/usr.sbin/vmd/loadfile_elf.c +++ b/usr.sbin/vmd/loadfile_elf.c @@ -1,5 +1,5 @@ /* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */ -/* $OpenBSD: loadfile_elf.c,v 1.15 2016/05/26 17:10:15 stefan Exp $ */ +/* $OpenBSD: loadfile_elf.c,v 1.16 2016/08/17 05:07:13 deraadt Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -81,6 +81,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/param.h> /* PAGE_SIZE PAGE_MASK roundup */ +#include <sys/ioctl.h> +#include <sys/reboot.h> +#include <sys/exec.h> +#include <sys/exec_elf.h> + #include <stdio.h> #include <string.h> #include <errno.h> @@ -89,14 +95,8 @@ #include <fcntl.h> #include <err.h> #include <errno.h> -#include <sys/ioctl.h> #include <stddef.h> -#include <sys/param.h> -#include <sys/reboot.h> -#include <sys/exec.h> - -#include <sys/exec_elf.h> #include <machine/vmmvar.h> #include <machine/biosvar.h> #include <machine/segments.h> diff --git a/usr.sbin/vmd/pci.c b/usr.sbin/vmd/pci.c index 754ddb078e4..d935cc88583 100644 --- a/usr.sbin/vmd/pci.c +++ b/usr.sbin/vmd/pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci.c,v 1.6 2016/01/14 02:46:40 mlarkin Exp $ */ +/* $OpenBSD: pci.c,v 1.7 2016/08/17 05:07:13 deraadt Exp $ */ /* * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org> @@ -16,12 +16,14 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <string.h> #include <sys/types.h> + #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> #include <dev/pci/virtioreg.h> #include <machine/vmmvar.h> + +#include <string.h> #include "vmd.h" #include "pci.h" diff --git a/usr.sbin/vmd/virtio.c b/usr.sbin/vmd/virtio.c index 02eb053362a..0610226d17b 100644 --- a/usr.sbin/vmd/virtio.c +++ b/usr.sbin/vmd/virtio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: virtio.c,v 1.16 2016/07/19 09:52:34 natano Exp $ */ +/* $OpenBSD: virtio.c,v 1.17 2016/08/17 05:07:13 deraadt Exp $ */ /* * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org> @@ -16,19 +16,21 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/param.h> /* PAGE_SIZE */ + +#include <machine/vmmvar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcidevs.h> +#include <dev/pci/virtioreg.h> +#include <dev/pci/vioblkreg.h> + #include <errno.h> #include <poll.h> #include <stddef.h> #include <stdlib.h> #include <string.h> -#include <sys/types.h> #include <unistd.h> -#include <dev/pci/pcireg.h> -#include <dev/pci/pcidevs.h> -#include <dev/pci/virtioreg.h> -#include <dev/pci/vioblkreg.h> -#include <machine/vmmvar.h> -#include <machine/param.h> + #include "pci.h" #include "vmd.h" #include "virtio.h" diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c index 06e30965db3..b2985cc67d7 100644 --- a/usr.sbin/vmd/vmd.c +++ b/usr.sbin/vmd/vmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmd.c,v 1.28 2016/07/29 16:36:51 stefan Exp $ */ +/* $OpenBSD: vmd.c,v 1.29 2016/08/17 05:07:13 deraadt Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> +#include <sys/param.h> /* nitems */ #include <sys/queue.h> #include <sys/wait.h> #include <sys/cdefs.h> diff --git a/usr.sbin/vmd/vmm.c b/usr.sbin/vmd/vmm.c index cb0af49f975..ad5ab412317 100644 --- a/usr.sbin/vmd/vmm.c +++ b/usr.sbin/vmd/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.35 2016/08/01 16:32:10 stefan Exp $ */ +/* $OpenBSD: vmm.c,v 1.36 2016/08/17 05:07:13 deraadt Exp $ */ /* * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org> @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> +#include <sys/param.h> /* nitems */ #include <sys/ioctl.h> #include <sys/queue.h> #include <sys/wait.h> @@ -30,7 +30,6 @@ #include <dev/isa/isareg.h> #include <dev/pci/pcireg.h> -#include <machine/param.h> #include <machine/specialreg.h> #include <machine/vmmvar.h> |