[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/3] chardev: Make consistent with udp device for ne
From: |
Lei Li |
Subject: |
[Qemu-devel] [PATCH 1/3] chardev: Make consistent with udp device for new qapi backend |
Date: |
Mon, 20 May 2013 14:51:03 +0800 |
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 <address@hidden>
---
qapi-schema.json | 8 ++++----
qemu-char.c | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 199744a..9302e7d 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3210,7 +3210,7 @@
'*telnet' : 'bool' } }
##
-# @ChardevDgram:
+# @ChardevUdp:
#
# Configuration info for datagram socket chardevs.
#
@@ -3219,8 +3219,8 @@
#
# Since: 1.5
##
-{ 'type': 'ChardevDgram', 'data': { 'remote' : 'SocketAddress',
- '*local' : 'SocketAddress' } }
+{ 'type': 'ChardevUdp', 'data': { 'remote' : 'SocketAddress',
+ '*local' : 'SocketAddress' } }
##
# @ChardevMux:
@@ -3310,7 +3310,7 @@
'parallel': 'ChardevHostdev',
'pipe' : 'ChardevHostdev',
'socket' : 'ChardevSocket',
- 'dgram' : 'ChardevDgram',
+ 'udp' : 'ChardevUdp',
'pty' : 'ChardevDummy',
'null' : 'ChardevDummy',
'mux' : 'ChardevMux',
diff --git a/qemu-char.c b/qemu-char.c
index 30a2ddf..cff2896 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3698,12 +3698,12 @@ static CharDriverState
*qmp_chardev_open_socket(ChardevSocket *sock,
is_telnet, is_waitconnect, errp);
}
-static CharDriverState *qmp_chardev_open_dgram(ChardevDgram *dgram,
- Error **errp)
+static CharDriverState *qmp_chardev_open_udp(ChardevUdp *udp,
+ Error **errp)
{
int fd;
- fd = socket_dgram(dgram->remote, dgram->local, errp);
+ fd = socket_dgram(udp->remote, udp->local, errp);
if (error_is_set(errp)) {
return NULL;
}
@@ -3739,8 +3739,8 @@ 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);
+ case CHARDEV_BACKEND_KIND_UDP:
+ chr = qmp_chardev_open_udp(backend->udp, errp);
break;
#ifdef HAVE_CHARDEV_TTY
case CHARDEV_BACKEND_KIND_PTY:
--
1.7.7.6
[Qemu-devel] [PATCH 3/3] chardev: Get filename for new qapi backend, Lei Li, 2013/05/20