falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chardev: Make consistent with udp device for new qapi backend 

When register and open a chardev udp, the backend name should be udp
not dgram, and we do not have backend dgram in the chardev list. This
patch makes the new qapi udp backend consistent with the original
udp device.

Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
Message-id: 1369032665-18159-2-git-send-email-lilei@linux.vnet.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Lei Li 2013-05-20 14:51:03 +08:00 committed by Anthony Liguori
parent b9b5df6f0c
commit 08d0ab3fe6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qapi-schema.json
View File

@ -3210,7 +3210,7 @@
'*telnet' : 'bool' } } '*telnet' : 'bool' } }
## ##
# @ChardevDgram: # @ChardevUdp:
# #
# Configuration info for datagram socket chardevs. # Configuration info for datagram socket chardevs.
# #
@ -3219,8 +3219,8 @@
# #
# Since: 1.5 # Since: 1.5
## ##
{ 'type': 'ChardevDgram', 'data': { 'remote' : 'SocketAddress', { 'type': 'ChardevUdp', 'data': { 'remote' : 'SocketAddress',
'*local' : 'SocketAddress' } } '*local' : 'SocketAddress' } }
## ##
# @ChardevMux: # @ChardevMux:
@ -3310,7 +3310,7 @@
'parallel': 'ChardevHostdev', 'parallel': 'ChardevHostdev',
'pipe' : 'ChardevHostdev', 'pipe' : 'ChardevHostdev',
'socket' : 'ChardevSocket', 'socket' : 'ChardevSocket',
'dgram' : 'ChardevDgram', 'udp' : 'ChardevUdp',
'pty' : 'ChardevDummy', 'pty' : 'ChardevDummy',
'null' : 'ChardevDummy', 'null' : 'ChardevDummy',
'mux' : 'ChardevMux', 'mux' : 'ChardevMux',

10
qemu-char.c
View File

@ -3698,12 +3698,12 @@ static CharDriverState *qmp_chardev_open_socket(ChardevSocket *sock,
is_telnet, is_waitconnect, errp); is_telnet, is_waitconnect, errp);
} }
static CharDriverState *qmp_chardev_open_dgram(ChardevDgram *dgram, static CharDriverState *qmp_chardev_open_udp(ChardevUdp *udp,
Error **errp) Error **errp)
{ {
int fd; int fd;
fd = socket_dgram(dgram->remote, dgram->local, errp); fd = socket_dgram(udp->remote, udp->local, errp);
if (error_is_set(errp)) { if (error_is_set(errp)) {
return NULL; return NULL;
} }
@ -3739,8 +3739,8 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
case CHARDEV_BACKEND_KIND_SOCKET: case CHARDEV_BACKEND_KIND_SOCKET:
chr = qmp_chardev_open_socket(backend->socket, errp); chr = qmp_chardev_open_socket(backend->socket, errp);
break; break;
case CHARDEV_BACKEND_KIND_DGRAM: case CHARDEV_BACKEND_KIND_UDP:
chr = qmp_chardev_open_dgram(backend->dgram, errp); chr = qmp_chardev_open_udp(backend->udp, errp);
break; break;
#ifdef HAVE_CHARDEV_TTY #ifdef HAVE_CHARDEV_TTY
case CHARDEV_BACKEND_KIND_PTY: case CHARDEV_BACKEND_KIND_PTY: