Date: Fri, 5 Aug 2016 14:19:29 GMT From: vincenzo@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r307244 - soc2016/vincenzo/head/usr.sbin/bhyve Message-ID: <201608051419.u75EJT9g025404@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608051419.u75EJT9g025404>