die whitespace die die die

8 files changed, 21 insertions, 23 deletions

diff --git a/usr.sbin/vmd/i8253.c b/usr.sbin/vmd/i8253.c
index 46533b18498..de4045ec41e 100644
--- a/usr.sbin/vmd/i8253.c
+++ b/usr.sbin/vmd/i8253.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i8253.c,v 1.11 2017/03/25 22:36:53 mlarkin Exp $ */
+/* $OpenBSD: i8253.c,v 1.12 2017/03/27 00:28:04 deraadt Exp $ */
 /*
  * Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org>
  *
@@ -180,7 +180,6 @@ vcpu_exit_i8253(struct vm_run_params *vrp)
 					    ticks % i8253_counter[sel].start;
 				} else
 					i8253_counter[sel].olatch = 0;
-				
 				goto ret;
 			} else if (rw != TIMER_16BIT) {
 				log_warnx("%s: i8253 PIT: unsupported counter "
diff --git a/usr.sbin/vmd/loadfile_elf.c b/usr.sbin/vmd/loadfile_elf.c
index fe9185cd3c2..1fefec9a642 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.25 2017/03/25 16:28:25 reyk Exp $ */
+/* $OpenBSD: loadfile_elf.c,v 1.26 2017/03/27 00:28:04 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -395,12 +395,12 @@ push_bootargs(bios_memmap_t *memmap, size_t n)
 	memmap_sz = 3 * sizeof(int) + n * sizeof(bios_memmap_t);
 	ba[0] = 0x0;    /* memory map */
 	ba[1] = memmap_sz;
-	ba[2] = memmap_sz;     /* next */
+	ba[2] = memmap_sz;	/* next */
 	memcpy(&ba[3], memmap, n * sizeof(bios_memmap_t));
 	i = memmap_sz / sizeof(int);
 
 	/* Serial console device, COM1 @ 0x3f8 */
-	consdev.consdev = makedev(8, 0);        /* com1 @ 0x3f8 */
+	consdev.consdev = makedev(8, 0);	/* com1 @ 0x3f8 */
 	consdev.conspeed = 9600;
 	consdev.consaddr = 0x3f8;
 	consdev.consfreq = 0;
diff --git a/usr.sbin/vmd/mc146818.c b/usr.sbin/vmd/mc146818.c
index b6723ea7910..ba721d27106 100644
--- a/usr.sbin/vmd/mc146818.c
+++ b/usr.sbin/vmd/mc146818.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mc146818.c,v 1.11 2017/03/26 17:04:03 kettenis Exp $ */
+/* $OpenBSD: mc146818.c,v 1.12 2017/03/27 00:28:04 deraadt Exp $ */
 /*
  * Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org>
  *
@@ -149,7 +149,7 @@ mc146818_init(uint32_t vm_id, uint64_t memlo, uint64_t memhi)
 	rtc.regs[NVRAM_HIMEMSIZE_LO] = memhi & 0xFF;
 
 	rtc.regs[NVRAM_SMP_COUNT] = 0;
-	
+
 	rtc_updateregs();
 	rtc.vm_id = vm_id;
 
diff --git a/usr.sbin/vmd/parse.y b/usr.sbin/vmd/parse.y
index 24b234c8abb..d89cb3e0012 100644
--- a/usr.sbin/vmd/parse.y
+++ b/usr.sbin/vmd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.22 2017/03/02 07:33:37 reyk Exp $	*/
+/*	$OpenBSD: parse.y,v 1.23 2017/03/27 00:28:04 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007-2016 Reyk Floeter <reyk@openbsd.org>
@@ -89,7 +89,7 @@ static struct vmop_create_params vmc;
 static struct vm_create_params	*vcp;
 static struct vmd_switch	*vsw;
 static struct vmd_if		*vif;
-static struct vmd_vm        *vm;
+static struct vmd_vm		*vm;
 static unsigned int		 vsw_unit;
 static char			 vsw_type[IF_NAMESIZE];
 static int			 vcp_disable;
@@ -424,7 +424,7 @@ owner_id	: /* none */		{
 			$$.uid = 0;
 			$$.gid = -1;
 		}
-		| NUMBER 		{
+		| NUMBER		{
 			$$.uid = $1;
 			$$.gid = -1;
 		}
diff --git a/usr.sbin/vmd/pci.c b/usr.sbin/vmd/pci.c
index 5bc1c5eedfd..e6899273304 100644
--- a/usr.sbin/vmd/pci.c
+++ b/usr.sbin/vmd/pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci.c,v 1.15 2017/03/25 22:36:53 mlarkin Exp $	*/
+/*	$OpenBSD: pci.c,v 1.16 2017/03/27 00:28:04 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -86,8 +86,8 @@ pci_add_bar(uint8_t id, uint32_t type, void *barfn, void *cookie)
 			return (1);
 
 		pci.pci_devices[id].pd_cfg_space[bar_reg_idx] =
-		     PCI_MAPREG_IO_ADDR(pci.pci_next_io_bar) |
-		     PCI_MAPREG_TYPE_IO;
+		    PCI_MAPREG_IO_ADDR(pci.pci_next_io_bar) |
+		    PCI_MAPREG_TYPE_IO;
 		pci.pci_next_io_bar += VMM_PCI_IO_BAR_SIZE;
 		pci.pci_devices[id].pd_barfunc[bar_ct] = barfn;
 		pci.pci_devices[id].pd_bar_cookie[bar_ct] = cookie;
@@ -350,8 +350,7 @@ pci_handle_data_reg(struct vm_run_params *vrp)
 
 		/* IOBAR registers must have bit 0 set */
 		if (o == 0x10)
-			pci.pci_devices[d].pd_cfg_space[o / 4] |= 1; 
-			
+			pci.pci_devices[d].pd_cfg_space[o / 4] |= 1;
 	} else {
 		/*
 		 * vei_dir == VEI_DIR_IN : in instruction
diff --git a/usr.sbin/vmd/proc.h b/usr.sbin/vmd/proc.h
index 6fce6a93b59..b91f3a5fecb 100644
--- a/usr.sbin/vmd/proc.h
+++ b/usr.sbin/vmd/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.11 2017/01/09 14:49:22 reyk Exp $	*/
+/*	$OpenBSD: proc.h,v 1.12 2017/03/27 00:28:04 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
@@ -154,8 +154,8 @@ struct privsep_fd {
 #define DPRINTF(x...)	do {} while(0)
 #endif
 
-#define PROC_PARENT_SOCK_FILENO 3
-#define PROC_MAX_INSTANCES      32
+#define PROC_PARENT_SOCK_FILENO	3
+#define PROC_MAX_INSTANCES	32
 
 /* proc.c */
 void	 proc_init(struct privsep *, struct privsep_proc *, unsigned int,
diff --git a/usr.sbin/vmd/virtio.h b/usr.sbin/vmd/virtio.h
index 0740eee6991..04b81ea472d 100644
--- a/usr.sbin/vmd/virtio.h
+++ b/usr.sbin/vmd/virtio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio.h,v 1.13 2017/03/26 22:19:47 mlarkin Exp $	*/
+/*	$OpenBSD: virtio.h,v 1.14 2017/03/27 00:28:04 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -18,8 +18,8 @@
 
 #include <dev/pv/virtioreg.h>
 
-#define VIRTQUEUE_ALIGN(n)      (((n)+(VIRTIO_PAGE_SIZE-1))&    \
-	~(VIRTIO_PAGE_SIZE-1))
+#define VIRTQUEUE_ALIGN(n)	(((n)+(VIRTIO_PAGE_SIZE-1))&    \
+				    ~(VIRTIO_PAGE_SIZE-1))
 
 /* Queue sizes must be power of two */
 #define VIORND_QUEUE_SIZE	64
diff --git a/usr.sbin/vmd/vm.c b/usr.sbin/vmd/vm.c
index 89696447a84..b833d8da897 100644
--- a/usr.sbin/vmd/vm.c
+++ b/usr.sbin/vmd/vm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm.c,v 1.10 2017/03/25 22:36:53 mlarkin Exp $	*/
+/*	$OpenBSD: vm.c,v 1.11 2017/03/27 00:28:04 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -1413,7 +1413,7 @@ set_return_data(union vm_exit *vei, uint32_t data)
 		break;
 	case 4:
 		vei->vei.vei_data = data;
-		break;	
+		break;
 	}
 }