summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2017-01-22 20:08:10 +0000
committerreyk <reyk@openbsd.org>2017-01-22 20:08:10 +0000
commit944b4725d2239e2780b2d085a8ec9aa5d4a97cbc (patch)
treea985f8acce12627036d65e833adc21f3af1ce90e
parentAccept the OSC 52 escape sequence inside tmux to add a new buffer, from (diff)
downloadwireguard-openbsd-944b4725d2239e2780b2d085a8ec9aa5d4a97cbc.tar.xz
wireguard-openbsd-944b4725d2239e2780b2d085a8ec9aa5d4a97cbc.zip
define virtio in conf/files
This unbreaks build on archs that are non-pv but PCI because I moved virtio out of files.pci but kept a virtio dependency for the virtio_pci driver. Issue report and fix suggested by visa@ and miod@
-rw-r--r--sys/conf/files3
-rw-r--r--sys/dev/pv/files.pv3
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 08ab44b35d6..923ce595ec5 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.637 2017/01/13 13:25:01 stsp Exp $
+# $OpenBSD: files,v 1.638 2017/01/22 20:08:10 reyk Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -443,6 +443,7 @@ define pcmciaslot {[slot = -1]} # PCMCIA slot itself
define sdmmcbus {} # SD/MMC attachment
define btbus {} # Bluetooth host controller
define agpbus {} # AGP bridge
+device virtio {} # VirtIO
# UHCI USB controller
device uhci: usbus
diff --git a/sys/dev/pv/files.pv b/sys/dev/pv/files.pv
index 6d9c0ae2395..178d8d1d28d 100644
--- a/sys/dev/pv/files.pv
+++ b/sys/dev/pv/files.pv
@@ -1,4 +1,4 @@
-# $OpenBSD: files.pv,v 1.11 2017/01/21 11:33:01 reyk Exp $
+# $OpenBSD: files.pv,v 1.12 2017/01/22 20:08:10 reyk Exp $
#
# Config file and device description for paravirtual devices.
# Included by ports that need it.
@@ -41,7 +41,6 @@ attach hvn at hyperv
file dev/pv/if_hvn.c hvn
# VirtIO
-device virtio {}
file dev/pv/virtio.c virtio
device vio