socsvn commit: r305042 - soc2016/vincenzo/head/sys/dev/netmap

[vincenzo at FreeBSD.org]

Author: vincenzo
Date: Fri Jun 10 13:14:25 2016
New Revision: 305042
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305042

Log:
   ptnetmap guest: temporary hack to avoid guest kernel crash

Modified:
  soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c
  soc2016/vincenzo/head/sys/dev/netmap/netmap_freebsd.c

Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c
==============================================================================
--- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Fri Jun 10 13:14:06 2016	(r305041)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Fri Jun 10 13:14:25 2016	(r305042)
@@ -204,6 +204,8 @@
 	return (BUS_PROBE_DEFAULT);
 }
 
+extern int netmap_initialized;
+
 static int
 ptnet_attach(device_t dev)
 {
@@ -217,6 +219,11 @@
 	int err, rid;
 	int i;
 
+	if (!netmap_initialized) {
+		device_printf(dev, "Netmap still not initialized\n");
+		return (ENXIO);
+	}
+
 	device_printf(dev, "%s\n", __func__);
 
 	sc = device_get_softc(dev);

Modified: soc2016/vincenzo/head/sys/dev/netmap/netmap_freebsd.c
==============================================================================
--- soc2016/vincenzo/head/sys/dev/netmap/netmap_freebsd.c	Fri Jun 10 13:14:06 2016	(r305041)
+++ soc2016/vincenzo/head/sys/dev/netmap/netmap_freebsd.c	Fri Jun 10 13:14:25 2016	(r305042)
@@ -681,6 +681,8 @@
 	return (BUS_PROBE_DEFAULT);
 }
 
+int netmap_initialized = 0; /* XXX temporary hack */
+
 /* Device initialization routine. */
 static int
 ptn_memdev_attach(device_t dev)
@@ -691,6 +693,11 @@
 
 	D("ptn_memdev_driver attach");
 
+	if (!netmap_initialized) {
+		device_printf(dev, "Netmap still not initialized\n");
+		return (ENXIO);
+	}
+
 	ptn_dev = device_get_softc(dev);
 	ptn_dev->dev = dev;
 
@@ -1430,6 +1437,8 @@
 	switch (event) {
 	case MOD_LOAD:
 		error = netmap_init();
+		if (!error)
+			netmap_initialized = 1;
 		break;
 
 	case MOD_UNLOAD: