From owner-svn-soc-all@freebsd.org Thu Aug 13 15:37:06 2015 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 5D3489A0CEA for ; Thu, 13 Aug 2015 15:37:06 +0000 (UTC) (envelope-from stefano@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 382E39DF for ; Thu, 13 Aug 2015 15:37:06 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7DFb6BE007054 for ; Thu, 13 Aug 2015 15:37:06 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7DFb3pp006968 for svn-soc-all@FreeBSD.org; Thu, 13 Aug 2015 15:37:03 GMT (envelope-from stefano@FreeBSD.org) Date: Thu, 13 Aug 2015 15:37:03 GMT Message-Id: <201508131537.t7DFb3pp006968@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289697 - in soc2015/stefano/ptnetmap/stable/10: sys/dev/netmap 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.20 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: Thu, 13 Aug 2015 15:37:06 -0000 Author: stefano Date: Thu Aug 13 15:37:03 2015 New Revision: 289697 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289697 Log: ptnetmap: fix PTNETMAP_IO_SIZE macro Modified: soc2015/stefano/ptnetmap/stable/10/sys/dev/netmap/netmap_mem2.c soc2015/stefano/ptnetmap/stable/10/sys/dev/netmap/netmap_virt.h soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/Makefile soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_ptnetmap_memdev.c soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_virtio_net.c soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_virtio_ptnetmap.h Modified: soc2015/stefano/ptnetmap/stable/10/sys/dev/netmap/netmap_mem2.c ============================================================================== --- soc2015/stefano/ptnetmap/stable/10/sys/dev/netmap/netmap_mem2.c Thu Aug 13 14:53:29 2015 (r289696) +++ soc2015/stefano/ptnetmap/stable/10/sys/dev/netmap/netmap_mem2.c Thu Aug 13 15:37:03 2015 (r289697) @@ -1997,7 +1997,7 @@ error = ENOMEM; goto err; } - /* map memory through ptnemtap-memdev BAR */ + /* map memory through ptnetmap-memdev BAR */ error = nm_os_pt_memdev_iomap(pv->ptn_dev, &pv->nm_paddr, &pv->nm_addr); if (error) goto err; Modified: soc2015/stefano/ptnetmap/stable/10/sys/dev/netmap/netmap_virt.h ============================================================================== --- soc2015/stefano/ptnetmap/stable/10/sys/dev/netmap/netmap_virt.h Thu Aug 13 14:53:29 2015 (r289696) +++ soc2015/stefano/ptnetmap/stable/10/sys/dev/netmap/netmap_virt.h Thu Aug 13 15:37:03 2015 (r289697) @@ -211,8 +211,8 @@ /* 32 bit w/o */ #define PTNETMAP_VIRTIO_IO_CSBBAL 16 /* CSB Base Address Low */ -#define PTNEMTAP_VIRTIO_IO_SIZE 20 -#define PTNEMTAP_VIRTIO_IO_SIZE_32 5 +#define PTNETMAP_VIRTIO_IO_SIZE 20 +#define PTNETMAP_VIRTIO_IO_SIZE_32 5 #endif /* NETMAP_VIRT_CSB */ @@ -242,7 +242,7 @@ */ /* 16 bit r/o */ #define PTNETMAP_IO_PCI_HOSTID 8 /* memory allocator ID in netmap host */ -#define PTNEMTAP_IO_SIZE 10 +#define PTNETMAP_IO_SIZE 10 /* * ptnetmap configuration Modified: soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/Makefile ============================================================================== --- soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/Makefile Thu Aug 13 14:53:29 2015 (r289696) +++ soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/Makefile Thu Aug 13 15:37:03 2015 (r289697) @@ -4,7 +4,7 @@ PROG= bhyve -DEBUG_FLAGS= -g -O0 +DEBUG_FLAGS= -g -O0 MAN= bhyve.8 @@ -45,7 +45,14 @@ .PATH: ${.CURDIR}/../../sys/amd64/vmm SRCS+= vmm_instruction_emul.c -CFLAGS = -I${.CURDIR}/../../sys +.ifdef CROSS_BUILD +BASEDIR=/home/stefano/repos +S=${BASEDIR}/freebsd +M=${BASEDIR}/obj_head${S}/tmp/usr +.PATH: ${S}/sys/amd64/vmm +CFLAGS = -I${BASEDIR}/netmap/sys -I${M}/include -I/${S}/sys -L${M}/lib +.endif + DPADD= ${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD} LDADD= -lvmmapi -lmd -lutil -lpthread Modified: soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_ptnetmap_memdev.c ============================================================================== --- soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_ptnetmap_memdev.c Thu Aug 13 14:53:29 2015 (r289696) +++ soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_ptnetmap_memdev.c Thu Aug 13 15:37:03 2015 (r289697) @@ -220,7 +220,7 @@ /* alloc IO-BAR */ ret = pci_emul_alloc_bar(sc->pi, PTNETMAP_IO_PCI_BAR, PCIBAR_IO, - PTNEMTAP_IO_SIZE); + PTNETMAP_IO_SIZE); if (ret) { printf("ptnetmap_memdev: iobar allocation error %d\n", ret); return ret; Modified: soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_virtio_net.c ============================================================================== --- soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_virtio_net.c Thu Aug 13 14:53:29 2015 (r289696) +++ soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_virtio_net.c Thu Aug 13 15:37:03 2015 (r289697) @@ -141,7 +141,7 @@ struct ptnetmap_cfg cfg; /* ptnetmap configuration */ /* ptnetmap register */ - uint8_t reg[PTNEMTAP_VIRTIO_IO_SIZE]; + uint8_t reg[PTNETMAP_VIRTIO_IO_SIZE]; }; #endif /* Modified: soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_virtio_ptnetmap.h ============================================================================== --- soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_virtio_ptnetmap.h Thu Aug 13 14:53:29 2015 (r289696) +++ soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/pci_virtio_ptnetmap.h Thu Aug 13 15:37:03 2015 (r289697) @@ -107,7 +107,7 @@ } /* extend cfgsize. virtio creates PCIBAR for us */ - vc->vc_cfgsize += PTNEMTAP_VIRTIO_IO_SIZE; + vc->vc_cfgsize += PTNETMAP_VIRTIO_IO_SIZE; } /*