[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/4] net: ensure "socket" backend uses non-block
From: |
Stefan Hajnoczi |
Subject: |
Re: [Qemu-devel] [PATCH 1/4] net: ensure "socket" backend uses non-blocking fds |
Date: |
Wed, 27 Mar 2013 07:36:46 +0100 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Tue, Mar 26, 2013 at 05:25:50PM +0100, Juan Quintela wrote:
> Stefan Hajnoczi <address@hidden> wrote:
> > There are several code paths in net_init_socket() depending on how the
> > socket is created: file descriptor passing, UDP multicast, TCP, or UDP.
> > Some of these support both listen and connect.
> >
> > Not all code paths set the socket to non-blocking. This patch addresses
> > the file descriptor passing and UDP cases which were missing
> > socket_set_nonblock(fd) calls.
> >
> > I considered moving socket_set_nonblock(fd) to a central location but it
> > turns out the code paths are different enough to require non-blocking at
> > different places.
> >
> > Signed-off-by: Stefan Hajnoczi <address@hidden>
> > ---
> > net/socket.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/net/socket.c b/net/socket.c
> > index 6c3752b..4a88142 100644
> > --- a/net/socket.c
> > +++ b/net/socket.c
> > @@ -674,6 +674,7 @@ static int net_socket_udp_init(NetClientState *peer,
> > closesocket(fd);
> > return -1;
> > }
> > + socket_set_nonblock(fd);
> >
> > s = net_socket_fd_init(peer, model, name, fd, 0);
> > if (!s) {
> > @@ -712,6 +713,7 @@ int net_init_socket(const NetClientOptions *opts, const
> > char *name,
> > int fd;
> >
> > fd = monitor_handle_fd_param(cur_mon, sock->fd);
> > + socket_set_nonblock(fd);
> > if (fd == -1 || !net_socket_fd_init(peer, "socket", name, fd, 1)) {
>
> Shouldn't be better to refactor the code to _not_ call
> socket_set_nonblock() in the case that fd == -1? It will just clobber
> errno?
I'll send a fixed version.
Stefan
- [Qemu-devel] [PATCH 2/4] qemu-socket: set passed fd non-blocking in socket_connect(), (continued)
- [Qemu-devel] [PATCH 2/4] qemu-socket: set passed fd non-blocking in socket_connect(), Stefan Hajnoczi, 2013/03/26
- [Qemu-devel] [PATCH 4/4] chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors, Stefan Hajnoczi, 2013/03/26
- [Qemu-devel] [PATCH 1/4] net: ensure "socket" backend uses non-blocking fds, Stefan Hajnoczi, 2013/03/26
- [Qemu-devel] [PATCH 3/4] oslib-posix: rename socket_set_nonblock() to qemu_set_nonblock(), Stefan Hajnoczi, 2013/03/26
- Re: [Qemu-devel] [PATCH 0/4] monitor: do not rely on O_NONBLOCK for passed file descriptors, liu ping fan, 2013/03/27