[PATCH v2 04/20] net/tap: net_init_tap_one(): drop extra error propagation

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

diff --git a/net/tap.c b/net/tap.c
index 0258ac8574..58c3318b1c 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -698,7 +698,6 @@ static int 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;
 
@@ -734,9 +733,8 @@ static int 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 (!set_fd_nonblocking(vhostfd, vhostfdname, errp)) {
-- 
2.48.1