Module Name: src
Committed By: reinoud
Date: Tue Feb 16 10:58:33 UTC 2021
Modified Files:
src/sys/arch/evbmips/conf: MIPSSIM files.mipssim
Log Message:
I forgot to add the needed conf files for the mipssim virtio addition
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/MIPSSIM
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/files.mipssim
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/conf/MIPSSIM
diff -u src/sys/arch/evbmips/conf/MIPSSIM:1.2 src/sys/arch/evbmips/conf/MIPSSIM:1.3
--- src/sys/arch/evbmips/conf/MIPSSIM:1.2 Mon Feb 8 00:47:53 2021
+++ src/sys/arch/evbmips/conf/MIPSSIM Tue Feb 16 10:58:32 2021
@@ -1,10 +1,14 @@
-# $NetBSD: MIPSSIM,v 1.2 2021/02/08 00:47:53 simonb Exp $
+# $NetBSD: MIPSSIM,v 1.3 2021/02/16 10:58:32 reinoud Exp $
#
# Kernel config for the QEMU MIPS "mipssim" simulator
+#
+# The QEMU virtio support is experimental and subject to change
+# and will likely be removed when qemu gains a MIPS "virt" target.
+#
include "arch/evbmips/conf/std.mipssim"
-#ident "GENERIC-$Revision: 1.2 $"
+#ident "GENERIC-$Revision: 1.3 $"
maxusers 32
@@ -63,8 +67,8 @@ file-system PTYFS # /dev/pts/N support
#options NFSSERVER # Sun NFS-compatible filesystem server
#options QUOTA # legacy UFS quotas
#options QUOTA2 # new, in-filesystem UFS quotas
-#options DISKLABEL_EI # disklabel Endian Independent support
-#options FFS_EI # FFS Endian Independent support
+options DISKLABEL_EI # disklabel Endian Independent support
+options FFS_EI # FFS Endian Independent support
#options WAPBL # File system journaling support
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
@@ -105,6 +109,29 @@ com* at mainbus?
# mipsnet* at mainbus?
# options MIPSSIM_ETH_MACADDR="ba:bb:1e:01:23:45"
+
+# Virtio devices
+virtio* at mainbus? # Virtio PCI device
+#viomb* at virtio? # Virtio memory balloon device
+ld* at virtio? # Virtio disk device
+vioif* at virtio? # Virtio network device
+viornd* at virtio? # Virtio entropy device
+vioscsi* at virtio? # Virtio SCSI device
+#vio9p* at virtio? # Virtio 9P device
+
+# SCSI bus support
+scsibus* at scsi?
+
+# SCSI devices
+sd* at scsibus? target ? lun ? # SCSI disk drives
+#st* at scsibus? target ? lun ? # SCSI tape drives
+cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
+#ch* at scsibus? target ? lun ? # SCSI autochangers
+#ses* at scsibus? target ? lun ? # SCSI Enclosure Services devices
+#ss* at scsibus? target ? lun ? # SCSI scanners
+#uk* at scsibus? target ? lun ? # SCSI unknown
+
+
# Network pseudo-devices
pseudo-device bpfilter # Berkeley packet filter
#pseudo-device carp # Common Address Redundancy Protocol
Index: src/sys/arch/evbmips/conf/files.mipssim
diff -u src/sys/arch/evbmips/conf/files.mipssim:1.1 src/sys/arch/evbmips/conf/files.mipssim:1.2
--- src/sys/arch/evbmips/conf/files.mipssim:1.1 Wed Jan 27 05:24:16 2021
+++ src/sys/arch/evbmips/conf/files.mipssim Tue Feb 16 10:58:33 2021
@@ -1,15 +1,19 @@
-# $NetBSD: files.mipssim,v 1.1 2021/01/27 05:24:16 simonb Exp $
+# $NetBSD: files.mipssim,v 1.2 2021/02/16 10:58:33 reinoud Exp $
file arch/evbmips/mipssim/autoconf.c
file arch/evbmips/mipssim/machdep.c
file arch/evbmips/mipssim/mipssim_intr.c
+file arch/evbmips/mipssim/mipssim_dma.c
file arch/evbmips/mipssim/mipssim_bus_io.c
file arch/evbmips/evbmips/interrupt.c
+file arch/mips/mips/bus_dma.c
file arch/mips/mips/mips3_clock.c
file arch/mips/mips/mips3_clockintr.c
+file kern/subr_disk_mbr.c disk
+
# System bus
device mainbus {}
attach mainbus at root
@@ -27,5 +31,12 @@ attach mipsnet at mainbus
file arch/evbmips/mipssim/if_mipsnet.c mipsnet
defparam opt_mipsnet.h MIPSSIM_ETH_MACADDR
+attach virtio at mainbus with virtio_mainbus: virtio_mmio
+file arch/evbmips/mipssim/virtio_mainbus.c virtio_mainbus
+
# Memory Disk
file dev/md_root.c memory_disk_hooks
+
+# SCSI support
+include "dev/scsipi/files.scsipi"
+
