From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGZMh-0005bF-JX for qemu-devel@nongnu.org; Mon, 12 Dec 2016 17:46:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGZMe-0004hE-Di for qemu-devel@nongnu.org; Mon, 12 Dec 2016 17:46:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48354) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cGZMe-0004gs-49 for qemu-devel@nongnu.org; Mon, 12 Dec 2016 17:46:32 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3F93881253 for ; Mon, 12 Dec 2016 22:46:31 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 13 Dec 2016 01:43:17 +0300 Message-Id: <20161212224325.20790-47-marcandre.lureau@redhat.com> In-Reply-To: <20161212224325.20790-1-marcandre.lureau@redhat.com> References: <20161212224325.20790-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 46/54] char: move udp chardev in its own file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Signed-off-by: Marc-Andr=C3=A9 Lureau --- chardev/char-udp.c | 211 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ chardev/char.c | 199 --------------------------------------------= --- chardev/Makefile.objs | 1 + 3 files changed, 212 insertions(+), 199 deletions(-) create mode 100644 chardev/char-udp.c diff --git a/chardev/char-udp.c b/chardev/char-udp.c new file mode 100644 index 0000000000..6e98c1b360 --- /dev/null +++ b/chardev/char-udp.c @@ -0,0 +1,211 @@ +#include "qemu/osdep.h" +#include "sysemu/char.h" +#include "io/channel-socket.h" +#include "qapi/error.h" + +#include "char-io.h" + +/***********************************************************/ +/* UDP Net console */ + +typedef struct { + Chardev parent; + QIOChannel *ioc; + uint8_t buf[CHR_READ_BUF_LEN]; + int bufcnt; + int bufptr; + int max_size; +} UdpChardev; + +#define UDP_CHARDEV(obj) OBJECT_CHECK(UdpChardev, (obj), TYPE_CHARDEV_UD= P) + +/* Called with chr_write_lock held. */ +static int udp_chr_write(Chardev *chr, const uint8_t *buf, int len) +{ + UdpChardev *s =3D UDP_CHARDEV(chr); + + return qio_channel_write( + s->ioc, (const char *)buf, len, NULL); +} + +static int udp_chr_read_poll(void *opaque) +{ + Chardev *chr =3D CHARDEV(opaque); + UdpChardev *s =3D UDP_CHARDEV(opaque); + + s->max_size =3D qemu_chr_be_can_write(chr); + + /* If there were any stray characters in the queue process them + * first + */ + while (s->max_size > 0 && s->bufptr < s->bufcnt) { + qemu_chr_be_write(chr, &s->buf[s->bufptr], 1); + s->bufptr++; + s->max_size =3D qemu_chr_be_can_write(chr); + } + return s->max_size; +} + +static gboolean udp_chr_read(QIOChannel *chan, GIOCondition cond, void *= opaque) +{ + Chardev *chr =3D CHARDEV(opaque); + UdpChardev *s =3D UDP_CHARDEV(opaque); + ssize_t ret; + + if (s->max_size =3D=3D 0) { + return TRUE; + } + ret =3D qio_channel_read( + s->ioc, (char *)s->buf, sizeof(s->buf), NULL); + if (ret <=3D 0) { + remove_fd_in_watch(chr); + return FALSE; + } + s->bufcnt =3D ret; + + s->bufptr =3D 0; + while (s->max_size > 0 && s->bufptr < s->bufcnt) { + qemu_chr_be_write(chr, &s->buf[s->bufptr], 1); + s->bufptr++; + s->max_size =3D qemu_chr_be_can_write(chr); + } + + return TRUE; +} + +static void udp_chr_update_read_handler(Chardev *chr, + GMainContext *context) +{ + UdpChardev *s =3D UDP_CHARDEV(chr); + + remove_fd_in_watch(chr); + if (s->ioc) { + chr->fd_in_tag =3D io_add_watch_poll(chr, s->ioc, + udp_chr_read_poll, + udp_chr_read, chr, + context); + } +} + +static void char_udp_finalize(Object *obj) +{ + Chardev *chr =3D CHARDEV(obj); + UdpChardev *s =3D UDP_CHARDEV(obj); + + remove_fd_in_watch(chr); + if (s->ioc) { + object_unref(OBJECT(s->ioc)); + } + qemu_chr_be_event(chr, CHR_EVENT_CLOSED); +} + +static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend, + Error **errp) +{ + const char *host =3D qemu_opt_get(opts, "host"); + const char *port =3D qemu_opt_get(opts, "port"); + const char *localaddr =3D qemu_opt_get(opts, "localaddr"); + const char *localport =3D qemu_opt_get(opts, "localport"); + bool has_local =3D false; + SocketAddress *addr; + ChardevUdp *udp; + + if (host =3D=3D NULL || strlen(host) =3D=3D 0) { + host =3D "localhost"; + } + if (port =3D=3D NULL || strlen(port) =3D=3D 0) { + error_setg(errp, "chardev: udp: remote port not specified"); + return; + } + if (localport =3D=3D NULL || strlen(localport) =3D=3D 0) { + localport =3D "0"; + } else { + has_local =3D true; + } + if (localaddr =3D=3D NULL || strlen(localaddr) =3D=3D 0) { + localaddr =3D ""; + } else { + has_local =3D true; + } + + udp =3D backend->u.udp.data =3D g_new0(ChardevUdp, 1); + qemu_chr_parse_common(opts, qapi_ChardevUdp_base(udp)); + + addr =3D g_new0(SocketAddress, 1); + addr->type =3D SOCKET_ADDRESS_KIND_INET; + addr->u.inet.data =3D g_new(InetSocketAddress, 1); + *addr->u.inet.data =3D (InetSocketAddress) { + .host =3D g_strdup(host), + .port =3D g_strdup(port), + .has_ipv4 =3D qemu_opt_get(opts, "ipv4"), + .ipv4 =3D qemu_opt_get_bool(opts, "ipv4", 0), + .has_ipv6 =3D qemu_opt_get(opts, "ipv6"), + .ipv6 =3D qemu_opt_get_bool(opts, "ipv6", 0), + }; + udp->remote =3D addr; + + if (has_local) { + udp->has_local =3D true; + addr =3D g_new0(SocketAddress, 1); + addr->type =3D SOCKET_ADDRESS_KIND_INET; + addr->u.inet.data =3D g_new(InetSocketAddress, 1); + *addr->u.inet.data =3D (InetSocketAddress) { + .host =3D g_strdup(localaddr), + .port =3D g_strdup(localport), + }; + udp->local =3D addr; + } +} + +static void qmp_chardev_open_udp(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) +{ + ChardevUdp *udp =3D backend->u.udp.data; + QIOChannelSocket *sioc =3D qio_channel_socket_new(); + char *name; + UdpChardev *s =3D UDP_CHARDEV(chr); + + if (qio_channel_socket_dgram_sync(sioc, + udp->local, udp->remote, + errp) < 0) { + object_unref(OBJECT(sioc)); + return; + } + + name =3D g_strdup_printf("chardev-udp-%s", chr->label); + qio_channel_set_name(QIO_CHANNEL(sioc), name); + g_free(name); + + s->ioc =3D QIO_CHANNEL(sioc); + s->bufcnt =3D 0; + s->bufptr =3D 0; + /* be isn't opened until we get a connection */ + *be_opened =3D false; +} + +static void char_udp_class_init(ObjectClass *oc, void *data) +{ + ChardevClass *cc =3D CHARDEV_CLASS(oc); + + cc->parse =3D qemu_chr_parse_udp; + cc->open =3D qmp_chardev_open_udp; + cc->chr_write =3D udp_chr_write; + cc->chr_update_read_handler =3D udp_chr_update_read_handler; +} + +static const TypeInfo char_udp_type_info =3D { + .name =3D TYPE_CHARDEV_UDP, + .parent =3D TYPE_CHARDEV, + .instance_size =3D sizeof(UdpChardev), + .instance_finalize =3D char_udp_finalize, + .class_init =3D char_udp_class_init, +}; + +static void register_types(void) +{ + type_register_static(&char_udp_type_info); +} + +type_init(register_types); diff --git a/chardev/char.c b/chardev/char.c index 784a60ac53..a5938e987d 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -1511,100 +1511,6 @@ static const TypeInfo char_console_type_info =3D = { =20 #endif /* !_WIN32 */ =20 -/***********************************************************/ -/* UDP Net console */ - -typedef struct { - Chardev parent; - QIOChannel *ioc; - uint8_t buf[CHR_READ_BUF_LEN]; - int bufcnt; - int bufptr; - int max_size; -} UdpChardev; - -#define UDP_CHARDEV(obj) OBJECT_CHECK(UdpChardev, (obj), TYPE_CHARDEV_UD= P) - -/* Called with chr_write_lock held. */ -static int udp_chr_write(Chardev *chr, const uint8_t *buf, int len) -{ - UdpChardev *s =3D UDP_CHARDEV(chr); - - return qio_channel_write( - s->ioc, (const char *)buf, len, NULL); -} - -static int udp_chr_read_poll(void *opaque) -{ - Chardev *chr =3D CHARDEV(opaque); - UdpChardev *s =3D UDP_CHARDEV(opaque); - - s->max_size =3D qemu_chr_be_can_write(chr); - - /* If there were any stray characters in the queue process them - * first - */ - while (s->max_size > 0 && s->bufptr < s->bufcnt) { - qemu_chr_be_write(chr, &s->buf[s->bufptr], 1); - s->bufptr++; - s->max_size =3D qemu_chr_be_can_write(chr); - } - return s->max_size; -} - -static gboolean udp_chr_read(QIOChannel *chan, GIOCondition cond, void *= opaque) -{ - Chardev *chr =3D CHARDEV(opaque); - UdpChardev *s =3D UDP_CHARDEV(opaque); - ssize_t ret; - - if (s->max_size =3D=3D 0) { - return TRUE; - } - ret =3D qio_channel_read( - s->ioc, (char *)s->buf, sizeof(s->buf), NULL); - if (ret <=3D 0) { - remove_fd_in_watch(chr); - return FALSE; - } - s->bufcnt =3D ret; - - s->bufptr =3D 0; - while (s->max_size > 0 && s->bufptr < s->bufcnt) { - qemu_chr_be_write(chr, &s->buf[s->bufptr], 1); - s->bufptr++; - s->max_size =3D qemu_chr_be_can_write(chr); - } - - return TRUE; -} - -static void udp_chr_update_read_handler(Chardev *chr, - GMainContext *context) -{ - UdpChardev *s =3D UDP_CHARDEV(chr); - - remove_fd_in_watch(chr); - if (s->ioc) { - chr->fd_in_tag =3D io_add_watch_poll(chr, s->ioc, - udp_chr_read_poll, - udp_chr_read, chr, - context); - } -} - -static void char_udp_finalize(Object *obj) -{ - Chardev *chr =3D CHARDEV(obj); - UdpChardev *s =3D UDP_CHARDEV(obj); - - remove_fd_in_watch(chr); - if (s->ioc) { - object_unref(OBJECT(s->ioc)); - } - qemu_chr_be_event(chr, CHR_EVENT_CLOSED); -} - int qemu_chr_wait_connected(Chardev *chr, Error **errp) { ChardevClass *cc =3D CHARDEV_GET_CLASS(chr); @@ -1898,64 +1804,6 @@ static const TypeInfo char_pipe_type_info =3D { .class_init =3D char_pipe_class_init, }; =20 -static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend, - Error **errp) -{ - const char *host =3D qemu_opt_get(opts, "host"); - const char *port =3D qemu_opt_get(opts, "port"); - const char *localaddr =3D qemu_opt_get(opts, "localaddr"); - const char *localport =3D qemu_opt_get(opts, "localport"); - bool has_local =3D false; - SocketAddress *addr; - ChardevUdp *udp; - - if (host =3D=3D NULL || strlen(host) =3D=3D 0) { - host =3D "localhost"; - } - if (port =3D=3D NULL || strlen(port) =3D=3D 0) { - error_setg(errp, "chardev: udp: remote port not specified"); - return; - } - if (localport =3D=3D NULL || strlen(localport) =3D=3D 0) { - localport =3D "0"; - } else { - has_local =3D true; - } - if (localaddr =3D=3D NULL || strlen(localaddr) =3D=3D 0) { - localaddr =3D ""; - } else { - has_local =3D true; - } - - udp =3D backend->u.udp.data =3D g_new0(ChardevUdp, 1); - qemu_chr_parse_common(opts, qapi_ChardevUdp_base(udp)); - - addr =3D g_new0(SocketAddress, 1); - addr->type =3D SOCKET_ADDRESS_KIND_INET; - addr->u.inet.data =3D g_new(InetSocketAddress, 1); - *addr->u.inet.data =3D (InetSocketAddress) { - .host =3D g_strdup(host), - .port =3D g_strdup(port), - .has_ipv4 =3D qemu_opt_get(opts, "ipv4"), - .ipv4 =3D qemu_opt_get_bool(opts, "ipv4", 0), - .has_ipv6 =3D qemu_opt_get(opts, "ipv6"), - .ipv6 =3D qemu_opt_get_bool(opts, "ipv6", 0), - }; - udp->remote =3D addr; - - if (has_local) { - udp->has_local =3D true; - addr =3D g_new0(SocketAddress, 1); - addr->type =3D SOCKET_ADDRESS_KIND_INET; - addr->u.inet.data =3D g_new(InetSocketAddress, 1); - *addr->u.inet.data =3D (InetSocketAddress) { - .host =3D g_strdup(localaddr), - .port =3D g_strdup(localport), - }; - udp->local =3D addr; - } -} - static const ChardevClass *char_get_class(const char *driver, Error **er= rp) { ObjectClass *oc; @@ -2583,52 +2431,6 @@ static const TypeInfo char_serial_type_info =3D { }; #endif =20 -static void qmp_chardev_open_udp(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) -{ - ChardevUdp *udp =3D backend->u.udp.data; - QIOChannelSocket *sioc =3D qio_channel_socket_new(); - char *name; - UdpChardev *s =3D UDP_CHARDEV(chr); - - if (qio_channel_socket_dgram_sync(sioc, - udp->local, udp->remote, - errp) < 0) { - object_unref(OBJECT(sioc)); - return; - } - - name =3D g_strdup_printf("chardev-udp-%s", chr->label); - qio_channel_set_name(QIO_CHANNEL(sioc), name); - g_free(name); - - s->ioc =3D QIO_CHANNEL(sioc); - s->bufcnt =3D 0; - s->bufptr =3D 0; - /* be isn't opened until we get a connection */ - *be_opened =3D false; -} - -static void char_udp_class_init(ObjectClass *oc, void *data) -{ - ChardevClass *cc =3D CHARDEV_CLASS(oc); - - cc->parse =3D qemu_chr_parse_udp; - cc->open =3D qmp_chardev_open_udp; - cc->chr_write =3D udp_chr_write; - cc->chr_update_read_handler =3D udp_chr_update_read_handler; -} - -static const TypeInfo char_udp_type_info =3D { - .name =3D TYPE_CHARDEV_UDP, - .parent =3D TYPE_CHARDEV, - .instance_size =3D sizeof(UdpChardev), - .instance_finalize =3D char_udp_finalize, - .class_init =3D char_udp_class_init, -}; - bool qemu_chr_has_feature(Chardev *chr, CharDriverFeature feature) { @@ -2730,7 +2532,6 @@ void qemu_chr_cleanup(void) static void register_types(void) { type_register_static(&char_type_info); - type_register_static(&char_udp_type_info); type_register_static(&char_file_type_info); type_register_static(&char_stdio_type_info); #ifdef HAVE_CHARDEV_SERIAL diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index c57c375d5b..dddef029e7 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -5,5 +5,6 @@ chardev-obj-y +=3D char-mux.o chardev-obj-y +=3D char-null.o chardev-obj-y +=3D char-ringbuf.o chardev-obj-y +=3D char-socket.o +chardev-obj-y +=3D char-udp.o chardev-obj-$(CONFIG_WIN32) +=3D char-win.o chardev-obj-$(CONFIG_WIN32) +=3D char-win-stdio.o --=20 2.11.0