Received: from eggs.gnu.org ([208.118.235.92]:56475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeJwc-0000mP-Q8 for qemu-devel@nongnu.org; Mon, 20 May 2013 02:51:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UeJwa-0008Lh-GP for qemu-devel@nongnu.org; Mon, 20 May 2013 02:51:42 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:37140) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeJwZ-0008Kr-LZ for qemu-devel@nongnu.org; Mon, 20 May 2013 02:51:40 -0400 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 20 May 2013 12:15:24 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 50D8B394002D for ; Mon, 20 May 2013 12:21:33 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r4K6pOJr34078896 for ; Mon, 20 May 2013 12:21:24 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r4K6pU0k027019 for ; Mon, 20 May 2013 16:51:30 +1000 From: Lei Li Date: Mon, 20 May 2013 14:51:03 +0800 Message-Id: <1369032665-18159-2-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1369032665-18159-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1369032665-18159-1-git-send-email-lilei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 1/3] chardev: Make consistent with udp device for new qapi backend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, Lei Li , kraxel@redhat.com, armbru@redhat.com 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 --- 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