OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

chardev: add udp support to qapi

Browse Source 
This patch adds 'udp' support to qapi.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-02-27 14:10:47 +01:00
parent 1da48c658a
commit 3ecc059dcd
4 changed files with 67 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qemu/sockets.h
View File

@ -71,6 +71,7 @@ SocketAddress *socket_parse(const char *str, Error **errp);
int socket_connect(SocketAddress *addr, Error **errp,
NonBlockingConnectHandler *callback, void *opaque);
int socket_listen(SocketAddress *addr, Error **errp);
int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);
/* Old, ipv4 only bits. Don't use for new code. */
int parse_host_port(struct sockaddr_in *saddr, const char *str);

16
qapi-schema.json
View File

@ -3166,7 +3166,7 @@
##
# @ChardevSocket:
#
# Configuration info for socket chardevs.
# Configuration info for (stream) socket chardevs.
#
# @addr: socket address to listen on (server=true)
# or connect to (server=false)
@ -3184,6 +3184,19 @@
'*nodelay' : 'bool',
'*telnet' : 'bool' } }
##
# @ChardevDgram:
#
# Configuration info for datagram socket chardevs.
#
# @remote: remote address
# @local: #optional local address
#
# Since: 1.5
##
{ 'type': 'ChardevDgram', 'data': { 'remote' : 'SocketAddress',
'*local' : 'SocketAddress' } }
##
# @ChardevMux:
#
@ -3272,6 +3285,7 @@
'parallel': 'ChardevHostdev',
'pipe' : 'ChardevHostdev',
'socket' : 'ChardevSocket',
'dgram' : 'ChardevDgram',
'pty' : 'ChardevDummy',
'null' : 'ChardevDummy',
'mux' : 'ChardevMux',

44
qemu-char.c
View File

@ -2261,21 +2261,14 @@ static void udp_chr_close(CharDriverState *chr)
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
}
static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
static CharDriverState *qemu_chr_open_udp_fd(int fd)
{
CharDriverState *chr = NULL;
NetCharDriver *s = NULL;
Error *local_err = NULL;
int fd = -1;
chr = g_malloc0(sizeof(CharDriverState));
s = g_malloc0(sizeof(NetCharDriver));
fd = inet_dgram_opts(opts, &local_err);
if (fd < 0) {
goto return_err;
}
s->fd = fd;
s->chan = io_channel_from_socket(s->fd);
s->bufcnt = 0;
@ -2285,18 +2278,18 @@ static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
chr->chr_update_read_handler = udp_chr_update_read_handler;
chr->chr_close = udp_chr_close;
return chr;
}
return_err:
if (local_err) {
qerror_report_err(local_err);
error_free(local_err);
static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
{
Error *local_err = NULL;
int fd = -1;
fd = inet_dgram_opts(opts, &local_err);
if (fd < 0) {
return NULL;
}
g_free(chr);
g_free(s);
if (fd >= 0) {
closesocket(fd);
}
return NULL;
return qemu_chr_open_udp_fd(fd);
}
/***********************************************************/
@ -3679,6 +3672,18 @@ static CharDriverState *qmp_chardev_open_socket(ChardevSocket *sock,
is_telnet, is_waitconnect, errp);
}
static CharDriverState *qmp_chardev_open_dgram(ChardevDgram *dgram,
Error **errp)
{
int fd;
fd = socket_dgram(dgram->remote, dgram->local, errp);
if (error_is_set(errp)) {
return NULL;
}
return qemu_chr_open_udp_fd(fd);
}
ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
Error **errp)
{
@ -3708,6 +3713,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
case CHARDEV_BACKEND_KIND_SOCKET:
chr = qmp_chardev_open_socket(backend->socket, errp);
break;
case CHARDEV_BACKEND_KIND_DGRAM:
chr = qmp_chardev_open_dgram(backend->dgram, errp);
break;
#ifdef HAVE_CHARDEV_TTY
case CHARDEV_BACKEND_KIND_PTY:
chr = qemu_chr_open_pty(id, ret);

25
util/qemu-sockets.c
View File

@ -949,6 +949,31 @@ int socket_listen(SocketAddress *addr, Error **errp)
return fd;
}
int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp)
{
QemuOpts *opts;
int fd;
opts = qemu_opts_create_nofail(&dummy_opts);
switch (remote->kind) {
case SOCKET_ADDRESS_KIND_INET:
qemu_opt_set(opts, "host", remote->inet->host);
qemu_opt_set(opts, "port", remote->inet->port);
if (local) {
qemu_opt_set(opts, "localaddr", local->inet->host);
qemu_opt_set(opts, "localport", local->inet->port);
}
fd = inet_dgram_opts(opts, errp);
break;
default:
error_setg(errp, "socket type unsupported for datagram");
return -1;
}
qemu_opts_del(opts);
return fd;
}
#ifdef _WIN32
static void socket_cleanup(void)
{