[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/27] slirp: replace qemu_set_nonblock()
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 09/27] slirp: replace qemu_set_nonblock() |
Date: |
Thu, 17 Jan 2019 15:43:41 +0400 |
Replace qemu_set_nonblock() with slirp_set_nonblock()
qemu_set_nonblock() does some event registration with the main
loop. Add a new callback register_poll_fd() for that reason.
Always build the fd-register stub, to avoid #if WIN32.
Signed-off-by: Marc-André Lureau <address@hidden>
---
slirp/libslirp.h | 2 ++
slirp/util.h | 1 +
net/slirp.c | 6 ++++++
slirp/misc.c | 3 ++-
slirp/tcp_subr.c | 6 ++++--
slirp/util.c | 12 ++++++++++++
stubs/Makefile.objs | 2 +-
7 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 3e75dadfa31..70e99139bf6 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -27,6 +27,8 @@ typedef struct SlirpCb {
void (*timer_free)(void *timer);
/* Modify a timer to expire at @expire_time */
void (*timer_mod)(void *timer, int64_t expire_time);
+ /* Register a fd for future polling */
+ void (*register_poll_fd)(int fd);
} SlirpCb;
diff --git a/slirp/util.h b/slirp/util.h
index 050ca7f1a3f..782ae8ef0ee 100644
--- a/slirp/util.h
+++ b/slirp/util.h
@@ -66,6 +66,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
#endif
int slirp_socket(int domain, int type, int protocol);
+void slirp_set_nonblock(int fd);
static inline int slirp_socket_set_nodelay(int fd)
{
diff --git a/net/slirp.c b/net/slirp.c
index c24a779425b..6f756a4dccc 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -186,6 +186,11 @@ static void net_slirp_timer_mod(void *timer, int64_t
expire_timer)
timer_mod(timer, expire_timer);
}
+static void net_slirp_register_poll_fd(int fd)
+{
+ qemu_fd_register(fd);
+}
+
static const SlirpCb slirp_cb = {
.output = net_slirp_output,
.guest_error = net_slirp_guest_error,
@@ -193,6 +198,7 @@ static const SlirpCb slirp_cb = {
.timer_new = net_slirp_timer_new,
.timer_free = net_slirp_timer_free,
.timer_mod = net_slirp_timer_mod,
+ .register_poll_fd = net_slirp_register_poll_fd,
};
static int net_slirp_init(NetClientState *peer, const char *model,
diff --git a/slirp/misc.c b/slirp/misc.c
index 32ec02a5251..4ee20a10e44 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -163,7 +163,8 @@ fork_exec(struct socket *so, const char *ex)
slirp_socket_set_fast_reuse(so->s);
opt = 1;
slirp_setsockopt(so->s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
- qemu_set_nonblock(so->s);
+ slirp_set_nonblock(so->s);
+ so->slirp->cb->register_poll_fd(so->s);
return 1;
}
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index 3567f320ff0..8087ffc047f 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -412,7 +412,8 @@ int tcp_fconnect(struct socket *so, unsigned short af)
int opt, s=so->s;
struct sockaddr_storage addr;
- qemu_set_nonblock(s);
+ slirp_set_nonblock(s);
+ so->slirp->cb->register_poll_fd(so->s);
slirp_socket_set_fast_reuse(s);
opt = 1;
slirp_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt));
@@ -484,7 +485,8 @@ void tcp_connect(struct socket *inso)
tcp_close(sototcpcb(so)); /* This will sofree() as well */
return;
}
- qemu_set_nonblock(s);
+ slirp_set_nonblock(s);
+ so->slirp->cb->register_poll_fd(so->s);
slirp_socket_set_fast_reuse(s);
opt = 1;
slirp_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
diff --git a/slirp/util.c b/slirp/util.c
index b1a36b27bc5..499c5cea46f 100644
--- a/slirp/util.c
+++ b/slirp/util.c
@@ -43,6 +43,18 @@ int inet_aton(const char *cp, struct in_addr *ia)
}
#endif
+void slirp_set_nonblock(int fd)
+{
+#ifndef _WIN32
+ int f;
+ f = fcntl(fd, F_GETFL);
+ fcntl(fd, F_SETFL, f | O_NONBLOCK);
+#else
+ unsigned long opt = 1;
+ ioctlsocket(fd, FIONBIO, &opt);
+#endif
+}
+
static void slirp_set_cloexec(int fd)
{
#ifndef _WIN32
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 5dd0aeeec69..cda0efa4e86 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -33,7 +33,7 @@ stub-obj-y += trace-control.o
stub-obj-y += uuid.o
stub-obj-y += vm-stop.o
stub-obj-y += vmstate.o
-stub-obj-$(CONFIG_WIN32) += fd-register.o
+stub-obj-y += fd-register.o
stub-obj-y += qmp_memory_device.o
stub-obj-y += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o
--
2.20.1.98.gecbdaf0899
- [Qemu-devel] [PATCH 03/27] net/slirp: free forwarding rules on cleanup, (continued)
- [Qemu-devel] [PATCH 03/27] net/slirp: free forwarding rules on cleanup, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 05/27] slirp: add callbacks for timer, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 06/27] slirp: replace trace functions with DEBUG calls, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 07/27] slirp: replace QEMU_PACKED with SLIRP_PACKED, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 08/27] slirp: replace most qemu socket utilities with slirp own version, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 09/27] slirp: replace qemu_set_nonblock(),
Marc-André Lureau <=
- [Qemu-devel] [PATCH 11/27] slirp: replace qemu_notify_event() with a callback, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 10/27] slirp: add unregister_poll_fd() callback, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 13/27] slirp: do not include qemu headers in libslirp.h public API header, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 12/27] slirp: move QEMU state saving to a separate unit, Marc-André Lureau, 2019/01/17