From owner-svn-soc-all@freebsd.org Fri Jun 10 13:14:27 2016 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2880EB70334 for ; Fri, 10 Jun 2016 13:14:27 +0000 (UTC) (envelope-from vincenzo@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1CB331963 for ; Fri, 10 Jun 2016 13:14:27 +0000 (UTC) (envelope-from vincenzo@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u5ADEQ1N010158 for ; Fri, 10 Jun 2016 13:14:26 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5ADEQG2010110 for svn-soc-all@FreeBSD.org; Fri, 10 Jun 2016 13:14:26 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 10 Jun 2016 13:14:26 GMT Message-Id: <201606101314.u5ADEQG2010110@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to vincenzo@FreeBSD.org using -f From: vincenzo@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r305042 - soc2016/vincenzo/head/sys/dev/netmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2016 13:14:27 -0000 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: