kernel/virtio: Make it compilable into the kernel.

Submitted-by: vsrinivas

diff --git a/sys/conf/files b/sys/conf/files
index 1adc560..63323ca 100644 (file)
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2246,3 +2246,13 @@ bus/u4b/quirk/usb_quirk.c                optional usb4bsd
 #
 bus/u4b/audio/uaudio.c                 optional snd_uaudio usb4bsd
 #bus/u4b/audio/uaudio_pcm.c            optional snd_uaudio usb4bsd
+
+#
+# virtio support
+#
+dev/virtual/virtio/block/virtio_blk.c  optional virtio_blk virtio
+dev/virtual/virtio/pci/virtio_pci.c    optional virtio_pci virtio
+dev/virtual/virtio/virtio/virtio.c     optional virtio
+dev/virtual/virtio/virtio/virtio_bus_if.m optional virtio
+dev/virtual/virtio/virtio/virtio_if.m  optional virtio
+dev/virtual/virtio/virtio/virtqueue.c  optional virtio

diff --git a/sys/config/GENERIC b/sys/config/GENERIC
index df6ea36..b44355e 100644 (file)
--- a/sys/config/GENERIC
+++ b/sys/config/GENERIC
@@ -162,6 +162,11 @@ device             mfip            # LSI MegaRAID SAS passthrough, requires CAM
 device         pst             # Promise Supertrack
 device         twe             # 3ware Escalade 7000/8000's
 
+# VirtIO support
+device         virtio          # VirtIO core
+device         virtio_blk      # VirtIO disk driver
+device         virtio_pci      # VirtIO transport over PCI bus
+
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device         atkbdc0 at isa? port IO_KBD
 device         atkbd0  at atkbdc? irq 1 flags 0x1

diff --git a/sys/config/LINT b/sys/config/LINT
index dea2369..fe23cef 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -2451,6 +2451,13 @@ device           ichwd           # Intel ICH watchdog interrupt timer
 device         tbridge         # regression testing
 
 #
+# VirtIO support
+#
+device         virtio          # VirtIO core
+device         virtio_blk      # VirtIO disk driver
+device         virtio_pci      # VirtIO transport over PCI bus
+
+#
 # Embedded system options:
 #
 # An embedded system might want to run something other than init.

diff --git a/sys/config/LINT64 b/sys/config/LINT64
index 198d967..9d0c57e 100644 (file)
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -2231,6 +2231,13 @@ device           ichwd           # Intel ICH watchdog interrupt timer
 device         tbridge         # regression testing
 
 #
+# Virtio support
+#
+device         virtio
+device         virtio_blk
+device         virtio_pci
+
+#
 # Embedded system options:
 #
 # An embedded system might want to run something other than init.

diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC
index ca54d7a..2b24938 100644 (file)
--- a/sys/config/X86_64_GENERIC
+++ b/sys/config/X86_64_GENERIC
@@ -149,6 +149,11 @@ device             mfi             # LSI MegaRAID SAS
 device         mfip            # LSI MegaRAID SAS passthrough, requires CAM
 device         twe             # 3ware Escalade 7000/8000's
 
+# VirtIO support
+device         virtio          # VirtIO core
+device         virtio_blk      # VirtIO disk driver
+device         virtio_pci      # VirtIO transport over PCI bus
+
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device         atkbdc0 at isa? port IO_KBD
 device         atkbd0  at atkbdc? irq 1 flags 0x1