aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches/fix-vhost-user-socket-permission.patch
diff options
context:
space:
mode:
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>2017-08-23 11:34:26 +0200
committerChristian Ehrhardt <christian.ehrhardt@canonical.com>2017-08-23 13:53:33 +0200
commit2b5cfa5c30b4680cfc37c9cd7389bf033218cce1 (patch)
tree2f6e975d5faa0a4352ae76ceaf5144566627f8f9 /debian/patches/fix-vhost-user-socket-permission.patch
parentf3aeb45f64dec435045d087c67c52a5c6c2291f2 (diff)
Fix d/p/fix-vhost-user-socket-permission.patch
- add accidenitally dropped create_unix_socket call - reposition rte_eal_set_socket_permissions to match 17.05 handling of vhost-user server sockets (and their late binding) Change-Id: If953b94250ad1c4e9c5f60fef629afd5569ce7b8 Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'debian/patches/fix-vhost-user-socket-permission.patch')
-rw-r--r--debian/patches/fix-vhost-user-socket-permission.patch20
1 files changed, 12 insertions, 8 deletions
diff --git a/debian/patches/fix-vhost-user-socket-permission.patch b/debian/patches/fix-vhost-user-socket-permission.patch
index fb2bd5d9..932da857 100644
--- a/debian/patches/fix-vhost-user-socket-permission.patch
+++ b/debian/patches/fix-vhost-user-socket-permission.patch
@@ -33,9 +33,14 @@ Fixes LP: #1546565
- But until that is fully working we have to carry the workaround.
- Updated to work with Openvswitch 2.7 (and backward compatible to 2.6)
+*Update*
+ - in 17.05 the patch now needs to be hooked up on a different place in vhost
+ socket.c
+ - also the former rebase dropped a create socket call which is now restored
+
Forwarded: yes
Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2017-05-23
+Last-Update: 2017-08-23
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -355,12 +360,11 @@ Last-Update: 2017-05-23
#define MAX_VIRTIO_BACKLOG 128
static void vhost_user_server_new_connection(int fd, void *data, int *remove);
-@@ -644,7 +646,7 @@ rte_vhost_driver_register(const char *pa
- } else {
- vsocket->is_server = true;
+@@ -348,6 +350,7 @@ vhost_user_start_server(struct vhost_use
+ goto err;
}
-- ret = create_unix_socket(vsocket);
+
+ rte_eal_set_socket_permissions(path);
- if (ret < 0) {
- free(vsocket->path);
- free(vsocket);
+ return 0;
+
+ err: