From c232c8f7c34280780aa153ffc6efa643898cbe7e Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Wed, 6 Jul 2016 11:01:55 +0200 Subject: adapt packaging to the import of 16.07-rc1 This includes dropping already accepted and forward-porting the other patches. Change-Id: I10fc222d49c99b20b23fe8bd8882b2e555259823 Signed-off-by: Christian Ehrhardt --- ...eak-when-adding-removing-vhost_user-ports.patch | 63 ---------------------- 1 file changed, 63 deletions(-) delete mode 100644 debian/patches/ubuntu-backport-38-dpdk-dev-Memory-leak-when-adding-removing-vhost_user-ports.patch (limited to 'debian/patches/ubuntu-backport-38-dpdk-dev-Memory-leak-when-adding-removing-vhost_user-ports.patch') diff --git a/debian/patches/ubuntu-backport-38-dpdk-dev-Memory-leak-when-adding-removing-vhost_user-ports.patch b/debian/patches/ubuntu-backport-38-dpdk-dev-Memory-leak-when-adding-removing-vhost_user-ports.patch deleted file mode 100644 index b756d8ff..00000000 --- a/debian/patches/ubuntu-backport-38-dpdk-dev-Memory-leak-when-adding-removing-vhost_user-ports.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: backport of dpdk 16.07 fix for LP: #1570466 - -Backported from this discussion -http://dpdk.org/dev/patchwork/patch/12103/ -Not accepted yet, but likely to be accepted in some form once tested and -confirmed. - -Update 2016-05-17: -Moving to 16.04 this now applies as-is without modifications, dropping the -former backport changes. - -Also along the discussion vserver-fh is now initialized with -1 to avoid -accidentially deleting the first connected port if we delete another not yet -connected port. - -Forwarded: yes (based on an upstream discussion) -Author: Christian Ehrhardt -Last-Update: 2016-05-17 - -Index: dpdk/lib/librte_vhost/vhost_user/vhost-net-user.c -=================================================================== ---- dpdk.orig/lib/librte_vhost/vhost_user/vhost-net-user.c -+++ dpdk/lib/librte_vhost/vhost_user/vhost-net-user.c -@@ -310,6 +310,7 @@ vserver_new_vq_conn(int fd, void *dat, _ - } - - vdev_ctx.fh = fh; -+ vserver->fh = fh; - size = strnlen(vserver->path, PATH_MAX); - vhost_set_ifname(vdev_ctx, vserver->path, - size); -@@ -486,6 +487,7 @@ rte_vhost_driver_register(const char *pa - } - - vserver->path = strdup(path); -+ vserver->fh = -1; - - ret = fdset_add(&g_vhost_server.fdset, vserver->listenfd, - vserver_new_vq_conn, NULL, vserver); -@@ -520,6 +522,11 @@ rte_vhost_driver_unregister(const char * - - for (i = 0; i < g_vhost_server.vserver_cnt; i++) { - if (!strcmp(g_vhost_server.server[i]->path, path)) { -+ struct vhost_device_ctx ctx; -+ -+ ctx.fh = g_vhost_server.server[i]->fh; -+ vhost_destroy_device(ctx); -+ - fdset_del(&g_vhost_server.fdset, - g_vhost_server.server[i]->listenfd); - -Index: dpdk/lib/librte_vhost/vhost_user/vhost-net-user.h -=================================================================== ---- dpdk.orig/lib/librte_vhost/vhost_user/vhost-net-user.h -+++ dpdk/lib/librte_vhost/vhost_user/vhost-net-user.h -@@ -43,6 +43,7 @@ - struct vhost_server { - char *path; /**< The path the uds is bind to. */ - int listenfd; /**< The listener sockfd. */ -+ uint32_t fh; - }; - - /* refer to hw/virtio/vhost-user.c */ -- cgit 1.2.3-korg