This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, devel/native-drivers has been updated via 4645f4b19eb5cb596fc503559f755c034f601792 (commit) via f112c9fb8487e819d064bfb03ea98429fd98ee19 (commit) via 7074b71b266de9c4eb5bf03513186a72ea27b2bc (commit) via 69b652f16d08a7d45169ce224a8a9efe03dd20e4 (commit) via 4477da1a8ef61cff56b021dc8bf28bfde40ee8ba (commit) from 4bd608048e6fa77d3154b8d90b85fc2b66c6bf1a (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 4645f4b19eb5cb596fc503559f755c034f601792 Author: Josep Puigdemont josep.puigdemont@linaro.org Date: Mon Nov 27 11:39:56 2017 +0100
virtio: use macros to allocate private data
Signed-off-by: Josep Puigdemont josep.puigdemont@linaro.org
diff --git a/platform/linux-generic/pktio/virtio.c b/platform/linux-generic/pktio/virtio.c index ddeb46f1..bb2b814c 100644 --- a/platform/linux-generic/pktio/virtio.c +++ b/platform/linux-generic/pktio/virtio.c @@ -50,6 +50,10 @@ static int virtio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, if (strncmp(devname, PCI_PKTIO_PREFIX, PCI_PKTIO_PREFIX_LEN)) return -1;
+ virtio_entry = ODP_OPS_DATA_ALLOC(sizeof(*virtio_entry)); + if (virtio_entry == NULL) + return -2; + pci_device = devname + PCI_PKTIO_PREFIX_LEN;
ODP_PRINT("virtio_open: %s\n", pci_device); @@ -58,27 +62,39 @@ static int virtio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, if (pci_dev == NULL) { ODP_ERR("pci: could not open PCI device %s as a VirtIO device\n", pci_device); + ODP_OPS_DATA_FREE(virtio_entry); return -1; }
if (virtio_pci_init(pci_dev)) { ODP_ERR("virtio: Could not open device %s\n", devname); pci_close_device(pci_dev); + ODP_OPS_DATA_FREE(virtio_entry); return -1; }
- virtio_entry = odp_ops_data(pktio_entry, virtio); memset(virtio_entry, 0, sizeof(pktio_ops_virtio_data_t)); snprintf(virtio_entry->name, sizeof(virtio_entry->name), "virtio_%u", dev_id++); + virtio_entry->pci_dev = pci_dev; + + pktio_entry->s.ops_data = virtio_entry;
ODP_PRINT("virtio: opened %s\n", virtio_entry->name);
return 0; }
-static int virtio_close(pktio_entry_t *pktio_entry ODP_UNUSED) +static int virtio_close(pktio_entry_t *pktio_entry) { + pktio_ops_virtio_data_t *virtio_entry = pktio_entry->s.ops_data; + + if (virtio_entry == NULL) + return 0; + + pci_close_device(virtio_entry->pci_dev); + ODP_OPS_DATA_FREE(virtio_entry); + return 0; }
commit f112c9fb8487e819d064bfb03ea98429fd98ee19 Merge: 4bd60804 7074b71b Author: Josep Puigdemont josep.puigdemont@linaro.org Date: Mon Nov 27 11:04:17 2017 +0100
Merge remote-tracking branch 'origin/2.0' into devel/native-drivers
-----------------------------------------------------------------------
Summary of changes: example/ddf_ifs/ddf_ifs_enumr_dpdk.c | 4 +- example/ddf_ifs/ddf_ifs_enumr_generic.c | 4 +- include/odp/drv/spec/driver.h | 10 ++- platform/linux-dpdk/Makefile.am | 3 + platform/linux-dpdk/pktio/dpdk.c | 57 ++++++--------- platform/linux-generic/Makefile.am | 3 + platform/linux-generic/drv_driver.c | 4 +- .../linux-generic/include/odp_packet_io_internal.h | 4 +- .../{odp/drv/hints.h => odp_packet_io_pool.h} | 19 ++--- .../include/odp_packet_io_pool_access.h | 58 +++++++++++++++ .../include/odp_pktio_ops_subsystem.h | 8 +-- platform/linux-generic/odp_packet_io.c | 9 +++ platform/linux-generic/odp_packet_io_pool.c | 55 ++++++++++++++ platform/linux-generic/pktio/dpdk.c | 75 ++++++++----------- platform/linux-generic/pktio/ipc.c | 41 +++++++---- platform/linux-generic/pktio/loopback.c | 40 +++++++---- platform/linux-generic/pktio/netmap.c | 83 ++++++++++------------ platform/linux-generic/pktio/pcap.c | 26 ++++--- platform/linux-generic/pktio/socket.c | 58 +++++++-------- platform/linux-generic/pktio/socket_mmap.c | 58 +++++++-------- platform/linux-generic/pktio/tap.c | 46 +++++++----- platform/linux-generic/pktio/virtio.c | 20 +++++- test/validation/drv/drvdriver/drvdriver_device.c | 11 +-- test/validation/drv/drvdriver/drvdriver_driver.c | 18 ++--- test/validation/drv/drvdriver/drvdriver_enumr.c | 52 ++++++++------ 25 files changed, 469 insertions(+), 297 deletions(-) copy platform/linux-generic/include/{odp/drv/hints.h => odp_packet_io_pool.h} (51%) create mode 100644 platform/linux-generic/include/odp_packet_io_pool_access.h create mode 100644 platform/linux-generic/odp_packet_io_pool.c
hooks/post-receive