All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, richard.henderson@linaro.org,
	peter.maydell@linaro.org
Cc: Laurent Vivier <lvivier@redhat.com>, Jason Wang <jasowang@redhat.com>
Subject: [PULL 11/15] net: socket: prepare to cleanup net_init_socket()
Date: Fri,  7 Jul 2023 05:06:24 -0400	[thread overview]
Message-ID: <20230707090628.2210346-12-jasowang@redhat.com> (raw)
In-Reply-To: <20230707090628.2210346-1-jasowang@redhat.com>

From: Laurent Vivier <lvivier@redhat.com>

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

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/socket.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index ba6e5b0..24dcaa5 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.7.4



  parent reply	other threads:[~2023-07-07  9:08 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-07  9:06 [PULL 00/15] Net patches Jason Wang
2023-07-07  9:06 ` [PULL 01/15] virtio-net: correctly report maximum tx_queue_size value Jason Wang
2023-07-07  9:06 ` [PULL 02/15] hw/net: e1000: Remove the logic of padding short frames in the receive path Jason Wang
2023-07-07  9:06 ` [PULL 03/15] hw/net: vmxnet3: " Jason Wang
2023-07-07  9:06 ` [PULL 04/15] hw/net: i82596: " Jason Wang
2023-07-07  9:06 ` [PULL 05/15] hw/net: ne2000: " Jason Wang
2023-07-07  9:06 ` [PULL 06/15] hw/net: pcnet: " Jason Wang
2023-07-07  9:06 ` [PULL 07/15] hw/net: rtl8139: " Jason Wang
2023-07-07  9:06 ` [PULL 08/15] hw/net: sungem: " Jason Wang
2023-07-07  9:06 ` [PULL 09/15] hw/net: sunhme: " Jason Wang
2023-07-07  9:06 ` [PULL 10/15] hw/net: ftgmac100: Drop the small packet check " Jason Wang
2023-07-07  9:06 ` Jason Wang [this message]
2023-07-07  9:06 ` [PULL 12/15] net: socket: move fd type checking to its own function Jason Wang
2023-07-07  9:06 ` [PULL 13/15] net: socket: remove net_init_socket() Jason Wang
2023-07-07  9:06 ` [PULL 14/15] e1000e: Add ICR clearing by corresponding IMS bit Jason Wang
2023-07-07  9:06 ` [PULL 15/15] igb: Remove obsolete workaround for Windows Jason Wang
2023-07-07 19:20 ` [PULL 00/15] Net patches Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230707090628.2210346-12-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.