From owner-svn-soc-all@freebsd.org Fri Aug 5 14:20:35 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 1FC0DBB0C1C for ; Fri, 5 Aug 2016 14:20:35 +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 104171714 for ; Fri, 5 Aug 2016 14:20:35 +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 u75EKYPe027270 for ; Fri, 5 Aug 2016 14:20:34 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u75EKXSU027230 for svn-soc-all@FreeBSD.org; Fri, 5 Aug 2016 14:20:33 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 5 Aug 2016 14:20:33 GMT Message-Id: <201608051420.u75EKXSU027230@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: r307245 - 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:20:35 -0000 Author: vincenzo Date: Fri Aug 5 14:20:32 2016 New Revision: 307245 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307245 Log: bhyve: include netmap_virt.h from the netmap public headers Modified: soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.h soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_memdev.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:19:28 2016 (r307244) +++ soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.c Fri Aug 5 14:20:32 2016 (r307245) @@ -487,7 +487,7 @@ struct nmreq req; int err; - if (!(ptn->acked_features & NET_PTN_FEATURES_BASE)) { + if (!(ptn->acked_features & PTNETMAP_F_BASE)) { fprintf(stderr, "%s: ptnetmap features not acked\n", __func__); return EINVAL; @@ -585,12 +585,12 @@ be->priv = priv; priv->ptnetmap.netmap_priv = priv; - priv->ptnetmap.features = NET_PTN_FEATURES_BASE; + priv->ptnetmap.features = PTNETMAP_F_BASE; priv->ptnetmap.acked_features = 0; priv->ptnetmap.running = 0; if (ptnetmap) { if (netmap_has_vnet_hdr_len(be, VNET_HDR_LEN)) { - priv->ptnetmap.features |= NET_PTN_FEATURES_VNET_HDR; + priv->ptnetmap.features |= PTNETMAP_F_VNET_HDR; } /* XXX Call ptn_memdev_attach() here or in get_ptnetmap ? */ ptn_memdev_attach(priv->nmd->mem, priv->nmd->memsize, Modified: soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.h ============================================================================== --- soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.h Fri Aug 5 14:19:28 2016 (r307244) +++ soc2016/vincenzo/head/usr.sbin/bhyve/net_backends.h Fri Aug 5 14:20:32 2016 (r307245) @@ -29,7 +29,7 @@ #include #include -#include +#include #include "mevent.h" extern int netmap_ioctl_counter; Modified: soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_memdev.c ============================================================================== --- soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_memdev.c Fri Aug 5 14:19:28 2016 (r307244) +++ soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_memdev.c Fri Aug 5 14:20:32 2016 (r307245) @@ -34,7 +34,7 @@ #include /* IFNAMSIZ */ #include -#include +#include #include #include @@ -311,7 +311,7 @@ } struct pci_devemu pci_de_ptnetmap = { - .pe_emu = PTN_MEMDEV_NAME, + .pe_emu = PTNETMAP_MEMDEV_NAME, .pe_init = ptn_memdev_init, .pe_barwrite = ptn_pci_write, .pe_barread = ptn_pci_read 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:19:28 2016 (r307244) +++ soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c Fri Aug 5 14:20:32 2016 (r307245) @@ -35,7 +35,7 @@ #include /* IFNAMSIZ */ #include -#include +#include #include #include @@ -173,21 +173,21 @@ int ret = EINVAL; switch (cmd) { - case NET_PARAVIRT_PTCTL_CONFIG: + case PTNETMAP_PTCTL_CONFIG: fprintf(stderr, "Ignoring deprecated CONFIG PTCTL\n"); break; - case NET_PARAVIRT_PTCTL_REGIF: + case PTNETMAP_PTCTL_REGIF: /* Emulate a REGIF for the guest. */ ret = ptnet_regif(sc); break; - case NET_PARAVIRT_PTCTL_UNREGIF: + case PTNETMAP_PTCTL_UNREGIF: /* Emulate an UNREGIF for the guest. */ ret = ptnet_unregif(sc); break; - case NET_PARAVIRT_PTCTL_HOSTMEMID: + case PTNETMAP_PTCTL_HOSTMEMID: ret = ptnetmap_get_hostmemid(sc->ptbe); break;