Directly pass NULL in cases where we report an error if script or downscript are set.
Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]> Tested-by: Lei Yang <[email protected]> Reviewed-by: Maksim Davydov <[email protected]> --- net/tap.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/net/tap.c b/net/tap.c index b1b64c508d..a05cc7ef64 100644 --- a/net/tap.c +++ b/net/tap.c @@ -800,8 +800,6 @@ int net_init_tap(const Netdev *netdev, const char *name, const NetdevTapOptions *tap; int fd, vnet_hdr = 0, i = 0, queues; /* for the no-fd, no-helper case */ - const char *script; - const char *downscript; Error *err = NULL; const char *vhostfdname; char ifname[128]; @@ -811,8 +809,6 @@ int net_init_tap(const Netdev *netdev, const char *name, tap = &netdev->u.tap; queues = tap->has_queues ? tap->queues : 1; vhostfdname = tap->vhostfd; - script = tap->script; - downscript = tap->downscript; /* QEMU hubs do not support multiqueue tap, in this case peer is set. * For -netdev, peer is always NULL. */ @@ -853,7 +849,7 @@ int net_init_tap(const Netdev *netdev, const char *name, } net_init_tap_one(tap, peer, "tap", name, NULL, - script, downscript, + NULL, NULL, vhostfdname, vnet_hdr, fd, &err); if (err) { error_propagate(errp, err); @@ -914,7 +910,7 @@ int net_init_tap(const Netdev *netdev, const char *name, } net_init_tap_one(tap, peer, "tap", name, ifname, - script, downscript, + NULL, NULL, tap->vhostfds ? vhost_fds[i] : NULL, vnet_hdr, fd, &err); if (err) { @@ -959,7 +955,7 @@ free_fail: } net_init_tap_one(tap, peer, "bridge", name, ifname, - script, downscript, vhostfdname, + NULL, NULL, vhostfdname, vnet_hdr, fd, &err); if (err) { error_propagate(errp, err); @@ -967,6 +963,8 @@ free_fail: return -1; } } else { + const char *script = tap->script; + const char *downscript = tap->downscript; g_autofree char *default_script = NULL; g_autofree char *default_downscript = NULL; bool vnet_hdr_required = tap->has_vnet_hdr && tap->vnet_hdr; -- 2.48.1
