From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeNYg-0006Ii-7z for qemu-devel@nongnu.org; Mon, 20 May 2013 06:43:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UeNYa-0003Vh-40 for qemu-devel@nongnu.org; Mon, 20 May 2013 06:43:14 -0400 Received: from mail-ye0-f180.google.com ([209.85.213.180]:62034) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeNYZ-0003Up-VG for qemu-devel@nongnu.org; Mon, 20 May 2013 06:43:08 -0400 Received: by mail-ye0-f180.google.com with SMTP id r11so1406079yen.25 for ; Mon, 20 May 2013 03:43:07 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <5199FE34.6040407@redhat.com> Date: Mon, 20 May 2013 12:43:00 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1369032665-18159-1-git-send-email-lilei@linux.vnet.ibm.com> <1369032665-18159-2-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1369032665-18159-2-git-send-email-lilei@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH for-1.5? 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: Lei Li Cc: armbru@redhat.com, aliguori@us.ibm.com, qemu-devel@nongnu.org, kraxel@redhat.com Il 20/05/2013 08:51, Lei Li ha scritto: > 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. This changes the QMP API, so it has to go into 1.5 or never. Paolo > 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: >