Skip to content

Commit

Permalink
MFC r273515, r274055, r274063, r274215, r274065, r274502:
Browse files Browse the repository at this point in the history
Add VirtIO console driver.
  • Loading branch information
bryanv committed Nov 29, 2014
1 parent 93b5034 commit f9a98c5
Show file tree
Hide file tree
Showing 11 changed files with 1,595 additions and 1 deletion.
2 changes: 2 additions & 0 deletions share/man/man4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@ MAN= aac.4 \
${_virtio.4} \
${_virtio_balloon.4} \
${_virtio_blk.4} \
${_virtio_console.4} \
${_virtio_random.4} \
${_virtio_scsi.4} \
vkbd.4 \
Expand Down Expand Up @@ -810,6 +811,7 @@ _nxge.4= nxge.4
_virtio.4= virtio.4
_virtio_balloon.4=virtio_balloon.4
_virtio_blk.4= virtio_blk.4
_virtio_console.4=virtio_console.4
_virtio_random.4= virtio_random.4
_virtio_scsi.4= virtio_scsi.4
_vmx.4= vmx.4
Expand Down
1 change: 1 addition & 0 deletions share/man/man4/virtio.4
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ device driver.
.Sh SEE ALSO
.Xr virtio_balloon 4 ,
.Xr virtio_blk 4 ,
.Xr virtio_console 4 ,
.Xr virtio_scsi 4 ,
.Xr vtnet 4
.Sh HISTORY
Expand Down
67 changes: 67 additions & 0 deletions share/man/man4/virtio_console.4
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
.\" Copyright (c) 2014 Bryan Venteicher
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\" 1. Redistributions of source code must retain the above copyright
.\" notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD$
.\"
.Dd October 22, 2014
.Dt VIRTIO_CONSOLE 4
.Os
.Sh NAME
.Nm virtio_console
.Nd VirtIO Console driver
.Sh SYNOPSIS
To compile this driver into the kernel,
place the following lines in your
kernel configuration file:
.Bd -ragged -offset indent
.Cd "device virtio_console"
.Ed
.Pp
Alternatively, to load the driver as a
module at boot time, place the following line in
.Xr loader.conf 5 :
.Bd -literal -offset indent
virtio_console_load="YES"
.Ed
.Sh DESCRIPTION
The
.Nm
device driver provides support for VirtIO console devices.
.Pp
The console device may have one or more ports.
Each port is similar to a simple serial interface, and
each port is accessible through
.Xr tty 4 .
.Sh FILES
.Bl -tag -width ".Pa /dev/ttyV?.??" -compact
.It Pa /dev/ttyV?.??
.El
.Sh SEE ALSO
.Xr tty 4
.Xr virtio 4
.Sh HISTORY
The
.Nm
driver was written by
.An Bryan Venteicher Aq [email protected] .
1 change: 1 addition & 0 deletions sys/amd64/conf/NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ device virtio_blk # VirtIO Block device
device virtio_scsi # VirtIO SCSI device
device virtio_balloon # VirtIO Memory Balloon device
device virtio_random # VirtIO Entropy device
device virtio_console # VirtIO Console device

device hyperv # HyperV drivers

Expand Down
1 change: 1 addition & 0 deletions sys/conf/files.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ dev/virtio/block/virtio_blk.c optional virtio_blk
dev/virtio/balloon/virtio_balloon.c optional virtio_balloon
dev/virtio/scsi/virtio_scsi.c optional virtio_scsi
dev/virtio/random/virtio_random.c optional virtio_random
dev/virtio/console/virtio_console.c optional virtio_console
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
kern/imgact_binmisc.c optional imagact_binmisc
Expand Down
1 change: 1 addition & 0 deletions sys/conf/files.i386
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ dev/virtio/block/virtio_blk.c optional virtio_blk
dev/virtio/balloon/virtio_balloon.c optional virtio_balloon
dev/virtio/scsi/virtio_scsi.c optional virtio_scsi
dev/virtio/random/virtio_random.c optional virtio_random
dev/virtio/console/virtio_console.c optional virtio_console
i386/acpica/acpi_machdep.c optional acpi
acpi_wakecode.o optional acpi \
dependency "$S/i386/acpica/acpi_wakecode.S assym.s" \
Expand Down
Loading

0 comments on commit f9a98c5

Please sign in to comment.