make slirp drivern by glib directly
cover make slirp drivern by glib directly
This series make slirp drivern directly by glib, so we can clean up the hooks for slrip in mainloop and stub
Liu Ping Fan (2):
slirp: introduce gsource event abstraction
slirp: make slirp event dispatch based on slirp instance
main-loop.c | 6 --- net/slirp.c | 3 ++ slirp/Makefile.objs | 2 +- slirp/TFX7d70.tmp | 0 slirp/libslirp.h | 7 ++- slirp/slirp.c | 133 ++++++++++++++++---------------------------------- slirp/slirp.h | 1 + slirp/slirp_gsource.c | 94 +++++++++++++++++++++++++++++++++++ slirp/slirp_gsource.h | 37 ++++++++++++++ slirp/socket.c | 1 - slirp/socket.h | 2 +- stubs/Makefile.objs | 1 - stubs/slirp.c | 11 ----- 13 files changed, 181 insertions(+), 117 deletions(-) create mode 100644 slirp/TFX7d70.tmp create mode 100644 slirp/slirp_gsource.c create mode 100644 slirp/slirp_gsource.h delete mode 100644 stubs/slirp.c
Signature · 1 line
1.8.1.4
PATCH 1/2 slirp: introduce gsource event abstraction
Introduce struct SlirpGSource. It will ease the usage of GSource associated with a group of files, which are dynamically allocated and release for slirp.
--- slirp/Makefile.objs | 2 +- slirp/slirp_gsource.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++ slirp/slirp_gsource.h | 37 ++++++++++++++++++++ 3 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 slirp/slirp_gsource.c create mode 100644 slirp/slirp_gsource.h
slirp/Makefile.objs +1 -1
@@ -1,3 +1,3 @@ common-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o dnssearch.o -common-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o +common-obj-y += slirp.o slirp_gsource.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o common-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o arp_table.o
slirp/slirp_gsource.c new file +94 -0
94 lines not on this page · raw message
slirp/slirp_gsource.h new file +37 -0
@@ -0,0 +1,37 @@ +/* +* Copyright (C) 2013 IBM +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; under version 2 of the License. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef SLIRP_GSOURCE_H +#define SLIRP_GSOURCE_H +#include "qemu-common.h" + +typedef gboolean (*GPrepare )(GSource *source,gint *timeout_); + +/* multi fd drive GSource*/ +typedef struct SlirpGSource { +GSource source; +/* a group of GPollFD which dynamically join or leave the GSource */ +GList *pollfds_list; +GSourceFuncs *gfuncs; +void *opaque; +}SlirpGSource ; + +SlirpGSource *slirp_gsource_new (GPrepare prepare,GSourceFunc dispatch_cb, +void *opaque); +void slirp_gsource_release (SlirpGSource *src); +GPollFD *slirp_gsource_add_pollfd (SlirpGSource *src,int fd); +void slirp_gsource_remove_pollfd (SlirpGSource *src,GPollFD *pollfd); +#endif
Signature · 1 line
1.8.1.4
PATCH 2/2 slirp: make slirp event dispatch based on slirp instance
In reply to Liu Ping FanEach slirp instance has its own GFuncs, so we can driver slirp by glib main loop.
---
For easing the review, This patch does not obey coding guide. Will fix it later
--- main-loop.c | 6 --- net/slirp.c | 3 ++ slirp/TFX7d70.tmp | 0 slirp/libslirp.h | 7 ++- slirp/slirp.c | 133 ++++++++++++++++------------------------------------ slirp/slirp.h | 1 + slirp/socket.c | 1 - slirp/socket.h | 2 +- stubs/Makefile.objs | 1 - stubs/slirp.c | 11 ----- 10 files changed, 49 insertions(+), 116 deletions(-) create mode 100644 slirp/TFX7d70.tmp delete mode 100644 stubs/slirp.c
main-loop.c +0 -6
@@ -465,9 +465,6 @@ int main_loop_wait(int nonblocking)/* poll any events */ g_array_set_size (gpollfds,0 );/* reset for new iteration */ /* XXX: separate device handlers from system ones */ -#ifdef CONFIG_SLIRP -slirp_pollfds_fill (gpollfds, &timeout); -#endif qemu_iohandler_fill (gpollfds);if (timeout ==UINT32_MAX ) {
@@ -482,9 +479,6 @@ int main_loop_wait(int nonblocking) ret =os_host_main_loop_wait (timeout_ns);qemu_iohandler_poll (gpollfds, ret); -#ifdef CONFIG_SLIRP -slirp_pollfds_poll (gpollfds, (ret <0 )); -#endif qemu_clock_run_all_timers ();
net/slirp.c +3 -0
@@ -35,6 +35,7 @@#include "monitor/monitor.h" #include "qemu/sockets.h" #include "slirp/libslirp.h" +#include "slirp/slirp_gsource.h" #include "sysemu/char.h" static int get_str_sep (char *buf,int buf_size,const char **pp,int sep)
@@ -76,6 +77,7 @@ typedef struct SlirpState {#ifndef _WIN32char smb_dir[128 ];#endif +SlirpGSource *slirp_src; } SlirpState;static struct slirp_config_str *slirp_configs;
@@ -244,6 +246,7 @@ static int net_slirp_init(NetClientState *peer, const char *model, s->slirp =slirp_init (restricted, net, mask, host, vhostname, tftp_export, bootfile, dhcp, dns, dnssearch, s); + s->slirp_src =slirp_gsource_new (slirp_prepare, slirp_handler, s->slirp);QTAILQ_INSERT_TAIL (&slirp_stacks, s, entry);for (config = slirp_configs; config; config = config->next) {
slirp/TFX7d70.tmp new file +0 -0
slirp/libslirp.h +3 -4
@@ -16,10 +16,6 @@ Slirp *slirp_init(int restricted, struct in_addr vnetwork, void *opaque);void slirp_cleanup (Slirp *slirp); -void slirp_pollfds_fill (GArray *pollfds,uint32_t *timeout); - -void slirp_pollfds_poll (GArray *pollfds,int select_error); -void slirp_input (Slirp *slirp,const uint8_t *pkt,int pkt_len);/* you must provide the following functions: */
@@ -39,5 +35,8 @@ void slirp_socket_recv(Slirp *slirp, struct in_addr guest_addr, int guest_port, const uint8_t *buf, int size);size_t slirp_socket_can_recv (Slirp *slirp,struct in_addr guest_addr,int guest_port); +gboolean slirp_prepare (GSource *source,gint *time); +gboolean slirp_handler (gpointer data); +#endif
slirp/slirp.c +41 -92
256 lines not on this page · raw message
slirp/slirp.h +1 -0
@@ -206,6 +206,7 @@ struct Slirp {u_int time_fasttimo;u_int last_slowtimo;bool do_slowtimo; +u_int curtime;/* virtual network configuration */ struct in_addr vnetwork_addr;
slirp/socket.c +0 -1
@@ -51,7 +51,6 @@ socreate(Slirp *slirp) so->so_state =SS_NOFDREF ; so->s =-1 ; so->slirp = slirp; - so->pollfds_idx =-1 ; }return (so); }
slirp/socket.h +1 -1
@@ -20,7 +20,7 @@ struct socket {int s;/* The actual socket */ -int pollfds_idx;/* GPollFD GArray index */ +GPollFD *pollfd;Slirp *slirp;/* managing slirp instance */
stubs/Makefile.objs +0 -1
@@ -20,7 +20,6 @@ stub-obj-y += mon-set-error.o stub-obj-y += pci-drive-hot-add.o stub-obj-y += reset.o stub-obj-y += set-fd-handler.o -stub-obj-y += slirp.o stub-obj-y += sysbus.o stub-obj-y += uuid.o stub-obj-y += vm-stop.o
stubs/slirp.c deleted +0 -11
@@ -1,11 +0,0 @@ -#include "qemu-common.h" -#include "slirp/slirp.h" - -void slirp_pollfds_fill (GArray *pollfds,uint32_t *timeout) -{ -} - -void slirp_pollfds_poll (GArray *pollfds,int select_error) -{ -} -
Signature · 1 line
1.8.1.4