diff options
| author |   reyk <reyk@openbsd.org> | 2017-01-21 10:58:15 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2017-01-21 10:58:15 +0000 |
| commit | e73e975ad5ecff6e4b1ba1c266938d4f547152da (patch) | |
| tree | e481bf20b248eaef1f888ced5067bb11042671b5 /sys/dev | |
| parent | Split out BN_div and BN_mod into ct and nonct versions for Internal use. (diff) | |
| download | wireguard-openbsd-e73e975ad5ecff6e4b1ba1c266938d4f547152da.tar.xz wireguard-openbsd-e73e975ad5ecff6e4b1ba1c266938d4f547152da.zip | |
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@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/files.pci | 33 | ||||
| -rw-r--r-- | sys/dev/pv/files.pv | 34 |
2 files changed, 34 insertions, 33 deletions
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 |