Module Name: src
Committed By: jakllsch
Date: Wed Jun 6 16:11:36 UTC 2018
Modified Files:
src/sys/dev/pci: virtio.c virtio_pci.c
src/sys/modules/virtio: Makefile
Added Files:
src/sys/modules/virtio_pci: Makefile virtio_pci.ioconf
Removed Files:
src/sys/modules/virtio: virtio.ioconf
Log Message:
fix up virtio module for current structure; add virtio_pci module
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/virtio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/virtio_pci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/virtio/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/modules/virtio/virtio.ioconf
cvs rdiff -u -r0 -r1.1 src/sys/modules/virtio_pci/Makefile \
src/sys/modules/virtio_pci/virtio_pci.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.31 src/sys/dev/pci/virtio.c:1.32
--- src/sys/dev/pci/virtio.c:1.31 Sat Jun 2 22:43:15 2018
+++ src/sys/dev/pci/virtio.c Wed Jun 6 16:11:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.31 2018/06/02 22:43:15 jakllsch Exp $ */
+/* $NetBSD: virtio.c,v 1.32 2018/06/06 16:11:36 jakllsch Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.31 2018/06/02 22:43:15 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.32 2018/06/06 16:11:36 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -932,7 +932,7 @@ virtio_features(struct virtio_softc *sc)
return sc->sc_features;
}
-MODULE(MODULE_CLASS_DRIVER, virtio, "pci");
+MODULE(MODULE_CLASS_DRIVER, virtio, NULL);
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/pci/virtio_pci.c
diff -u src/sys/dev/pci/virtio_pci.c:1.4 src/sys/dev/pci/virtio_pci.c:1.5
--- src/sys/dev/pci/virtio_pci.c:1.4 Sat Jun 2 22:43:15 2018
+++ src/sys/dev/pci/virtio_pci.c Wed Jun 6 16:11:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_pci.c,v 1.4 2018/06/02 22:43:15 jakllsch Exp $ */
+/* $NetBSD: virtio_pci.c,v 1.5 2018/06/06 16:11:36 jakllsch Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,11 +26,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.4 2018/06/02 22:43:15 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.5 2018/06/06 16:11:36 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kmem.h>
+#include <sys/module.h>
#include <sys/device.h>
@@ -727,3 +728,34 @@ virtio_pci_msix_config_intr(void *arg)
r = (sc->sc_config_change)(sc);
return r;
}
+
+MODULE(MODULE_CLASS_DRIVER, virtio_pci, "pci,virtio");
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+virtio_pci_modcmd(modcmd_t cmd, void *opaque)
+{
+ int error = 0;
+
+#ifdef _MODULE
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ error = config_init_component(cfdriver_ioconf_virtio_pci,
+ cfattach_ioconf_virtio_pci, cfdata_ioconf_virtio_pci);
+ break;
+ case MODULE_CMD_FINI:
+ error = config_fini_component(cfdriver_ioconf_virtio_pci,
+ cfattach_ioconf_virtio_pci, cfdata_ioconf_virtio_pci);
+ break;
+ default:
+ error = ENOTTY;
+ break;
+ }
+#endif
+
+ return error;
+}
+
Index: src/sys/modules/virtio/Makefile
diff -u src/sys/modules/virtio/Makefile:1.1 src/sys/modules/virtio/Makefile:1.2
--- src/sys/modules/virtio/Makefile:1.1 Tue Sep 27 03:53:09 2016
+++ src/sys/modules/virtio/Makefile Wed Jun 6 16:11:36 2018
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2016/09/27 03:53:09 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2018/06/06 16:11:36 jakllsch Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/pci
KMOD= virtio
-IOCONF= virtio.ioconf
SRCS+= virtio.c
Added files:
Index: src/sys/modules/virtio_pci/Makefile
diff -u /dev/null src/sys/modules/virtio_pci/Makefile:1.1
--- /dev/null Wed Jun 6 16:11:37 2018
+++ src/sys/modules/virtio_pci/Makefile Wed Jun 6 16:11:36 2018
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2018/06/06 16:11:36 jakllsch Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev/pci
+
+KMOD= virtio_pci
+IOCONF= virtio_pci.ioconf
+
+SRCS+= virtio_pci.c
+
+CPPFLAGS+= -DDIAGNOSTIC
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/virtio_pci/virtio_pci.ioconf
diff -u /dev/null src/sys/modules/virtio_pci/virtio_pci.ioconf:1.1
--- /dev/null Wed Jun 6 16:11:37 2018
+++ src/sys/modules/virtio_pci/virtio_pci.ioconf Wed Jun 6 16:11:36 2018
@@ -0,0 +1,10 @@
+# $NetBSD: virtio_pci.ioconf,v 1.1 2018/06/06 16:11:36 jakllsch Exp $
+
+ioconf virtio_pci
+
+include "conf/files"
+include "dev/pci/files.pci"
+
+pseudo-root pci*
+
+virtio* at pci? dev ? function ?
