Use directly net_socket_fd_init_stream() and net_socket_fd_init_dgram()
when the socket type is already known.

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 net/socket.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index ba6e5b0b0035..24dcaa55bc46 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -587,7 +587,7 @@ static int net_socket_connect_init(NetClientState *peer,
             break;
         }
     }
-    s = net_socket_fd_init(peer, model, name, fd, connected, NULL, errp);
+    s = net_socket_fd_init_stream(peer, model, name, fd, connected);
     if (!s) {
         return -1;
     }
@@ -629,7 +629,7 @@ static int net_socket_mcast_init(NetClientState *peer,
         return -1;
     }
 
-    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
+    s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
     if (!s) {
         return -1;
     }
@@ -683,7 +683,7 @@ static int net_socket_udp_init(NetClientState *peer,
     }
     qemu_socket_set_nonblock(fd);
 
-    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
+    s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
     if (!s) {
         return -1;
     }
-- 
2.39.2

On Fri,  9 Jun 2023 09:27:46 +0200
Laurent Vivier <lvivier@redhat.com> wrote:

> Use directly net_socket_fd_init_stream() and net_socket_fd_init_dgram()
> when the socket type is already known.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

This makes sense as a clean up regardless of the rest of the series.

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>


> ---
>  net/socket.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/net/socket.c b/net/socket.c
> index ba6e5b0b0035..24dcaa55bc46 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -587,7 +587,7 @@ static int net_socket_connect_init(NetClientState *peer,
>              break;
>          }
>      }
> -    s = net_socket_fd_init(peer, model, name, fd, connected, NULL, errp);
> +    s = net_socket_fd_init_stream(peer, model, name, fd, connected);
>      if (!s) {
>          return -1;
>      }
> @@ -629,7 +629,7 @@ static int net_socket_mcast_init(NetClientState *peer,
>          return -1;
>      }
>  
> -    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
> +    s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
>      if (!s) {
>          return -1;
>      }
> @@ -683,7 +683,7 @@ static int net_socket_udp_init(NetClientState *peer,
>      }
>      qemu_socket_set_nonblock(fd);
>  
> -    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
> +    s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
>      if (!s) {
>          return -1;
>      }
> -- 
> 2.39.2
> 


-- 
David Gibson <dgibson@redhat.com>
Principal Software Engineer, Virtualization, Red Hat