From owner-svn-soc-all@freebsd.org Fri Aug 5 14:06:11 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 60E8ABB04E7 for ; Fri, 5 Aug 2016 14:06:11 +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 3AE7419C7 for ; Fri, 5 Aug 2016 14:06:11 +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 u75E6BH0001009 for ; Fri, 5 Aug 2016 14:06:11 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u75E6AaN000991 for svn-soc-all@FreeBSD.org; Fri, 5 Aug 2016 14:06:10 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 5 Aug 2016 14:06:10 GMT Message-Id: <201608051406.u75E6AaN000991@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: r307232 - 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:06:11 -0000 Author: vincenzo Date: Fri Aug 5 14:06:09 2016 New Revision: 307232 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307232 Log: bhyve: net_backends: fix get_ptnetmap implementation 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:05:23 2016 (r307231) +++ soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c Fri Aug 5 14:06:09 2016 (r307232) @@ -445,8 +445,9 @@ { struct netmap_priv *priv; - /* Check that this is a netmap backend. */ - if (!be || be->set_cap != netmap_set_cap) { + /* Check that this is a ptnetmap backend. */ + if (!be || be->set_cap != netmap_set_cap || + !(priv->nmd->req.nr_flags & NR_PTNETMAP_HOST)) { return NULL; } @@ -613,11 +614,11 @@ goto err; } + priv->ptnetmap.netmap_priv = priv; + priv->ptnetmap.features = NET_PTN_FEATURES_BASE; + priv->ptnetmap.acked_features = 0; + priv->ptnetmap.running = 0; if (ptnetmap) { - priv->ptnetmap.netmap_priv = priv; - priv->ptnetmap.features = NET_PTN_FEATURES_BASE; - priv->ptnetmap.acked_features = 0; - priv->ptnetmap.running = 0; if (netmap_has_vnet_hdr_len(be, VNET_HDR_LEN)) { priv->ptnetmap.features |= NET_PTN_FEATURES_VNET_HDR; } 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:05:23 2016 (r307231) +++ soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c Fri Aug 5 14:06:09 2016 (r307232) @@ -367,7 +367,6 @@ /* Initialize registers and data structures. */ memset(sc->ioregs, 0, sizeof(sc->ioregs)); sc->csb = NULL; - sc->ptbe = NULL; sc->ioregs[PTNET_IO_MAC_HI >> 2] = (macaddr[0] << 8) | macaddr[1]; sc->ioregs[PTNET_IO_MAC_LO >> 2] = (macaddr[2] << 24) | (macaddr[3] << 16) |