[src/trunk]: src/sys shuffle mechanics of files.virtio config(5) include loca...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/21db9eb4c40f
branches:  trunk
changeset: 323277:21db9eb4c40f
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Wed Jun 06 18:10:35 2018 +0000

description:
shuffle mechanics of files.virtio config(5) include location,
without actually moving the contents thereof from dev/pci yet

diffstat:

 sys/conf/files              |  6 +++++-
 sys/dev/pci/files.pci       |  5 +----
 sys/dev/virtio/files.virtio |  4 ++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r e3378e8edfe0 -r 21db9eb4c40f sys/conf/files
--- a/sys/conf/files    Wed Jun 06 17:54:33 2018 +0000
+++ b/sys/conf/files    Wed Jun 06 18:10:35 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1199 2018/05/06 10:32:33 jmcneill Exp $
+#      $NetBSD: files,v 1.1200 2018/06/06 18:10:36 jakllsch Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20171118
@@ -1000,6 +1000,10 @@
 device re: ether, ifnet, arp, mii
 file   dev/ic/rtl8169.c                re
 
+# Virtual I/O Device (VIRTIO) bus controller and devices
+#
+include "dev/virtio/files.virtio"
+
 # Common code for ESDI/IDE/etc. controllers
 #
 define wdc_common
diff -r e3378e8edfe0 -r 21db9eb4c40f sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Wed Jun 06 17:54:33 2018 +0000
+++ b/sys/dev/pci/files.pci     Wed Jun 06 18:10:35 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.396 2018/05/19 09:27:09 jdolecek Exp $
+#      $NetBSD: files.pci,v 1.397 2018/06/06 18:10:35 jakllsch Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -1149,9 +1149,6 @@
 attach  sisfb at pci
 file    dev/pci/sisfb.c                sisfb   needs-flag
 
-# VirtIO: XXX: move to dev/vmm/virtio
-include "dev/pci/files.virtio"
-
 attach virtio at pci with virtio_pci
 file   dev/pci/virtio_pci.c    virtio_pci
 
diff -r e3378e8edfe0 -r 21db9eb4c40f sys/dev/virtio/files.virtio
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/virtio/files.virtio       Wed Jun 06 18:10:35 2018 +0000
@@ -0,0 +1,4 @@
+#      $NetBSD: files.virtio,v 1.1 2018/06/06 18:10:35 jakllsch Exp $
+
+# XXX the contents of the following included file should be moved here
+include "dev/pci/files.virtio"