Module Name: src
Committed By: jakllsch
Date: Wed Jun 6 18:10:36 UTC 2018
Modified Files:
src/sys/conf: files
src/sys/dev/pci: files.pci
Added Files:
src/sys/dev/virtio: files.virtio
Log Message:
shuffle mechanics of files.virtio config(5) include location,
without actually moving the contents thereof from dev/pci yet
To generate a diff of this commit:
cvs rdiff -u -r1.1199 -r1.1200 src/sys/conf/files
cvs rdiff -u -r1.396 -r1.397 src/sys/dev/pci/files.pci
cvs rdiff -u -r0 -r1.1 src/sys/dev/virtio/files.virtio
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1199 src/sys/conf/files:1.1200
--- src/sys/conf/files:1.1199 Sun May 6 10:32:33 2018
+++ src/sys/conf/files Wed Jun 6 18:10:36 2018
@@ -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 @@ file dev/ic/rtl81x9.c rtk | re
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
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.396 src/sys/dev/pci/files.pci:1.397
--- src/sys/dev/pci/files.pci:1.396 Sat May 19 09:27:09 2018
+++ src/sys/dev/pci/files.pci Wed Jun 6 18:10:35 2018
@@ -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 @@ device sisfb: wsemuldisplaydev, rasops8
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
Added files:
Index: src/sys/dev/virtio/files.virtio
diff -u /dev/null src/sys/dev/virtio/files.virtio:1.1
--- /dev/null Wed Jun 6 18:10:36 2018
+++ src/sys/dev/virtio/files.virtio Wed Jun 6 18:10:35 2018
@@ -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"
