[PATCH v4 3/8] net/tap: net_init_tap_one(): drop extra error propagation

Vladimir Sementsov-Ogievskiy posted 8 patches 2 weeks, 3 days ago
Maintainers: Jason Wang <jasowang@redhat.com>
There is a newer version of this series
[PATCH v4 3/8] net/tap: net_init_tap_one(): drop extra error propagation
Posted by Vladimir Sementsov-Ogievskiy 2 weeks, 3 days ago
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Tested-by: Lei Yang <leiyang@redhat.com>
---
 net/tap.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/tap.c b/net/tap.c
index 2ffd8c9907..49d4a29beb 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -686,7 +686,6 @@ static bool net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
                              const char *downscript, const char *vhostfdname,
                              int vnet_hdr, int fd, Error **errp)
 {
-    Error *err = NULL;
     TAPState *s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
     int vhostfd;
 
@@ -728,9 +727,8 @@ static bool net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
         }
 
         if (vhostfdname) {
-            vhostfd = monitor_fd_param(monitor_cur(), vhostfdname, &err);
+            vhostfd = monitor_fd_param(monitor_cur(), vhostfdname, errp);
             if (vhostfd == -1) {
-                error_propagate(errp, err);
                 goto failed;
             }
             if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) {
-- 
2.48.1