From owner-svn-soc-all@freebsd.org Fri Aug 5 14:11:25 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 13FB8BB076A for ; Fri, 5 Aug 2016 14:11:25 +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 076FD1D09 for ; Fri, 5 Aug 2016 14:11:25 +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 u75EBOFX009857 for ; Fri, 5 Aug 2016 14:11:24 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u75EBOlX009833 for svn-soc-all@FreeBSD.org; Fri, 5 Aug 2016 14:11:24 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 5 Aug 2016 14:11:24 GMT Message-Id: <201608051411.u75EBOlX009833@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: r307237 - soc2016/vincenzo/head/usr.sbin/bhyve 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, 05 Aug 2016 14:11:25 -0000 Author: vincenzo Date: Fri Aug 5 14:11:23 2016 New Revision: 307237 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307237 Log: bhyve: netmap_init: distinguish ptnetmap checking for NULL callback Modified: soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c Modified: soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c ============================================================================== --- soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c Fri Aug 5 14:09:12 2016 (r307236) +++ soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c Fri Aug 5 14:11:23 2016 (r307237) @@ -210,6 +210,11 @@ int opt = 1; struct tap_priv *priv; + if (cb == NULL) { + WPRINTF(("TAP backend requires non-NULL callback\n")); + return -1; + } + priv = calloc(1, sizeof(struct tap_priv)); if (priv == NULL) { WPRINTF(("tap_priv alloc failed\n")); @@ -559,7 +564,7 @@ const char *ndname = "/dev/netmap"; struct netmap_priv *priv = NULL; struct nmreq req; - int ptnetmap = 0; + int ptnetmap = (cb == NULL); priv = calloc(1, sizeof(struct netmap_priv)); if (priv == NULL) { Modified: soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c ============================================================================== --- soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c Fri Aug 5 14:09:12 2016 (r307236) +++ soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c Fri Aug 5 14:11:23 2016 (r307237) @@ -340,7 +340,8 @@ net_genmac(pi, macaddr); } - /* Initialize backend. */ + /* Initialize backend. A NULL callback is used here to tell + * the ask the netmap backend to use ptnetmap. */ sc->be = netbe_init(devname, NULL, sc); if (!sc->be) { fprintf(stderr, "net backend initialization failed\n");