Move virtio config from files.pci to files.pci

virtio itself is not PCI, it is a paravirtual bus on top of either PCI
or MMIO (arm).  This is the first step of moving the virtio files to
dev/pv.  No functional change.

arm kernel changes tested by jsg@ and patrick@
no objections from sf@ mlarkin@

7 files changed, 59 insertions, 49 deletions

diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 17480cc5352..ab744edcbde 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.86 2016/08/30 20:18:17 yasuoka Exp $
+#	$OpenBSD: files.amd64,v 1.87 2017/01/21 10:58:15 reyk Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -114,6 +114,11 @@ attach efifb at mainbus
 file arch/amd64/amd64/efifb.c			efifb needs-flag
 
 #
+# Paravirtual device bus and virtio
+#
+include "dev/pv/files.pv"
+
+#
 # PCI drivers
 #
 
@@ -255,11 +260,6 @@ include "dev/onewire/files.onewire"
 attach	ipmi at mainbus
 
 #
-# Paravirtual device bus
-#
-include "dev/pv/files.pv"
-
-#
 # device major numbers
 #
 
diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm
index 19ddde9548a..84feca7aef4 100644
--- a/sys/arch/arm/conf/files.arm
+++ b/sys/arch/arm/conf/files.arm
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.arm,v 1.43 2017/01/02 00:51:18 jsg Exp $
+#	$OpenBSD: files.arm,v 1.44 2017/01/21 10:58:15 reyk Exp $
 #	$NetBSD: files.arm,v 1.76 2003/11/05 12:53:15 scw Exp $
 
 # generic networking files
@@ -19,6 +19,7 @@ file	arch/arm/arm/fiq_subr.S			fiq
 define	fdt {[early = 0]}
 
 # mainbus files
+define	mainbus {}
 device	mainbus: fdt
 attach	mainbus at root
 file	arch/arm/mainbus/mainbus.c		mainbus
diff --git a/sys/arch/arm64/conf/files.arm64 b/sys/arch/arm64/conf/files.arm64
index c491db4463a..1a35f96892f 100644
--- a/sys/arch/arm64/conf/files.arm64
+++ b/sys/arch/arm64/conf/files.arm64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.arm64,v 1.3 2017/01/21 08:54:24 patrick Exp $
+# $OpenBSD: files.arm64,v 1.4 2017/01/21 10:58:15 reyk Exp $
 
 maxpartitions	16
 maxusers	2 8 64
@@ -43,6 +43,7 @@ file	arch/arm64/arm64/db_trace.c		ddb
 define	fdt {[early = 0]}
 
 # mainbus files
+define	mainbus {}
 device	mainbus: fdt
 attach	mainbus at root
 file	arch/arm64/dev/mainbus.c		mainbus
@@ -90,6 +91,10 @@ include "dev/onewire/files.onewire"
 file	netinet/in_cksum.c
 file	netinet/in4_cksum.c
 
+# Paravirtual device bus and virtio
+include "dev/pv/files.pv"
+
+# MII and PCI
 include "dev/mii/files.mii"
 include "dev/pci/files.pci"
 include "dev/sdmmc/files.sdmmc"
diff --git a/sys/arch/armv7/conf/files.armv7 b/sys/arch/armv7/conf/files.armv7
index 9cf1e2fabdf..f0ae2783acc 100644
--- a/sys/arch/armv7/conf/files.armv7
+++ b/sys/arch/armv7/conf/files.armv7
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.armv7,v 1.29 2017/01/03 19:57:01 kettenis Exp $
+#	$OpenBSD: files.armv7,v 1.30 2017/01/21 10:58:15 reyk Exp $
 
 maxpartitions	16
 maxusers	2 8 64
@@ -56,7 +56,10 @@ include "dev/wsfont/files.wsfont"
 # Include USB stuff
 include "dev/usb/files.usb"
 
-# PCI and virtio
+# Paravirtual device bus and virtio
+include "dev/pv/files.pv"
+
+# PCI bus
 include "dev/pci/files.pci"
 
 # Machine-independent GPIO drivers
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index efb759667b0..a170dd10547 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.230 2016/10/21 06:20:58 mlarkin Exp $
+#	$OpenBSD: files.i386,v 1.231 2017/01/21 10:58:15 reyk Exp $
 #
 # new style config file for i386 architecture
 #
@@ -91,6 +91,11 @@ file   arch/i386/i386/codepatch.c
 #device	mca at root {...}
 
 #
+# Paravirtual device bus
+#
+include "dev/pv/files.pv"
+
+#
 # PCI-only drivers
 # XXX MUST BE INCLUDED BEFORE files.isa, as long as files.isa attaches
 # XXX devices to 'pci'.
@@ -401,11 +406,6 @@ file	arch/i386/i386/vmm_support.S		vmm
 #
 attach	ipmi at mainbus
 
-#
-# Paravirtual device bus
-#
-include "dev/pv/files.pv"
-
 # Dell Embedded Systems Management
 device	esm
 attach	esm at mainbus
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 7bd0d9688ad..59cda9d429b 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pci,v 1.328 2017/01/13 14:37:32 reyk Exp $
+#	$OpenBSD: files.pci,v 1.329 2017/01/21 10:58:15 reyk Exp $
 #	$NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
 #
 # Config file and device description for machine-independent PCI code.
@@ -804,39 +804,8 @@ attach	xspd at pci
 file	dev/pci/xspd.c			xspd
 
 # VirtIO
-device	virtio {}
-file	dev/pci/virtio.c		virtio
-
 attach	virtio at pci with virtio_pci
 file	dev/pci/virtio_pci.c		virtio_pci
 
-device	vio
-attach	vio at virtio
-file	dev/pci/if_vio.c		vio
-
-device	vioblk: scsi
-attach	vioblk at virtio
-file	dev/pci/vioblk.c		vioblk
-
-device	viocon
-attach	viocon at virtio
-file	dev/pci/viocon.c		viocon		needs-flag
-
-device	viomb
-attach	viomb at virtio
-file	dev/pci/viomb.c			viomb
-
-device	viornd
-attach	viornd at virtio
-file	dev/pci/viornd.c		viornd
-
-device	vioscsi: scsi
-attach	vioscsi at virtio
-file	dev/pci/vioscsi.c		vioscsi
-
-device	vmmci
-attach	vmmci at virtio
-file	dev/pci/vmmci.c			vmmci
-
 include "dev/pci/files.agp"
 include "dev/pci/drm/files.drm"
diff --git a/sys/dev/pv/files.pv b/sys/dev/pv/files.pv
index 22be3a16928..8f792842837 100644
--- a/sys/dev/pv/files.pv
+++ b/sys/dev/pv/files.pv
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pv,v 1.9 2016/12/07 15:30:04 mikeb Exp $
+#	$OpenBSD: files.pv,v 1.10 2017/01/21 10:58:15 reyk Exp $
 #
 # Config file and device description for paravirtual devices.
 # Included by ports that need it.
@@ -39,3 +39,35 @@ file	dev/pv/hypervic.c		hyperv
 device	hvn: ether, ifnet, ifmedia
 attach	hvn at hyperv
 file	dev/pv/if_hvn.c			hvn
+
+# VirtIO
+device	virtio {}
+file	dev/pci/virtio.c		virtio
+
+device	vio
+attach	vio at virtio
+file	dev/pci/if_vio.c		vio
+
+device	vioblk: scsi
+attach	vioblk at virtio
+file	dev/pci/vioblk.c		vioblk
+
+device	viocon
+attach	viocon at virtio
+file	dev/pci/viocon.c		viocon		needs-flag
+
+device	viomb
+attach	viomb at virtio
+file	dev/pci/viomb.c			viomb
+
+device	viornd
+attach	viornd at virtio
+file	dev/pci/viornd.c		viornd
+
+device	vioscsi: scsi
+attach	vioscsi at virtio
+file	dev/pci/vioscsi.c		vioscsi
+
+device	vmmci
+attach	vmmci at virtio
+file	dev/pci/vmmci.c			vmmci