From owner-svn-soc-all@freebsd.org Fri Aug 5 14:19:30 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 15384BB0BF1 for ; Fri, 5 Aug 2016 14:19:30 +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 056EF16CC for ; Fri, 5 Aug 2016 14:19:30 +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 u75EJTkM025407 for ; Fri, 5 Aug 2016 14:19:29 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u75EJT9g025404 for svn-soc-all@FreeBSD.org; Fri, 5 Aug 2016 14:19:29 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 5 Aug 2016 14:19:29 GMT Message-Id: <201608051419.u75EJT9g025404@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: r307244 - 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:19:30 -0000 Author: vincenzo Date: Fri Aug 5 14:19:28 2016 New Revision: 307244 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307244 Log: bhyve: ptnet: use a cookie dependent on MAC address Modified: soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c 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:18:44 2016 (r307243) +++ soc2016/vincenzo/head/usr.sbin/bhyve/pci_ptnetmap_netif.c Fri Aug 5 14:19:28 2016 (r307244) @@ -119,7 +119,7 @@ for (i = 0; i < sc->num_rings; i++, kick_addr += 4) { struct msix_table_entry *mte; - void *cookie = ((void*)sc) + 4*i; + uint64_t cookie = sc->ioregs[PTNET_IO_MAC_LO >> 2] + 4*i; cfg->entries[i].irqfd = vm_get_fd(vmctx); cfg->entries[i].ioctl.com = VM_LAPIC_MSI; @@ -130,12 +130,12 @@ fprintf(stderr, "%s: vector %u, addr %lu, data %u, " "kick_addr %u, cookie: %p\n", __func__, i, mte->addr, mte->msg_data, kick_addr, - cookie); + (void*)cookie); ret = vm_io_reg_handler(vmctx, kick_addr /* ioaddr */, 0 /* in */, 0 /* mask_data */, 0 /* data */, VM_IO_REGH_KWEVENTS, - cookie /* cookie */); + (void*)cookie /* cookie */); if (ret) { fprintf(stderr, "%s: vm_io_reg_handler %d\n", __func__, ret);