Commit dd6709b851 for qemu.org

commit dd6709b851d7bd2119963e256fad53fdcda2ebde
Author: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Date:   Thu Oct 30 19:40:19 2025 +0300

    net/tap: pass NULL to net_init_tap_one() in cases when scripts are NULL

    Directly pass NULL in cases where we report an error if script or
    downscript are set.

    Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
    Reviewed-by: Maksim Davydov <davydov-max@yandex-team.ru>
    Signed-off-by: Jason Wang <jasowang@redhat.com>

diff --git a/net/tap.c b/net/tap.c
index abeee6be11..8182f39851 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -807,8 +807,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];
@@ -818,8 +816,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. */
@@ -860,7 +856,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);
@@ -921,7 +917,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) {
@@ -966,7 +962,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);
@@ -974,6 +970,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;
         if (tap->vhostfds) {